machineconfig 5.11__tar.gz → 5.12__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.11
+Version: 5.12
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

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

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.11"
+version = "5.12"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-5.11 → machineconfig-5.12}/src/machineconfig/scripts/python/count_lines.py

@@ -9,6 +9,7 @@ from pathlib import Path
 from rich.progress import track
 import polars as pl
 import plotly.graph_objects as go
+
 import plotly.express as px
 import typer
 

machineconfig-5.12/src/machineconfig/scripts/python/count_lines_frontend.py

@@ -0,0 +1,16 @@
+
+import typer
+
+
+def analyze_repo_development(repo_path: str = typer.Argument(..., help="Path to the git repository")):
+    from machineconfig.scripts.python import count_lines
+    from pathlib import Path
+    count_lines_path = Path(count_lines.__file__).resolve().parent.joinpath("count_lines.py")
+    # --project $HOME/code/machineconfig 
+    cmd = f"""uv run --python 3.13 --with machineconfig--group plot {count_lines_path} analyze-over-time {repo_path}"""
+    from machineconfig.utils.code import run_script
+    run_script(cmd)
+
+
+if __name__ == "__main__":
+    pass

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

@@ -9,7 +9,6 @@ import typer
 
 
 app = typer.Typer(help=f"🛠️ DevOps operations @ machineconfig {__version__}", no_args_is_help=True)
-
 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.add_typer(repos.app, name="repos", help="📁 Manage git repositories")

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

@@ -0,0 +1,132 @@
+"""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 typing import Annotated, Optional
+import typer
+
+
+
+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."),
+]
+
+
+
+@app.command()
+def push(directory: DirectoryArgument = None,
+    recursive: RecursiveOption = False,
+    no_sync: NoSyncOption = False,
+) -> None:
+    """🚀 Push changes across repositories."""
+    from machineconfig.scripts.python.repos_helper import git_operations
+    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."""
+    from machineconfig.scripts.python.repos_helper import git_operations
+    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."""
+    from machineconfig.scripts.python.repos_helper import git_operations
+    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."""
+    from machineconfig.scripts.python.repos_helper import git_operations
+    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."""
+    from machineconfig.scripts.python.repos_helper import print_banner, resolve_directory
+    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."""
+    from machineconfig.scripts.python.repos_helper import print_banner, clone_from_specs
+    print_banner()
+    clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=False)
+
+
+@sync_app.command(name="checkout-to-commit")
+def checkout_command(
+    directory: DirectoryArgument = None,
+    cloud: CloudOption = None,
+) -> None:
+    """🔀 Check out specific commits listed in the specification."""
+    from machineconfig.scripts.python.repos_helper import print_banner, clone_from_specs
+    print_banner()
+    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."""
+    from machineconfig.scripts.python.repos_helper import print_banner, clone_from_specs
+    print_banner()
+    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."""
+    from machineconfig.scripts.python.repos_helper import print_banner
+    print_banner()
+    repo_path = directory if directory is not None else "."
+    from machineconfig.scripts.python.count_lines_frontend import analyze_repo_development
+    analyze_repo_development(repo_path=repo_path)
+

machineconfig-5.12/src/machineconfig/scripts/python/repos_helper.py

@@ -0,0 +1,85 @@
+
+
+
+from typing import Optional
+from pathlib import Path
+from machineconfig.utils.source_of_truth import CONFIG_PATH, DEFAULTS_PATH
+
+import typer
+
+
+
+def print_banner() -> None:
+    typer.echo("\n" + "=" * 50)
+    typer.echo("📂 Welcome to the Repository Manager")
+    typer.echo("=" * 50 + "\n")
+
+
+
+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,
+    )

{machineconfig-5.11 → machineconfig-5.12}/src/machineconfig/scripts/python/repos_helper_action.py

@@ -7,6 +7,9 @@ from dataclasses import dataclass
 from enum import Enum
 
 from rich import print as pprint
+from rich.table import Table
+from rich.panel import Panel
+from rich.columns import Columns
 
 
 class GitAction(Enum):
