machineconfig 6.81__tar.gz → 6.83__tar.gz

{machineconfig-6.81/src/machineconfig.egg-info → machineconfig-6.83}/PKG-INFO

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

{machineconfig-6.81 → machineconfig-6.83}/pyproject.toml

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

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/scripts/linux/mcfgs

@@ -25,6 +25,7 @@ mcfg "$@"
 
 if [[ -f "$OP_PROGRAM_PATH" ]]; then
   printf "%b\n" "${GREEN}✅ Found op program:${RESET} ${OP_PROGRAM_PATH}"
+  bat "$OP_PROGRAM_PATH"
   printf "%b\n" "${GREEN}▶ Running...${RESET}"
   . "$OP_PROGRAM_PATH"
   status=$?

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

@@ -2,7 +2,7 @@
 # /// script
 # requires-python = ">=3.13"
 # dependencies = [
-#     "machineconfig>=6.81",
+#     "machineconfig>=6.83",
 #     "textual",
 #     "pyperclip",
 # ]

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -46,7 +46,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.81")
+        uv_with.append("machineconfig>=6.83")
     else:
         uv_project_dir = str(Path.home().joinpath("code/machineconfig"))
     run_shell_script(get_uv_command_executing_python_script(python_script=path.read_text(encoding="utf-8"), uv_with=uv_with, uv_project_dir=uv_project_dir)[0])

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -41,9 +41,9 @@ def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-n
     else:
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.81" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.83" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.81" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.83" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -68,7 +68,7 @@ def navigate():
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
     if Path.home().joinpath("code/machineconfig").exists(): executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
