machineconfig 5.30__py3-none-any.whl → 5.31__py3-none-any.whl

machineconfig/scripts/python/devops.py

@@ -1,14 +1,18 @@
 """devops with emojis"""
 
 import typer
-from typing import Literal, Annotated, Optional
+from typing import Optional
 
-import machineconfig.scripts.python.repos as repos
-import machineconfig.scripts.python.share_terminal as share_terminal
+import machineconfig.scripts.python.devops_helpers.cli_repos as cli_repos
+import machineconfig.scripts.python.devops_helpers.cli_config as cli_config
+from machineconfig.scripts.python.devops_helpers.cli_self import self_app
+import machineconfig.scripts.python.devops_helpers.cli_data as cli_data
+import machineconfig.scripts.python.devops_helpers.cli_nw as cli_network
 
-app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True)
+
+app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True, add_completion=True)
 @app.command(no_args_is_help=True)
-def install(    which: Optional[str] = typer.Option(None, "--which", "-w", help="Comma-separated list of program names to install."),
+def install( which: Optional[str] = typer.Option(None, "--which", "-w", help="Comma-separated list of program names to install."),
     group: Optional[str] = typer.Option(None, "--group", "-g", help="Groups names. A group is bundle of apps. See available groups when running interactively."),
     interactive: bool = typer.Option(False, "--interactive", "-ia", help="Interactive selection of programs to install."),
 ) -> None:
@@ -17,126 +21,13 @@ def install(    which: Optional[str] = typer.Option(None, "--which", "-w", help=
     installer_entry_point.main(which=which, group=group, interactive=interactive)
 
 
-app.add_typer(repos.app, name="repos", help="📁 Manage git repositories")
-config_apps = typer.Typer(help="⚙️ Configuration subcommands", no_args_is_help=True)
-app.add_typer(config_apps, name="config")
-app_data = typer.Typer(help="💾 Data subcommands", no_args_is_help=True)
-app.add_typer(app_data, name="data")
-nw_apps = typer.Typer(help="🔐 Network subcommands", no_args_is_help=True)
-nw_apps.command(name="share-terminal", help="📡 Share terminal via web browser")(share_terminal.main)
-app.add_typer(nw_apps, name="network")
-self_app = typer.Typer(help="🔄 SELF operations subcommands", no_args_is_help=True)
+app.add_typer(cli_repos.app, name="repos", help="📁 Manage git repositories")
+app.add_typer(cli_config.config_apps, name="config")
+app.add_typer(cli_data.app_data, name="data")
 app.add_typer(self_app, name="self")
-
-@self_app.command()
-def update():
-    """🔄 UPDATE essential repos"""
-    import machineconfig.scripts.python.devops_helpers.devops_update_repos as helper
-    helper.main()
-@self_app.command()
-def interactive():
-    """🤖 INTERACTIVE configuration of machine."""
-    from machineconfig.scripts.python.interactive import main
-    main()
-@self_app.command()
-def status():
-    """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
-    import machineconfig.scripts.python.devops_helpers.devops_status as helper
-    helper.main()
-@self_app.command()
-def clone():
-    """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
-    import platform
-    from machineconfig.utils.code import run_shell_script
-    from machineconfig.profile.shell import create_default_shell_profile
-    if platform.system() == "Windows":
-        from machineconfig.setup_windows import MACHINECONFIG
-        create_default_shell_profile(method="copy")
-    else:
-        from machineconfig.setup_linux import MACHINECONFIG
-        create_default_shell_profile(method="reference")
-    run_shell_script(MACHINECONFIG.read_text(encoding="utf-8"))
-
-
-
-@config_apps.command(no_args_is_help=True)
-def private(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for linking files"),
-                             on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
-                             which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
-                             interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
-    """🔗 Manage private configuration files."""
-    import machineconfig.profile.create_frontend as create_frontend
-    create_frontend.main_private_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
-
-@config_apps.command(no_args_is_help=True)
-def public(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for setting up the config file."),
-                            on_conflict: Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
-                            which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
-                            interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
-    """🔗 Manage public configuration files."""
-    import machineconfig.profile.create_frontend as create_frontend
-    create_frontend.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
-
-@config_apps.command(no_args_is_help=True)
-def dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
-    overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="Overwrite.")] = False,
-    dest: Annotated[str, typer.Option("--dest", "-d", help="destination folder")] = "",
-    ):
-    """🔗 Manage dotfiles."""
-    import machineconfig.scripts.python.dotfile as dotfile_module
-    dotfile_module.main(file=file, overwrite=overwrite, dest=dest)
-
-
-@config_apps.command(no_args_is_help=True)
-def shell(method: Annotated[Literal["copy", "reference"], typer.Argument(help="Choose the method to configure the shell profile: 'copy' copies the init script directly, 'reference' references machineconfig for dynamic updates.")]):
-    """🔗 Configure your shell profile."""
-    from machineconfig.profile.shell import create_default_shell_profile
-    create_default_shell_profile(method=method)
-
-
-@nw_apps.command()
-def add_key():
-    """🔑 SSH add pub key to this machine"""
-    import machineconfig.scripts.python.devops_helpers.devops_add_ssh_key as helper
-    helper.main()
-@nw_apps.command()
-def add_identity():
-    """🗝️ SSH add identity (private key) to this machine"""
-    import machineconfig.scripts.python.devops_helpers.devops_add_identity as helper
-    helper.main()
-@nw_apps.command()
-def connect():
-    """🔐 SSH use key pair to connect two machines"""
-    raise NotImplementedError
-
-@nw_apps.command()
-def setup():
-    """📡 SSH setup"""
-    import platform
-    if platform.system() == "Windows":
-        from machineconfig.setup_windows import SSH_SERVER
-        program = SSH_SERVER.read_text(encoding="utf-8")
-    elif platform.system() == "Linux" or platform.system() == "Darwin":
-        from machineconfig.setup_linux import SSH_SERVER
-        program = SSH_SERVER.read_text(encoding="utf-8")
-    else:
-        raise NotImplementedError(f"Platform {platform.system()} is not supported.")
-    from machineconfig.utils.code import run_shell_script
-    run_shell_script(script=program)
-
-
-@app_data.command()
-def backup():
-    """💾 BACKUP"""
-    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
-    main_backup_retrieve(direction="BACKUP")
+app.add_typer(cli_network.nw_apps, name="network")
 
 
-@app_data.command()
-def retrieve():
-    """📥 RETRIEVE"""
-    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
-    main_backup_retrieve(direction="RETRIEVE")
 
 
 # @app.command()

machineconfig/scripts/python/devops_helpers/cli_config.py

@@ -0,0 +1,43 @@
+
+
+from typing import Literal, Annotated, Optional
+
+import typer
+
+config_apps = typer.Typer(help="⚙️ Configuration subcommands", no_args_is_help=True)
+
+
+@config_apps.command(no_args_is_help=True)
+def private(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for linking files"),
+                             on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
+                             which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
+                             interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
+    """🔗 Manage private configuration files."""
+    import machineconfig.profile.create_frontend as create_frontend
+    create_frontend.main_private_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
+
+@config_apps.command(no_args_is_help=True)
+def public(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for setting up the config file."),
+                            on_conflict: Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
+                            which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
+                            interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
+    """🔗 Manage public configuration files."""
+    import machineconfig.profile.create_frontend as create_frontend
+    create_frontend.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
+
+@config_apps.command(no_args_is_help=True)
+def dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
+    overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="Overwrite.")] = False,
+    dest: Annotated[str, typer.Option("--dest", "-d", help="destination folder")] = "",
+    ):
+    """🔗 Manage dotfiles."""
+    import machineconfig.scripts.python.devops_helpers.cli_config_dotfile as dotfile_module
+    dotfile_module.main(file=file, overwrite=overwrite, dest=dest)
+
+
+@config_apps.command(no_args_is_help=True)
+def shell(method: Annotated[Literal["copy", "reference"], typer.Argument(help="Choose the method to configure the shell profile: 'copy' copies the init script directly, 'reference' references machineconfig for dynamic updates.")]):
+    """🔗 Configure your shell profile."""
+    from machineconfig.profile.shell import create_default_shell_profile
+    create_default_shell_profile(method=method)
+

machineconfig/scripts/python/devops_helpers/cli_data.py

@@ -0,0 +1,18 @@
+
+import typer
+
+app_data = typer.Typer(help="💾 Data subcommands", no_args_is_help=True)
+
+@app_data.command()
+def backup():
+    """💾 BACKUP"""
+    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
+    main_backup_retrieve(direction="BACKUP")
+
+
+@app_data.command()
+def retrieve():
+    """📥 RETRIEVE"""
+    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
+    main_backup_retrieve(direction="RETRIEVE")
+

machineconfig/scripts/python/devops_helpers/cli_nw.py

@@ -0,0 +1,39 @@
+
+import machineconfig.scripts.python.devops_helpers.cli_terminal as cli_terminal
+import typer
+nw_apps = typer.Typer(help="🔐 Network subcommands", no_args_is_help=True)
+
+
+nw_apps.command(name="share-terminal", help="📡 Share terminal via web browser")(cli_terminal.main)
+
+
+@nw_apps.command()
+def add_key():
+    """🔑 SSH add pub key to this machine"""
+    import machineconfig.scripts.python.devops_helpers.devops_add_ssh_key as helper
+    helper.main()
+@nw_apps.command()
+def add_identity():
+    """🗝️ SSH add identity (private key) to this machine"""
+    import machineconfig.scripts.python.devops_helpers.devops_add_identity as helper
+    helper.main()
+@nw_apps.command()
+def connect():
+    """🔐 SSH use key pair to connect two machines"""
+    raise NotImplementedError
+
+@nw_apps.command()
+def setup():
+    """📡 SSH setup"""
+    import platform
+    if platform.system() == "Windows":
+        from machineconfig.setup_windows import SSH_SERVER
+        program = SSH_SERVER.read_text(encoding="utf-8")
+    elif platform.system() == "Linux" or platform.system() == "Darwin":
+        from machineconfig.setup_linux import SSH_SERVER
+        program = SSH_SERVER.read_text(encoding="utf-8")
+    else:
+        raise NotImplementedError(f"Platform {platform.system()} is not supported.")
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(script=program)
+

machineconfig/scripts/python/{repos.py → devops_helpers/cli_repos.py}

@@ -8,14 +8,15 @@ in the event that username@github.com is not mentioned in the remote url.
 from pathlib import Path
 from typing import Annotated, Optional
 import typer
-from machineconfig.scripts.python.secure_repo import main as secure_repo_main
+from git import Repo, InvalidGitRepositoryError
+from machineconfig.scripts.python.helpers_repos.secure_repo import main as secure_repo_main
 
 
-app = typer.Typer(help="� Manage development repositories", no_args_is_help=True)
-sync_app = typer.Typer(help="� Manage repository specifications and syncing", no_args_is_help=True)
-app.add_typer(sync_app, name="sync", help="� Sync repositories using saved specs")
+app = typer.Typer(help="📁 Manage development repositories", no_args_is_help=True)
+sync_app = typer.Typer(help="🔄 Manage repository specifications and syncing", no_args_is_help=True)
+app.add_typer(sync_app, name="mirror", help="🔄 mirror repositories using saved specs")
 
-DirectoryArgument = Annotated[Optional[str], typer.Argument(help="📁 Folder containing repos or the specs JSON file to use.")]
+DirectoryArgument = Annotated[Optional[str], typer.Argument(help="📁 Directory containing repo(s).")]
 RecursiveOption = Annotated[bool, typer.Option("--recursive", "-r", help="🔍 Recurse into nested repositories.")]
 NoSyncOption = Annotated[bool, typer.Option("--no-sync", help="🚫 Disable automatic uv sync after pulls.")]
 CloudOption = Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁️ Upload to or download from this cloud remote.")]
@@ -46,10 +47,9 @@ def commit(directory: DirectoryArgument = None, recursive: RecursiveOption = Fal
 
 
 @app.command(no_args_is_help=True)
-def cleanup(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
+def sync(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_sync: NoSyncOption = False) -> None:
     """🔄 Pull, commit, and push changes across repositories."""
     from machineconfig.scripts.python.repos_helpers.repos_helper import git_operations
-
     git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, no_sync=no_sync)
 
 
@@ -135,3 +135,39 @@ def viz(
               user_image_dir=user_image_dir, max_files=max_files, max_file_lag=max_file_lag,
               file_idle_time=file_idle_time, framerate=framerate, background_color=background_color,
               font_size=font_size, camera_mode=camera_mode)
+
+@app.command(no_args_is_help=True)
+def cleanup(repo: DirectoryArgument = None, recursive: RecursiveOption = False) -> None:
+    """🧹 Clean repository directories from cache files."""
+    if repo is None:
+        repo = Path.cwd().as_posix()
+    
+    arg_path = Path(repo).expanduser().absolute()
+    
+    if not recursive:
+        # Check if the directory is a git repo
+        try:
+            Repo(str(arg_path), search_parent_directories=False)
+        except InvalidGitRepositoryError:
+            typer.echo(f"❌ {arg_path} is not a git repository. Use -r flag for recursive cleanup.")
+            return
+        # Run cleanup on this repo
+        repos_to_clean = [arg_path]
+    else:
+        # Find all git repos recursively under the directory
+        git_dirs = list(arg_path.rglob('.git'))
+        repos_to_clean = [git_dir.parent for git_dir in git_dirs if git_dir.is_dir()]
+        if not repos_to_clean:
+            typer.echo(f"❌ No git repositories found under {arg_path}")
+            return
+    
+    for repo_path in repos_to_clean:
+        typer.echo(f"🧹 Cleaning {repo_path}")
+        script = fr"""
+cd "{repo_path}"
+uv run --with cleanpy cleanpy .
+# mcinit .
+# find "." -type f \( -name "*.py" -o -name "*.md" -o -name "*.json" \) -not -path "*/\.*" -not -path "*/__pycache__/*" -print0 | xargs -0 sed -i 's/[[:space:]]*$//'
+"""
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script)

machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -0,0 +1,41 @@
+
+import typer
+
+self_app = typer.Typer(help="🔄 SELF operations subcommands", no_args_is_help=True)
+
+
+@self_app.command()
+def update():
+    """🔄 UPDATE essential repos"""
+    import machineconfig.scripts.python.devops_helpers.devops_update_repos as helper
+    helper.main()
+@self_app.command()
+def interactive():
+    """🤖 INTERACTIVE configuration of machine."""
+    from machineconfig.scripts.python.interactive import main
+    main()
+@self_app.command()
+def status():
+    """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
+    import machineconfig.scripts.python.devops_helpers.devops_status as helper
+    helper.main()
+@self_app.command()
+def clone():
+    """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
+    import platform
+    from machineconfig.utils.code import run_shell_script
+    from machineconfig.profile.shell import create_default_shell_profile
+    if platform.system() == "Windows":
+        from machineconfig.setup_windows import MACHINECONFIG
+        create_default_shell_profile(method="copy")
+    else:
+        from machineconfig.setup_linux import MACHINECONFIG
+        create_default_shell_profile(method="reference")
+    run_shell_script(MACHINECONFIG.read_text(encoding="utf-8"))
+
+@self_app.command()
+def navigate():
+    """📚 NAVIGATE command structure with TUI"""
+    from machineconfig.scripts.python.devops_navigator import main
+    main()
+