@@ -191,87 +194,127 @@ def git_action(path: PathExtended, action: GitAction, mess: Optional[str] = None
 
 
 def print_git_operations_summary(summary: GitOperationSummary, operations_performed: list[str]) -> None:
-    """Print a detailed summary of git operations similar to repos_helper_record.py."""
-    print("\n📊 Git Operations Summary:")
-    print(f"   Total paths processed: {summary.total_paths_processed}")
-    print(f"   Git repositories found: {summary.git_repos_found}")
-    print(f"   Non-git paths skipped: {summary.non_git_paths}")
-    
-    # Show per-operation statistics
+    """Print a detailed summary of git operations with rich formatting and tables."""
+    from rich.console import Console
+    console = Console()
+
+    # Main summary panel
+    summary_stats = [
+        f"Total paths processed: {summary.total_paths_processed}",
+        f"Git repositories found: {summary.git_repos_found}",
+        f"Non-git paths skipped: {summary.non_git_paths}"
+    ]
+
+    console.print(Panel.fit(
+        "\n".join(summary_stats),
+        title="[bold blue]📊 Git Operations Summary[/bold blue]",
+        border_style="blue"
+    ))
+
+    # Statistics panels in columns
+    stat_panels = []
+
     if "commit" in operations_performed:
-        print("\n💾 Commit Operations:")
-        print(f"   Attempted: {summary.commits_attempted}")
-        print(f"   Successful: {summary.commits_successful}")
-        print(f"   No changes: {summary.commits_no_changes}")
-        print(f"   Failed: {summary.commits_failed}")
-        
+        commit_stats = [
+            f"Attempted: {summary.commits_attempted}",
+            f"Successful: {summary.commits_successful}",
+            f"No changes: {summary.commits_no_changes}",
+            f"Failed: {summary.commits_failed}"
+        ]
+        stat_panels.append(Panel.fit(
+            "\n".join(commit_stats),
+            title="[bold green]💾 Commit Operations[/bold green]",
+            border_style="green"
+        ))
+
     if "pull" in operations_performed:
-        print("\n⬇️ Pull Operations:")
-        print(f"   Attempted: {summary.pulls_attempted}")
-        print(f"   Successful: {summary.pulls_successful}")
-        print(f"   Failed: {summary.pulls_failed}")
-        
+        pull_stats = [
+            f"Attempted: {summary.pulls_attempted}",
+            f"Successful: {summary.pulls_successful}",
+            f"Failed: {summary.pulls_failed}"
+        ]
+        stat_panels.append(Panel.fit(
+            "\n".join(pull_stats),
+            title="[bold cyan]⬇️ Pull Operations[/bold cyan]",
+            border_style="cyan"
+        ))
+
     if "push" in operations_performed:
-        print("\n🚀 Push Operations:")
-        print(f"   Attempted: {summary.pushes_attempted}")
-        print(f"   Successful: {summary.pushes_successful}")
-        print(f"   Failed: {summary.pushes_failed}")
+        push_stats = [
+            f"Attempted: {summary.pushes_attempted}",
+            f"Successful: {summary.pushes_successful}",
+            f"Failed: {summary.pushes_failed}"
+        ]
+        stat_panels.append(Panel.fit(
+            "\n".join(push_stats),
+            title="[bold magenta]🚀 Push Operations[/bold magenta]",
+            border_style="magenta"
+        ))
 
-    # Show repositories without remotes (important for push operations)
+    if stat_panels:
+        console.print(Columns(stat_panels, equal=True, expand=True))
+
+    # Repositories without remotes warning
     if summary.repos_without_remotes:
-        print(f"\n⚠️  WARNING: {len(summary.repos_without_remotes)} repositories have no remote configurations:")
+        repos_table = Table(title="[bold yellow]⚠️ Repositories Without Remotes[/bold yellow]")
+        repos_table.add_column("Repository Name", style="cyan", no_wrap=True)
+        repos_table.add_column("Full Path", style="dim")
+
         for repo_path in summary.repos_without_remotes:
-            print(f"   • {repo_path.name} ({repo_path})")
-        print("   These repositories cannot be pushed to remote servers.")
-    else:
-        if "push" in operations_performed:
-            print("\n✅ All repositories have remote configurations.")
+            repos_table.add_row(repo_path.name, str(repo_path))
 
-    # Show failed operations
+        console.print(repos_table)
+        console.print("[yellow]These repositories cannot be pushed to remote servers.[/yellow]")
+    elif "push" in operations_performed:
+        console.print("[green]✅ All repositories have remote configurations.[/green]")
+
+    # Failed operations table
     if summary.failed_operations:
-        print(f"\n❌ FAILED OPERATIONS ({len(summary.failed_operations)} total):")
-        
-        # Group failed operations by type
+        failed_table = Table(title=f"[bold red]❌ Failed Operations ({len(summary.failed_operations)} total)[/bold red]")
+        failed_table.add_column("Action", style="bold red", no_wrap=True)
+        failed_table.add_column("Repository", style="cyan", no_wrap=True)
+        failed_table.add_column("Problem", style="red")
+
+        # Group failed operations by type for better organization
         failed_by_action = {}
         for failed_op in summary.failed_operations:
             if failed_op.action not in failed_by_action:
                 failed_by_action[failed_op.action] = []
             failed_by_action[failed_op.action].append(failed_op)
-            
+
         for action, failures in failed_by_action.items():
-            print(f"\n   {action.upper()} failures ({len(failures)}):")
             for failure in failures:
-                if not failure.is_git_repo:
-                    print(f"   • {failure.repo_path.name} ({failure.repo_path}) - Not a git repository")
-                else:
-                    print(f"   • {failure.repo_path.name} ({failure.repo_path}) - {failure.message}")
+                repo_name = failure.repo_path.name if failure.is_git_repo else f"{failure.repo_path.name} (not git repo)"
+                problem = failure.message if failure.is_git_repo else "Not a git repository"
+                failed_table.add_row(action.upper(), repo_name, problem)
+
+        console.print(failed_table)
     else:
-        print("\n✅ All git operations completed successfully!")
+        console.print("[green]✅ All git operations completed successfully![/green]")
 
     # Overall success assessment
     total_failed = len(summary.failed_operations)
-    total_operations = (summary.commits_attempted + summary.pulls_attempted + 
+    total_operations = (summary.commits_attempted + summary.pulls_attempted +
                        summary.pushes_attempted)
-    
+
     if total_failed == 0 and total_operations > 0:
-        print(f"\n🎉 SUCCESS: All {total_operations} operations completed successfully!")
+        console.print(f"\n[bold green]🎉 SUCCESS: All {total_operations} operations completed successfully![/bold green]")
     elif total_operations == 0:
-        print("\n📝 No git operations were performed.")
+        console.print("\n[blue]📝 No git operations were performed.[/blue]")
     else:
         success_rate = ((total_operations - total_failed) / total_operations * 100) if total_operations > 0 else 0
-        print(f"\n⚖️  SUMMARY: {total_operations - total_failed}/{total_operations} operations succeeded ({success_rate:.1f}% success rate)")
         if total_failed > 0:
-            print("   Review the failed operations above for details on what needs attention.")
+            console.print(f"\n[bold yellow]⚖️ SUMMARY: {total_operations - total_failed}/{total_operations} operations succeeded ({success_rate:.1f}% success rate)[/bold yellow]")
+            console.print("[yellow]Review the failed operations table above for details on what needs attention.[/yellow]")
+        else:
+            console.print(f"\n[bold green]⚖️ SUMMARY: {total_operations}/{total_operations} operations succeeded (100% success rate)[/bold green]")
 
 
 def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, push: bool, recursive: bool, auto_sync: bool) -> None:
     """Perform git operations on all repositories and provide detailed summary."""
     print(f"\n🔄 Performing Git actions on repositories @ `{repos_root}`...")
-    
-    # Initialize summary tracking
     summary = GitOperationSummary()
-    operations_performed = []
-    
+    operations_performed = []    
     # Determine which operations to perform
     if pull:
         operations_performed.append("pull")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.11
+Version: 5.12
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

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

@@ -181,6 +181,7 @@ src/machineconfig/scripts/python/mount_ssh.py
 src/machineconfig/scripts/python/onetimeshare.py
 src/machineconfig/scripts/python/pomodoro.py
 src/machineconfig/scripts/python/repos.py
+src/machineconfig/scripts/python/repos_helper.py
 src/machineconfig/scripts/python/repos_helper_action.py
 src/machineconfig/scripts/python/repos_helper_clone.py
 src/machineconfig/scripts/python/repos_helper_record.py

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

@@ -1,12 +0,0 @@
-
-import typer
-
-
-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)
-
-
-if __name__ == "__main__":
-    pass