pidd/__init__.py

@@ -7,11 +7,10 @@ import sys
 from pathlib import Path
 
 import env
-from rwx import fs
+from rwx import fs, ps
 from rwx.log import stream as log
 
 import pidd
-from pidd import cmd
 from pidd.project import Project
 from pidd.projects import Projects
 
@@ -21,6 +20,64 @@ projects = Projects()
 project = Project(projects)
 
 
+def pidd_browse_workspace() -> None:
+    browse(project.root)
+
+
+def pidd_build_project() -> None:
+    for extension in ["py", "sh"]:
+        path = Path(project.root) / f"build.{extension}"
+        if path.exists():
+            ps.run(path)
+            break
+    else:
+        pass
+
+
+def pidd_clone_branch() -> None:
+    log.info(projects)
+    split()
+    log.info(project)
+    split()
+    log.info(f"""\
+{project.url}
+↓
+""")
+    ps.run(
+        "git",
+        "clone",
+        "--branch",
+        project.branch,
+        "--",
+        project.url,
+        project.root,
+    )
+
+
+def pidd_list_environment() -> None:
+    for variable, value in sorted(projects.environment.items()):
+        log.info(f"{variable} = {value}")
+
+
+def pidd_synchronize() -> None:
+    host = "rwx.work"
+    source = "out"
+    user = "cd"
+    #
+    root = Path(os.sep) / user / project.branch / projects.group / project.name
+    #
+    target = f"{user}@{host}:{root}"
+    ps.run(
+        "rsync",
+        "--archive",
+        "--delete-before",
+        "--verbose",
+        f"{source}/",
+        f"{target}/",
+        "--dry-run",
+    )
+
+
 def browse(root: str) -> None:
     paths = []
     for directory, _, files in os.walk(root):
@@ -61,7 +118,7 @@ def main(main: str) -> None:
         pidd.set_ssh(*arguments)
         pidd.install_commands(main)
     else:
-        function = getattr(cmd, name.replace("-", "_"))
+        function = getattr(pidd, name.replace("-", "_"))
         function(*arguments)
 
 

pidd/cmd.py

@@ -1,64 +0,0 @@
-import os
-from pathlib import Path
-
-from cd import browse, project, projects
-from rwx import ps, split
-from rwx.log import log
-
-
-def pidd_browse_workspace() -> None:
-    browse(project.root)
-
-
-def pidd_build_project() -> None:
-    for extension in ["py", "sh"]:
-        path = Path(project.root) / f"build.{extension}"
-        if path.exists():
-            ps.run(path)
-            break
-    else:
-        pass
-
-
-def pidd_clone_branch() -> None:
-    log.info(projects)
-    split()
-    log.info(project)
-    split()
-    log.info(f"""\
-{project.url}
-↓
-""")
-    ps.run(
-        "git",
-        "clone",
-        "--branch",
-        project.branch,
-        "--",
-        project.url,
-        project.root,
-    )
-
-
-def pidd_list_environment() -> None:
-    for variable, value in sorted(projects.environment.items()):
-        log.info(f"{variable} = {value}")
-
-
-def pidd_synchronize() -> None:
-    host = "rwx.work"
-    source = "out"
-    user = "cd"
-    #
-    root = Path(os.sep) / user / project.branch / projects.group / project.name
-    #
-    target = f"{user}@{host}:{root}"
-    ps.run(
-        "rsync",
-        "--archive",
-        "--delete-before",
-        "--verbose",
-        f"{source}/",
-        f"{target}/",
-        "--dry-run",
-    )