-    else: executable = """--with "machineconfig>=6.81,textual" """
+    else: executable = """--with "machineconfig>=6.83,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

machineconfig-6.83/src/machineconfig/scripts/python/helpers_repos/action.py

@@ -0,0 +1,209 @@
+from machineconfig.scripts.python.helpers_repos.action_helper import GitAction, GitOperationResult, GitOperationSummary, print_git_operations_summary
+from machineconfig.utils.path_extended import PathExtended
+from machineconfig.utils.accessories import randstr
+from machineconfig.scripts.python.helpers_repos.update import update_repository
+
+from typing import Optional, Dict, Any, List, cast
+import concurrent.futures
+import os
+
+from rich import print as pprint
+
+
+def git_action(path: PathExtended, action: GitAction, mess: Optional[str], r: bool, auto_uv_sync: bool) -> GitOperationResult:
+    """Perform git actions using Python instead of shell scripts. Returns detailed operation result."""
+    from git.exc import InvalidGitRepositoryError
+    from git.repo import Repo
+
+    try:
+        repo = Repo(str(path), search_parent_directories=False)
+    except InvalidGitRepositoryError:
+        pprint(f"⚠️ Skipping {path} because it is not a git repository.")
+        if r:
+            results = [git_action(path=sub_path, action=action, mess=mess, r=r, auto_uv_sync=auto_uv_sync) for sub_path in path.search()]
+            # For recursive calls, we need to aggregate results somehow
+            # For now, return success if all recursive operations succeeded
+            all_successful = all(result.success for result in results)
+            return GitOperationResult(
+                repo_path=path,
+                action=action.value,
+                success=all_successful,
+                message=f"Recursive operation: {len([r for r in results if r.success])}/{len(results)} succeeded",
+                is_git_repo=False,
+            )
+        else:
+            return GitOperationResult(repo_path=path, action=action.value, success=False, message="Not a git repository", is_git_repo=False)
+
+    print(f">>>>>>>>> 🔧{action} - {path}")
+    remote_count = len(repo.remotes)
+
+    try:
+        if action == GitAction.commit:
+            if mess is None:
+                mess = "auto_commit_" + randstr()
+
+            # Check if there are changes to commit
+            if repo.is_dirty() or repo.untracked_files:
+                repo.git.add(A=True)  # Stage all changes
+                repo.index.commit(mess)
+                print(f"✅ Committed changes with message: {mess}")
+                return GitOperationResult(
+                    repo_path=path,
+                    action=action.value,
+                    success=True,
+                    message=f"Committed changes with message: {mess}",
+                    had_changes=True,
+                    remote_count=remote_count,
+                )
+            else:
+                print("ℹ️  No changes to commit")
+                return GitOperationResult(
+                    repo_path=path, action=action.value, success=True, message="No changes to commit", had_changes=False, remote_count=remote_count
+                )
+
+        elif action == GitAction.push:
+            if not repo.remotes:
+                print("⚠️ No remotes configured for push")
+                return GitOperationResult(repo_path=path, action=action.value, success=False, message="No remotes configured", remote_count=0)
+
+            success = True
+            failed_remotes = []
+            for remote in repo.remotes:
+                try:
+                    print(f"🚀 Pushing to {remote.url}")
+                    remote.push(repo.active_branch.name)
+                    print(f"✅ Pushed to {remote.name}")
+                except Exception as e:
+                    print(f"❌ Failed to push to {remote.name}: {e}")
+                    failed_remotes.append(f"{remote.name}: {str(e)}")
+                    success = False
+
+            message = "Push successful" if success else f"Push failed for: {', '.join(failed_remotes)}"
+            return GitOperationResult(repo_path=path, action=action.value, success=success, message=message, remote_count=remote_count)
+
+        elif action == GitAction.pull:
+            # Use the enhanced update function with uv sync support
+            try:
+                update_repository(repo, auto_uv_sync=auto_uv_sync, allow_password_prompt=False)
+                print("✅ Pull completed")
+                return GitOperationResult(
+                    repo_path=path, action=action.value, success=True, message="Pull completed successfully", remote_count=remote_count
+                )
+            except Exception as e:
+                print(f"❌ Pull failed: {e}")
+                return GitOperationResult(
+                    repo_path=path, action=action.value, success=False, message=f"Pull failed: {str(e)}", remote_count=remote_count
+                )
+
+    except Exception as e:
+        print(f"❌ Error performing {action} on {path}: {e}")
+        return GitOperationResult(repo_path=path, action=action.value, success=False, message=f"Error: {str(e)}", remote_count=remote_count)
+
+    # This should never be reached, but just in case
+    return GitOperationResult(repo_path=path, action=action.value, success=False, message="Unknown error", remote_count=remote_count)
+
+
+def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, push: bool, recursive: bool, auto_uv_sync: bool) -> None:
+    """Perform git operations on all repositories and provide detailed summary."""
+    print(f"\n🔄 Performing Git actions on repositories @ `{repos_root}`...")
+    summary = GitOperationSummary()
+    # Keep track of which operations we are performing
+    operations_performed: List[str] = []
+    if pull:
+        operations_performed.append("pull")
+    if commit:
+        operations_performed.append("commit")
+    if push:
+        operations_performed.append("push")
+
+    # Collect all candidate paths first
+    paths = list(repos_root.search("*"))
+
+    def _process_path(a_path: PathExtended) -> Dict[str, Any]:
+        """Worker that processes a single path and returns metadata and results."""
+        from git.exc import InvalidGitRepositoryError
+        from git.repo import Repo
+
+        result_payload: Dict[str, Any] = {"path": a_path, "is_git": False, "results": [], "repo_remotes_count": 0}
+        print(f"{('Handling ' + str(a_path)).center(80, '-')}")
+
+        try:
+            repo = Repo(str(a_path), search_parent_directories=False)
+        except InvalidGitRepositoryError:
+            result_payload["non_git"] = True
+            pprint(f"⚠️ Skipping {a_path} because it is not a git repository.")
+            return result_payload
+
+        # It's a git repo
+        result_payload["is_git"] = True
+        result_payload["repo_remotes_count"] = len(repo.remotes)
+
+        # Perform configured operations sequentially for this repo (the repo-level work is done concurrently between repos)
+        try:
+            if pull:
+                r = git_action(path=a_path, action=GitAction.pull, mess=None, r=recursive, auto_uv_sync=auto_uv_sync)
+                result_payload["results"].append(r)
+            if commit:
+                r = git_action(path=a_path, action=GitAction.commit, mess=None, r=recursive, auto_uv_sync=auto_uv_sync)
+                result_payload["results"].append(r)
+            if push:
+                r = git_action(path=a_path, action=GitAction.push, mess=None, r=recursive, auto_uv_sync=auto_uv_sync)
+                result_payload["results"].append(r)
+        except Exception as e:
+            # Capture any unexpected exception for this path
+            pprint(f"❌ Error processing {a_path}: {e}")
+
+        return result_payload
+
+    # Choose a reasonable number of workers
+    max_workers = min(32, (os.cpu_count() or 1) * 5, len(paths) or 1)
+
+    # Run the workers in parallel and aggregate results
+    with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as exc:
+        future_to_path = {exc.submit(_process_path, p): p for p in paths}
+        for fut in concurrent.futures.as_completed(future_to_path):
+            payload = fut.result()
+            a_path = cast(PathExtended, payload.get("path"))
+            summary.total_paths_processed += 1
+
+            if not payload.get("is_git"):
+                summary.non_git_paths += 1
+                continue
+
+            # git repo found
+            summary.git_repos_found += 1
+            if payload.get("repo_remotes_count", 0) == 0:
+                summary.repos_without_remotes.append(a_path)
+
+            for r in payload.get("results", []):
+                action_name = r.action if hasattr(r, "action") else ""
+                # Pull
+                if action_name == "pull":
+                    summary.pulls_attempted += 1
+                    if r.success:
+                        summary.pulls_successful += 1
+                    else:
+                        summary.pulls_failed += 1
+                        summary.failed_operations.append(r)
+                # Commit
+                elif action_name == "commit":
+                    summary.commits_attempted += 1
+                    if r.success:
+                        if getattr(r, "had_changes", False):
+                            summary.commits_successful += 1
+                        else:
+                            summary.commits_no_changes += 1
+                    else:
+                        summary.commits_failed += 1
+                        summary.failed_operations.append(r)
+                # Push
+                elif action_name == "push":
+                    summary.pushes_attempted += 1
+                    if r.success:
+                        summary.pushes_successful += 1
+                    else:
+                        summary.pushes_failed += 1
+                        summary.failed_operations.append(r)
+
+    # Print the detailed summary
+    print_git_operations_summary(summary, operations_performed)

machineconfig-6.83/src/machineconfig/scripts/python/helpers_repos/action_helper.py

@@ -0,0 +1,150 @@
+from enum import Enum
+from machineconfig.utils.path_extended import PathExtended
+
+
+from dataclasses import dataclass
+
+from rich.columns import Columns
+from rich.panel import Panel
+from rich.table import Table
+
+
+@dataclass
+class GitOperationResult:
+    """Result of a git operation on a single repository."""
+    repo_path: PathExtended
+    action: str
+    success: bool
+    message: str
+    is_git_repo: bool = True
+    had_changes: bool = False
+    remote_count: int = 0
+
+
+class GitAction(Enum):
+    commit = "commit"
+    push = "push"
+    pull = "pull"
+
+
+@dataclass
+class GitOperationSummary:
+    """Summary of all git operations performed."""
+
+    # Basic statistics
+    total_paths_processed: int = 0
+    git_repos_found: int = 0
+    non_git_paths: int = 0
+
+    # Per-operation statistics
+    commits_attempted: int = 0
+    commits_successful: int = 0
+    commits_no_changes: int = 0
+    commits_failed: int = 0
+
+    pulls_attempted: int = 0
+    pulls_successful: int = 0
+    pulls_failed: int = 0
+
+    pushes_attempted: int = 0
+    pushes_successful: int = 0
+    pushes_failed: int = 0
+
+    def __post_init__(self):
+        self.failed_operations: list[GitOperationResult] = []
+        self.repos_without_remotes: list[PathExtended] = []
+
+
+def print_git_operations_summary(summary: GitOperationSummary, operations_performed: list[str]) -> None:
+    """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:
+        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:
+        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:
+        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"))
+
+    if stat_panels:
+        console.print(Columns(stat_panels, equal=True, expand=True))
+
+    # Repositories without remotes warning
+    if summary.repos_without_remotes:
+        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:
+            repos_table.add_row(repo_path.name, str(repo_path))
+
+        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:
+        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():
+            for failure in failures:
+                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:
+        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 + summary.pushes_attempted
+
+    if total_failed == 0 and total_operations > 0:
+        console.print(f"\n[bold green]🎉 SUCCESS: All {total_operations} operations completed successfully![/bold green]")
+    elif total_operations == 0:
+        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
+        if total_failed > 0:
+            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]")

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -80,7 +80,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=6.81"]
+        uv_with = ["machineconfig>=6.83"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/scripts/python/nw/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.14 --with "machineconfig>=6.81" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.83" python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.81" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.83" python -m machineconfig.scripts.python.mount_ssh
 
 net use T: \\sshfs.kr\$user@$host.local
 # this worked: net use T: \\sshfs\alex@alex-p51s-5.local

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 mcfg() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.81" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.83" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -2,7 +2,7 @@
 
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
 function mcfg {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.81" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.83" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig/utils/ssh.py

@@ -8,7 +8,7 @@ from machineconfig.utils.terminal import Response
 from machineconfig.utils.accessories import pprint, randstr
 from machineconfig.utils.meta import lambda_to_python_script
 UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-MACHINECONFIG_VERSION = "machineconfig>=6.81"
+MACHINECONFIG_VERSION = "machineconfig>=6.83"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:

{machineconfig-6.81 → machineconfig-6.83/src/machineconfig.egg-info}/PKG-INFO

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

{machineconfig-6.81 → machineconfig-6.83}/src/machineconfig.egg-info/SOURCES.txt

@@ -229,6 +229,7 @@ src/machineconfig/scripts/python/helpers_navigator/data_models.py
 src/machineconfig/scripts/python/helpers_navigator/main_app.py
 src/machineconfig/scripts/python/helpers_navigator/search_bar.py
 src/machineconfig/scripts/python/helpers_repos/action.py
+src/machineconfig/scripts/python/helpers_repos/action_helper.py
 src/machineconfig/scripts/python/helpers_repos/clone.py
 src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py
 src/machineconfig/scripts/python/helpers_repos/count_lines.py