machineconfig 5.29__tar.gz → 5.31__tar.gz

{machineconfig-5.29/src/machineconfig.egg-info → machineconfig-5.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.29
+Version: 5.31
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -27,6 +27,7 @@ Requires-Dist: pyjson5>=1.6.9
 Requires-Dist: typer-slim>=0.19.2
 Requires-Dist: questionary>=2.1.1
 Requires-Dist: typer>=0.19.2
+Requires-Dist: textual>=6.1.0
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: docs

{machineconfig-5.29 → machineconfig-5.31}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.29"
+version = "5.31"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -36,6 +36,7 @@ dependencies = [
     "typer-slim>=0.19.2",
     "questionary>=2.1.1",
     "typer>=0.19.2",
+    "textual>=6.1.0",
 ]
 
 [project.optional-dependencies]
@@ -57,6 +58,7 @@ fire = "machineconfig.scripts.python.fire_jobs:main_from_parser"
 initai = "machineconfig.scripts.python.ai.initai:main"
 agents = "machineconfig.scripts.python.agents:main_from_parser"
 sessions = "machineconfig.scripts.python.sessions:main_from_parser"
+commands = "machineconfig.scripts.python.command_navigator:main_from_parser"
 
 choose_wezterm_theme = "machineconfig.scripts.python.choose_wezterm_theme:main"
 cloud_copy = "machineconfig.scripts.python.cloud_copy:arg_parser"

machineconfig-5.31/src/machineconfig/scripts/python/devops.py

@@ -0,0 +1,49 @@
+"""devops with emojis"""
+
+import typer
+from typing import Optional
+
+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, 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."),
+    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:
+    """📦 Install essential packages"""
+    import machineconfig.utils.installer_utils.installer as installer_entry_point
+    installer_entry_point.main(which=which, group=group, interactive=interactive)
+
+
+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")
+app.add_typer(cli_network.nw_apps, name="network")
+
+
+
+
+# @app.command()
+# def scheduler():
+#     """⏰ SCHEDULER"""
+#     # from machineconfig.scripts.python.scheduler import main as helper
+#     # helper()
+
+
+
+# @app.command()
+# def scheduler():
+#     """⏰ SCHEDULER"""
+#     # from machineconfig.scripts.python.scheduler import main as helper
+#     # helper()
+
+
+if __name__ == "__main__":
+    pass

machineconfig-5.31/src/machineconfig/scripts/python/devops_helpers/choose_pwsh_theme.ps1

@@ -0,0 +1,44 @@
+# Requires: fzf, oh-my-posh
+# Purpose: Interactive Oh My Posh theme chooser with live preview
+
+# Path to your Oh My Posh themes directory
+$themesDir = "$env:LOCALAPPDATA\Programs\oh-my-posh\themes"
+
+if (-not (Test-Path $themesDir)) {
+    Write-Host "Themes directory not found at $themesDir" -ForegroundColor Red
+    exit 1
+}
+
+# Get all theme files and extract just the theme names for display
+$themes = Get-ChildItem $themesDir -Filter "*.omp.json" | ForEach-Object {
+    [PSCustomObject]@{
+        Name = $_.BaseName
+        Path = $_.FullName
+    }
+}
+
+# Create a simple preview command that shows theme name and a sample prompt
+$previewCommand = "pwsh -NoProfile -Command `"Write-Host 'Theme: ' -NoNewline -ForegroundColor Cyan; Write-Host (Split-Path '{}' -Leaf); Write-Host ''; oh-my-posh print primary --config '{}' 2>`$null`""
+
+# Run fzf with preview
+$selectedThemeName = $themes | ForEach-Object { $_.Path } |
+    fzf --height 80% --border --ansi --reverse `
+        --header "Select an Oh My Posh theme (Ctrl+C to cancel)" `
+        --preview $previewCommand `
+        --preview-window=right:60%:wrap
+
+# After fzf selection
+if ($selectedThemeName) {
+    Write-Host "`nYou selected:" -ForegroundColor Green
+    Write-Host (Split-Path $selectedThemeName -Leaf) -ForegroundColor Yellow
+    Write-Host "`nApplying theme..." -ForegroundColor Cyan
+    
+    # Apply the theme to current session
+    oh-my-posh init pwsh --config $selectedThemeName | Invoke-Expression
+    
+    Write-Host "`nTheme applied to current session!" -ForegroundColor Green
+    Write-Host "To make this permanent, add this line to your PowerShell profile:" -ForegroundColor Cyan
+    Write-Host "oh-my-posh init pwsh --config '$selectedThemeName' | Invoke-Expression" -ForegroundColor Yellow
+} else {
+    Write-Host "`nNo theme selected." -ForegroundColor DarkGray
+}

machineconfig-5.31/src/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-5.31/src/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-5.31/src/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-5.29/src/machineconfig/scripts/python/repos.py → machineconfig-5.31/src/machineconfig/scripts/python/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-5.31/src/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()
+