machineconfig 5.0__tar.gz → 5.11__tar.gz

{machineconfig-5.0/src/machineconfig.egg-info → machineconfig-5.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.0
+Version: 5.11
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -161,6 +161,26 @@ curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/ma
 short `curl bit.ly/cfgcroshelllinux -L | bash`
 
 
+## Repository management CLI
+
+The DevOps CLI now exposes rich subcommands for working with git repositories. Run `python -m machineconfig.scripts.python.devops repos --help` to explore the hierarchy:
+
+* Top-level actions: `push`, `pull`, `commit`, `all`, and `analyze`.
+	* These commands accept `--recursive/-r` and `--no-sync` to control nested repos and automatic `uv sync`.
+* Sync workflows live under `sync`:
+	* `record` captures the current machine state into a `repos.json`.
+	* `capture` clones repos from a specification without changing commits.
+	* `checkout` aligns repositories to commits stored in the spec.
+	* `checkout-to-branch` switches repositories to the tracked branch.
+	* Each sync subcommand accepts `--cloud/-c` for fetching/saving specs from remote storage.
+
+Example:
+
+```bash
+python -m machineconfig.scripts.python.devops repos sync record ~/code --cloud my_remote
+python -m machineconfig.scripts.python.devops repos pull ~/code --recursive
+```
+
 # Author
 Alex Al-Saffar. [email](mailto:programmer@usa.com)
 

{machineconfig-5.0 → machineconfig-5.11}/README.md

@@ -127,6 +127,26 @@ curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/ma
 short `curl bit.ly/cfgcroshelllinux -L | bash`
 
 
+## Repository management CLI
+
+The DevOps CLI now exposes rich subcommands for working with git repositories. Run `python -m machineconfig.scripts.python.devops repos --help` to explore the hierarchy:
+
+* Top-level actions: `push`, `pull`, `commit`, `all`, and `analyze`.
+	* These commands accept `--recursive/-r` and `--no-sync` to control nested repos and automatic `uv sync`.
+* Sync workflows live under `sync`:
+	* `record` captures the current machine state into a `repos.json`.
+	* `capture` clones repos from a specification without changing commits.
+	* `checkout` aligns repositories to commits stored in the spec.
+	* `checkout-to-branch` switches repositories to the tracked branch.
+	* Each sync subcommand accepts `--cloud/-c` for fetching/saving specs from remote storage.
+
+Example:
+
+```bash
+python -m machineconfig.scripts.python.devops repos sync record ~/code --cloud my_remote
+python -m machineconfig.scripts.python.devops repos pull ~/code --recursive
+```
+
 # Author
 Alex Al-Saffar. [email](mailto:programmer@usa.com)
 

{machineconfig-5.0 → machineconfig-5.11}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.0"
+version = "5.11"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -64,7 +64,6 @@ cloud_mount = "machineconfig.scripts.python.cloud_mount:arg_parser"
 cloud_repo_sync = "machineconfig.scripts.python.cloud_repo_sync:args_parser"
 cloud_sync = "machineconfig.scripts.python.cloud_sync:arg_parser"
 ftpx = "machineconfig.scripts.python.ftpx:main_from_parser"
-repos = "machineconfig.scripts.python.repos:main_from_parser"
 
 start_slidev = "machineconfig.scripts.python.start_slidev:arg_parser"
 kill_process = "machineconfig.utils.procs:main"

{machineconfig-5.0 → machineconfig-5.11}/src/machineconfig/scripts/python/devops.py

@@ -12,7 +12,7 @@ app = typer.Typer(help=f"🛠️ DevOps operations @ machineconfig {__version__}
 
 app.command(name="install", help="📦 Install essential packages")(installer_entry_point.main)
 app.command(name="share-terminal", help="📡 Share terminal via web browser")(share_terminal.main)
-app.command(name="repos", help="📁 Manage git repositories")(repos.main)
+app.add_typer(repos.app, name="repos", help="📁 Manage git repositories")
 
 ssh_app = typer.Typer(help="🔐 SSH operations subcommands", no_args_is_help=True)
 app.add_typer(ssh_app, name="ssh")

{machineconfig-5.0 → machineconfig-5.11}/src/machineconfig/scripts/python/interactive.py

@@ -187,7 +187,7 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
     if "retrieve_repositories" in selected_options:
         console.print(Panel("📚 [bold bright_magenta]REPOSITORIES[/bold bright_magenta]\n[italic]Project code retrieval[/italic]", border_style="bright_magenta"))
         from machineconfig.scripts.python import repos as module
-        module.main(directory=str(Path.home() / "code"), clone=True, cloud="odg1")
+        module.main(directory=str(Path.home() / "code"), capture=True, cloud="odg1")
 
     if "retrieve_data" in selected_options:
         console.print(Panel("💾 [bold bright_cyan]DATA RETRIEVAL[/bold bright_cyan]\n[italic]Backup restoration[/italic]", border_style="bright_cyan"))

machineconfig-5.11/src/machineconfig/scripts/python/repos.py

@@ -0,0 +1,219 @@
+"""Repos CLI powered by Typer.
+
+# TODO use gh api user --jq '.login' to get the username and use it to clone the repos.
+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.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
+from pathlib import Path
+
+
+def _print_banner() -> None:
+    typer.echo("\n" + "=" * 50)
+    typer.echo("📂 Welcome to the Repository Manager")
+    typer.echo("=" * 50 + "\n")
+
+
+
+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")
+
+
+DirectoryArgument = Annotated[
+    Optional[str],
+    typer.Argument(help="📁 Folder containing repos or the specs JSON file to use."),
+]
+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."),
+]
+
+
+
+
+def _resolve_directory(directory: Optional[str]) -> Path:
+    if directory is None:
+        directory = Path.cwd().as_posix()
+        typer.echo(f"📁 Using directory: {directory}")
+    return Path(directory).expanduser().absolute()
+
+
+def _git_operations(
+    directory: Optional[str],
+    *,
+    pull: bool,
+    commit: bool,
+    push: bool,
+    recursive: bool,
+    no_sync: bool,
+) -> None:
+    _print_banner()
+    repos_root = _resolve_directory(directory)
+    auto_sync = not no_sync
+    from machineconfig.scripts.python.repos_helper_action import perform_git_operations
+    from machineconfig.utils.path_extended import PathExtended
+    perform_git_operations(
+        repos_root=PathExtended(repos_root),
+        pull=pull,
+        commit=commit,
+        push=push,
+        recursive=recursive,
+        auto_sync=auto_sync,
+    )
+
+
+def _resolve_spec_path(directory: Optional[str], cloud: Optional[str]) -> Path:
+    repos_root = _resolve_directory(directory)
+    from machineconfig.utils.path_extended import PathExtended
+    if not repos_root.exists() or repos_root.name != "repos.json":
+        candidate = Path(CONFIG_PATH).joinpath("repos").joinpath(PathExtended(repos_root).rel2home()).joinpath("repos.json")
+        repos_root = candidate
+        if not repos_root.exists():
+            cloud_name: Optional[str]
+            if cloud is None:
+                from machineconfig.utils.io import read_ini
+                cloud_name = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
+                typer.echo(f"⚠️ Using default cloud: {cloud_name}")
+            else:
+                cloud_name = cloud
+            assert cloud_name is not None, (
+                f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
+            )
+            from machineconfig.utils.path_extended import PathExtended
+            PathExtended(repos_root).from_cloud(cloud=cloud_name, rel2home=True)
+    assert repos_root.exists() and repos_root.name == "repos.json", (
+        f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
+    )
+    return repos_root
+
+
+def _clone_from_specs(
+    directory: Optional[str],
+    cloud: Optional[str],
+    *,
+    checkout_branch_flag: bool,
+    checkout_commit_flag: bool,
+) -> None:
+    _print_banner()
+    typer.echo("\n📥 Cloning or checking out repositories...")
+    spec_path = _resolve_spec_path(directory, cloud)
+    from machineconfig.scripts.python.repos_helper_clone import clone_repos
+
+    clone_repos(
+        spec_path=spec_path,
+        preferred_remote=None,
+        checkout_branch_flag=checkout_branch_flag,
+        checkout_commit_flag=checkout_commit_flag,
+    )
+
+
+@app.command()
+def push(
+    directory: DirectoryArgument = None,
+    recursive: RecursiveOption = False,
+    no_sync: NoSyncOption = False,
+) -> None:
+    """🚀 Push changes across repositories."""
+    _git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, no_sync=no_sync)
+
+
+@app.command()
+def pull(
+    directory: DirectoryArgument = None,
+    recursive: RecursiveOption = False,
+    no_sync: NoSyncOption = False,
+) -> None:
+    """⬇️ Pull changes across repositories."""
+    _git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, no_sync=no_sync)
+
+
+@app.command()
+def commit(
+    directory: DirectoryArgument = None,
+    recursive: RecursiveOption = False,
+    no_sync: NoSyncOption = False,
+) -> None:
+    """💾 Commit changes across repositories."""
+    _git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, no_sync=no_sync)
+
+
+@app.command()
+def all(
+    directory: DirectoryArgument = None,
+    recursive: RecursiveOption = False,
+    no_sync: NoSyncOption = False,
+) -> None:
+    """🔄 Pull, commit, and push changes across repositories."""
+    _git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, no_sync=no_sync)
+
+
+@sync_app.command()
+def record(
+    directory: DirectoryArgument = None,
+    cloud: CloudOption = None,
+) -> None:
+    """📝 Record repositories into a repos.json specification."""
+    _print_banner()
+    repos_root = _resolve_directory(directory)
+    from machineconfig.scripts.python.repos_helper_record import main as record_repos
+    save_path = record_repos(repos_root=repos_root)
+    from machineconfig.utils.path_extended import PathExtended
+    if cloud is not None:
+        PathExtended(save_path).to_cloud(rel2home=True, cloud=cloud)
+
+
+@sync_app.command()
+def capture(
+    directory: DirectoryArgument = None,
+    cloud: CloudOption = None,
+) -> None:
+    """📥 Clone repositories described by a repos.json specification."""
+    _clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=False)
+
+
+@sync_app.command(name="checkout")
+def checkout_command(
+    directory: DirectoryArgument = None,
+    cloud: CloudOption = None,
+) -> None:
+    """🔀 Check out specific commits listed in the specification."""
+    _clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=True)
+
+
+@sync_app.command(name="checkout-to-branch")
+def checkout_to_branch_command(
+    directory: DirectoryArgument = None,
+    cloud: CloudOption = None,
+) -> None:
+    """🔀 Check out to the main branch defined in the specification."""
+    _clone_from_specs(directory, cloud, checkout_branch_flag=True, checkout_commit_flag=False)
+
+
+@app.command()
+def analyze(
+    directory: DirectoryArgument = None,
+) -> None:
+    """📊 Analyze repository development over time."""
+    _print_banner()
+    repo_path = directory if directory is not None else "."
+    from machineconfig.scripts.python.count_lines_frontend import analyze_repo_development as _analyze
+
+    _analyze(repo_path=repo_path)
+

{machineconfig-5.0 → machineconfig-5.11}/src/machineconfig/scripts/python/repos_helper_record.py

@@ -1,4 +1,5 @@
 from machineconfig.utils.path_extended import PathExtended
+from pathlib import Path
 from machineconfig.utils.schemas.repos.repos_types import GitVersionInfo, RepoRecordDict, RepoRemote
 
 from machineconfig.utils.schemas.repos.repos_types import RepoRecordFile
@@ -185,8 +186,9 @@ def record_repos_recursively(repos_root: str, r: bool, progress: Progress | None
     return res
 
 
-def main(repos_root: PathExtended):
+def main(repos_root: Path):
     print("\n📝 Recording repositories...")
+    repos_root = PathExtended(repos_root).expanduser().absolute()
 
     # Count total directories and repositories for accurate progress tracking
     print("🔍 Analyzing directory structure...")

{machineconfig-5.0 → machineconfig-5.11/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.0
+Version: 5.11
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -161,6 +161,26 @@ curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/ma
 short `curl bit.ly/cfgcroshelllinux -L | bash`
 
 
+## Repository management CLI
+
+The DevOps CLI now exposes rich subcommands for working with git repositories. Run `python -m machineconfig.scripts.python.devops repos --help` to explore the hierarchy:
+
+* Top-level actions: `push`, `pull`, `commit`, `all`, and `analyze`.
+	* These commands accept `--recursive/-r` and `--no-sync` to control nested repos and automatic `uv sync`.
+* Sync workflows live under `sync`:
+	* `record` captures the current machine state into a `repos.json`.
+	* `capture` clones repos from a specification without changing commits.
+	* `checkout` aligns repositories to commits stored in the spec.
+	* `checkout-to-branch` switches repositories to the tracked branch.
+	* Each sync subcommand accepts `--cloud/-c` for fetching/saving specs from remote storage.
+
+Example:
+
+```bash
+python -m machineconfig.scripts.python.devops repos sync record ~/code --cloud my_remote
+python -m machineconfig.scripts.python.devops repos pull ~/code --recursive
+```
+
 # Author
 Alex Al-Saffar. [email](mailto:programmer@usa.com)
 

{machineconfig-5.0 → machineconfig-5.11}/src/machineconfig.egg-info/SOURCES.txt

@@ -133,7 +133,6 @@ src/machineconfig/scripts/linux/mount_drive
 src/machineconfig/scripts/linux/mount_nfs
 src/machineconfig/scripts/linux/mount_nw_drive
 src/machineconfig/scripts/linux/mount_smb
-src/machineconfig/scripts/linux/repos
 src/machineconfig/scripts/linux/scheduler
 src/machineconfig/scripts/linux/sessions
 src/machineconfig/scripts/linux/share_cloud.sh
@@ -255,7 +254,6 @@ src/machineconfig/scripts/windows/mount_ssh.ps1
 src/machineconfig/scripts/windows/nano.ps1
 src/machineconfig/scripts/windows/pomodoro.ps1
 src/machineconfig/scripts/windows/reload_path.ps1
-src/machineconfig/scripts/windows/repos.ps1
 src/machineconfig/scripts/windows/scheduler.ps1
 src/machineconfig/scripts/windows/sessions.ps1
 src/machineconfig/scripts/windows/share_cloud.cmd

{machineconfig-5.0 → machineconfig-5.11}/src/machineconfig.egg-info/entry_points.txt

@@ -13,7 +13,6 @@ initai = machineconfig.scripts.python.ai.initai:main
 kill_process = machineconfig.utils.procs:main
 mount_nfs = machineconfig.scripts.python.mount_nfs:main
 mount_nw_drive = machineconfig.scripts.python.mount_nw_drive:main
-repos = machineconfig.scripts.python.repos:main_from_parser
 sessions = machineconfig.scripts.python.sessions:main_from_parser
 start_slidev = machineconfig.scripts.python.start_slidev:arg_parser
 wifi_conn = machineconfig.scripts.python.wifi_conn:arg_parser

machineconfig-5.0/src/machineconfig/scripts/linux/repos

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-uv run --python 3.13 --no-dev --project $HOME/code/machineconfig repos "$@"

machineconfig-5.0/src/machineconfig/scripts/python/repos.py

@@ -1,100 +0,0 @@
-"""Repos
-
-# TODO use gh api user --jq '.login' to get the username and use it to clone the repos.
-in the event that username@github.com is not mentioned in the remote url.
-
-"""
-
-
-import typer
-from typing import Annotated, Optional
-from pathlib import Path
-
-
-def analyze_repo_development(repo_path: str = typer.Argument(..., help="Path to the git repository")):
-    cmd = f"""uv run --python 3.13 --with machineconfig machineconfig.scripts.python.count_lines analyze-over-time {repo_path}"""
-    from machineconfig.utils.code import run_script
-    run_script(cmd)
-
-
-def main(
-    directory: Annotated[Optional[str], typer.Argument(help="📁 Folder containing repos to record or a specs JSON file to follow.")] = None,
-    push: Annotated[bool, typer.Option("--push", help="🚀 Push changes.")] = False,
-    pull: Annotated[bool, typer.Option("--pull", help="⬇️ Pull changes.")] = False,
-    commit: Annotated[bool, typer.Option("--commit", help="💾 Commit changes.")] = False,
-    all: Annotated[bool, typer.Option("--all", help="🔄 Pull, commit, and push changes.")] = False,
-    record: Annotated[bool, typer.Option("--record", help="📝 Record repositories.")] = False,
-    clone: Annotated[bool, typer.Option("--clone", help="📥 Clone repositories from record.")] = False,
-    checkout: Annotated[bool, typer.Option("--checkout", help="🔀 Check out to versions provided in a JSON file.")] = False,
-    checkout_to_branch: Annotated[bool, typer.Option("--checkout-to-branch", help="🔀 Check out to the main branch.")] = False,
-    recursive: Annotated[bool, typer.Option("--recursive", "-r", help="🔍 Recursive flag.")] = False,
-    no_sync: Annotated[bool, typer.Option("--no-sync", help="🚫 Disable automatic uv sync after pulls.")] = False,
-    cloud: Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁️ Cloud storage option.")] = None,
-    analyze: Annotated[bool, typer.Option("--analyze", help="📊 Analyze repository development over time.")] = False,
-) -> None:
-    print("\n" + "=" * 50)
-    print("📂 Welcome to the Repository Manager")
-    print("=" * 50 + "\n")
-
-    if analyze:
-        from machineconfig.scripts.python.count_lines_frontend import analyze_repo_development
-        analyze_repo_development(repo_path=directory if directory is not None else ".")
-        return
-    # app.command(name="analyze-repo", help="📊 Analyze code repository over time")(analyze_repo_development)
-
-    from machineconfig.utils.io import read_ini
-    from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
-    from machineconfig.utils.path_extended import PathExtended
-    from machineconfig.scripts.python.repos_helper_record import main as record_repos
-    from machineconfig.scripts.python.repos_helper_clone import clone_repos
-    from machineconfig.scripts.python.repos_helper_action import perform_git_operations
-
-    if directory is None:
-        directory = Path.cwd().as_posix()
-        print(f"📁 Using directory: {directory}")
-    repos_root = PathExtended(directory).expanduser().absolute()
-    auto_sync = not no_sync  # Enable auto sync by default, disable with --no-sync
-    if record:
-        save_path = record_repos(repos_root=repos_root)
-        if cloud is not None:
-            PathExtended(save_path).to_cloud(rel2home=True, cloud=cloud)
-
-    elif clone or checkout or checkout_to_branch:
-        print("\n📥 Cloning or checking out repositories...")
-        if not repos_root.exists() or repos_root.name != "repos.json":
-            repos_root = PathExtended(CONFIG_PATH).joinpath("repos").joinpath(repos_root.rel2home()).joinpath("repos.json")
-            if not repos_root.exists():
-                if cloud is None:
-                    cloud_name: str = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
-                    print(f"⚠️ Using default cloud: {cloud_name}")
-                else:
-                    cloud_name = cloud
-                    assert cloud_name is not None, f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
-                repos_root.from_cloud(cloud=cloud_name, rel2home=True)
-        assert (repos_root.exists() and repos_root.name == "repos.json") or cloud is not None, f"Path {repos_root} does not exist and cloud was not passed. You can't clone without one of them."
-        clone_repos(spec_path=repos_root, preferred_remote=None, checkout_branch_flag=checkout_to_branch, checkout_commit_flag=checkout)
-
-    elif all or commit or pull or push:
-        perform_git_operations(
-            repos_root=repos_root,
-            pull=pull or all,
-            commit=commit or all,
-            push=push or all,
-            recursive=recursive,
-            auto_sync=auto_sync
-        )
-    else:
-        # print("❌ No action specified. Try passing --push, --pull, --commit, or --all.")
-        typer.echo("❌ No action specified. Try passing --push, --pull, --commit, or --all.")
-        import click
-        ctx = click.get_current_context()
-        typer.echo(ctx.get_help())
-        raise typer.Exit(1)
-
-
-def main_from_parser() -> None:
-    typer.run(main)
-
-
-if __name__ == "__main__":
-    main_from_parser()

machineconfig-5.0/src/machineconfig/scripts/windows/repos.ps1

@@ -1 +0,0 @@
-uv run --python 3.13 --no-dev --project $HOME/code/machineconfig repos $args