machineconfig 4.97__py3-none-any.whl → 4.99__py3-none-any.whl

machineconfig/cluster/remote/script_execution.py

@@ -127,7 +127,7 @@
 # ⏱️  Total execution time: {delta}
 # 🔍 Error message: {params.error_message}
 # 📂 Results located at: {res_folder.collapseuser().as_posix()}
-# ═════════════════════════════════════════════════════════════════
+# ════════════════════════════════════════════════════════════════
 # """)
 
 # # Capture exec_times as string for the readme

machineconfig/jobs/installer/custom/gh.py

@@ -3,6 +3,10 @@
 import platform
 import subprocess
 from typing import Optional
+
+from rich.console import Console
+from rich.panel import Panel
+
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
@@ -27,72 +31,97 @@ config_dict: InstallerData = {
 }
 
 
+console = Console()
+
+
 def main(version: Optional[str]):
-    print(f"""
-{"═" * 150}
-🔱 GITHUB CLI INSTALLER | Command line tool for GitHub
-💻 Platform: {platform.system()}
-🔄 Version: {"latest" if version is None else version}
-{"═" * 150}
-""")
+    console.print(
+        Panel.fit(
+            "\n".join(
+                [
+                    "[bold magenta]GitHub CLI Installer[/bold magenta]",
+                    f"💻 Platform: {platform.system()}",
+                    f"🔄 Version: {version or 'latest'}",
+                ]
+            ),
+            title="🔱 GitHub CLI",
+            border_style="magenta",
+            padding=(1, 2),
+        )
+    )
 
     _ = version
     inst = Installer(installer_data=config_dict)
-    print("""📦 INSTALLATION | Installing GitHub CLI base package...""")
+    console.print("[bold cyan]📦 INSTALLATION | Installing GitHub CLI base package...[/bold cyan]")
     inst.install(version=version)
 
-    print(f"""
-{"─" * 150}
-🤖 GITHUB COPILOT | Setting up GitHub Copilot CLI extension
-{"─" * 150}
-""")
+    console.print(
+        Panel.fit(
+            "🤖 GITHUB COPILOT | Setting up GitHub Copilot CLI extension",
+            title="Extension Setup",
+            border_style="cyan",
+        )
+    )
 
     if platform.system() == "Windows":
-        print("""
-🪟 WINDOWS SETUP | Configuring GitHub CLI for Windows...
-""")
+        console.print(
+            Panel.fit(
+                "🪟 WINDOWS SETUP | Configuring GitHub CLI for Windows...",
+                border_style="blue",
+                title="Platform Setup",
+            )
+        )
         program = "gh extension install github/gh-copilot"
     elif platform.system() in ["Linux", "Darwin"]:
         system_name = "LINUX" if platform.system() == "Linux" else "MACOS"
-        print(f"""
-🐧 {system_name} SETUP | Configuring GitHub CLI for {platform.system()}...
-""")
+        console.print(
+            Panel.fit(
+                f"🐧 {system_name} SETUP | Configuring GitHub CLI for {platform.system()}...",
+                border_style="blue",
+                title="Platform Setup",
+            )
+        )
         program = """
 gh extension install github/gh-copilot
 """
     else:
         error_msg = f"Unsupported platform: {platform.system()}"
-        print(f"""
-{"⚠️" * 20}
-❌ ERROR | {error_msg}
-{"⚠️" * 20}
-""")
+        console.print(
+            Panel.fit(
+                f"❌ ERROR | {error_msg}",
+                title="Unsupported Platform",
+                border_style="red",
+            )
+        )
         raise NotImplementedError(error_msg)
 
     program += """
 gh auth login --with-token $HOME/dotfiles/creds/git/gh_token.txt
 """
-    print("""
-🔐 AUTHENTICATION | Setting up GitHub authentication with token...
-""")
+    console.print("[bold]🔐 AUTHENTICATION | Setting up GitHub authentication with token...[/bold]")
 
-    print("""
-🔄 EXECUTING | Running GitHub Copilot extension installation and authentication...
-""")
+    console.print("[bold]🔄 EXECUTING | Running GitHub Copilot extension installation and authentication...[/bold]")
     try:
         subprocess.run(program, shell=True, text=True, check=True)
-        print("✅ Command executed successfully")
+        console.print("[green]✅ Command executed successfully[/green]")
     except subprocess.CalledProcessError as e:
-        print(f"❌ Command failed with exit code {e.returncode}")
+        console.print(f"❌ [red]Command failed with exit code {e.returncode}[/red]")
         raise
 
-    print(f"""
-{"═" * 150}
-✅ SUCCESS | GitHub CLI installation completed
-🚀 GitHub Copilot CLI extension installed
-🔑 Authentication configured with token
-{"═" * 150}
-""")
+    console.print(
+        Panel.fit(
+            "\n".join(
+                [
+                    "✅ SUCCESS | GitHub CLI installation completed",
+                    "🚀 GitHub Copilot CLI extension installed",
+                    "🔑 Authentication configured with token",
+                ]
+            ),
+            title="Installation Complete",
+            border_style="green",
+            padding=(1, 2),
+        )
+    )
 
 
 if __name__ == "__main__":

machineconfig/jobs/installer/custom/hx.py

@@ -2,7 +2,7 @@
 Installers do not add runtime files to the machine, hence this script.
 """
 
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
 from typing import Optional
 import platform

machineconfig/jobs/installer/custom_dev/bypass_paywall.py

@@ -6,7 +6,7 @@ from rich import box
 from rich.console import Console
 from rich.panel import Panel
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 
 
 # config_dict: InstallerData = {

machineconfig/jobs/installer/custom_dev/wezterm.py

@@ -4,37 +4,61 @@ import platform
 import subprocess
 from typing import Optional
 
+from rich.console import Console
+from rich.panel import Panel
+
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
 # config_dict: InstallerData = {"appName": "Wezterm", "repoURL": "CMD", "doc": "Modern, GPU-accelerated terminal emulator"}
 
 
+console = Console()
+
+
 def main(installer_data: InstallerData, version: Optional[str]):
     _ = installer_data
-    print(f"""
-{"═" * 150}
-🖥️  WEZTERM INSTALLER | Modern, GPU-accelerated terminal emulator
-💻 Platform: {platform.system()}
-🔄 Version: {"latest" if version is None else version}
-{"═" * 150}
-""")
+    console.print(
+        Panel.fit(
+            "\n".join(
+                [
+                    "🖥️  WEZTERM INSTALLER | Modern, GPU-accelerated terminal emulator",
+                    f"💻 Platform: {platform.system()}",
+                    f"🔄 Version: {version or 'latest'}",
+                ]
+            ),
+            title="WezTerm Setup",
+            border_style="magenta",
+            padding=(1, 2),
+        )
+    )
 
     _ = version
     if platform.system() == "Windows":
         error_msg = "WezTerm installation not supported on Windows through this installer"
-        print(f"""
-{"⚠️" * 20}
-❌ ERROR | {error_msg}
-💡 TIP: Please download and install manually from the WezTerm website
-{"⚠️" * 20}
-""")
+        console.print(
+            Panel.fit(
+                "\n".join(
+                    [
+                        f"❌ ERROR | {error_msg}",
+                        "💡 TIP: Please download and install manually from the WezTerm website",
+                    ]
+                ),
+                title="Unsupported Platform",
+                border_style="red",
+                padding=(1, 2),
+            )
+        )
         raise NotImplementedError(error_msg)
     elif platform.system() in ["Linux", "Darwin"]:
         system_name = "LINUX" if platform.system() == "Linux" else "MACOS"
-        print(f"""
-🐧 {system_name} SETUP | Installing WezTerm terminal emulator...
-""")
+        console.print(
+            Panel.fit(
+                f"🐧 {system_name} SETUP | Installing WezTerm terminal emulator...",
+                title="Platform Setup",
+                border_style="cyan",
+            )
+        )
         import machineconfig.jobs.installer as module
         from pathlib import Path
 
@@ -44,31 +68,40 @@ def main(installer_data: InstallerData, version: Optional[str]):
             program = "brew install --cask wezterm"
     else:
         error_msg = f"Unsupported platform: {platform.system()}"
-        print(f"""
-{"⚠️" * 20}
-❌ ERROR | {error_msg}
-{"⚠️" * 20}
-""")
+        console.print(
+            Panel.fit(
+                f"❌ ERROR | {error_msg}",
+                title="Unsupported Platform",
+                border_style="red",
+            )
+        )
         raise NotImplementedError(error_msg)
 
-    print(f"""
-{"═" * 150}
-ℹ️  INFO | WezTerm Features:
-⚡ GPU-accelerated rendering
-🎨 Full color emoji support
-🧩 Multiplexing with panes and tabs
-⚙️  Lua configuration
-📦 Cross-platform support
-🔌 Plugin system
-{"═" * 150}
-""")
+    console.print(
+        Panel(
+            "\n".join(
+                [
+                    "ℹ️  INFO | WezTerm Features:",
+                    "⚡ GPU-accelerated rendering",
+                    "🎨 Full color emoji support",
+                    "🧩 Multiplexing with panes and tabs",
+                    "⚙️  Lua configuration",
+                    "📦 Cross-platform support",
+                    "🔌 Plugin system",
+                ]
+            ),
+            title="Why WezTerm?",
+            border_style="magenta",
+            padding=(1, 2),
+        )
+    )
 
-    print("🔄 EXECUTING | Running WezTerm installation...")
+    console.print("[bold]🔄 EXECUTING | Running WezTerm installation...[/bold]")
     try:
         subprocess.run(program, shell=True, text=True, check=True)
-        print("✅ WezTerm installation completed successfully")
+        console.print("[green]✅ WezTerm installation completed successfully[/green]")
     except subprocess.CalledProcessError as e:
-        print(f"❌ Installation failed with exit code {e.returncode}")
+        console.print(f"❌ [red]Installation failed with exit code {e.returncode}[/red]")
         raise
 
 

machineconfig/jobs/installer/installer_data.json

@@ -2009,7 +2009,7 @@
 
     },
     {
-      "appName": "Visual Studio Code",
+      "appName": "code",
       "repoURL": "CMD",
       "doc": "Visual Studio Code",
       "fileNamePattern": {

machineconfig/jobs/installer/package_groups.py

@@ -44,8 +44,9 @@ PACKAGES_BROWSERS = [
 ]
 
 # Code Editors & IDEs - Code editing tools
+# NOTE: Entries must match the corresponding `appName` in installer_data.json for filtering to work.
 PACKAGES_CODE_EDITORS = [
-    "Visual Studio Code",
+    "code",
     "Cursor",
     "lvim",
 ]

machineconfig/jobs/python/python_ve_symlink.py

@@ -4,7 +4,7 @@ from rich import box
 from rich.console import Console
 from rich.panel import Panel
 
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 
 
 def main() -> None:

machineconfig/profile/create.py

@@ -5,8 +5,11 @@ This script Takes away all config files from the computer, place them in one dir
 """
 
 from rich.console import Console
+from rich.panel import Panel
+from rich.pretty import Pretty
+from rich.text import Text
 
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.links import symlink_func, symlink_copy
 from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT, REPO_ROOT
@@ -23,6 +26,8 @@ system = platform.system()  # Linux or Windows
 ERROR_LIST: list[Any] = []  # append to this after every exception captured.
 SYSTEM = system.lower()
 
+console = Console()
+
 
 def get_other_systems(current_system: str) -> list[str]:
     all_systems = ["linux", "windows", "darwin"]
@@ -76,17 +81,28 @@ def apply_mapper(choice: Optional[str] = None):
             else:
                 is_admin = False
             if not is_admin:
-                print(f"""
-{"*" * 80}
-⚠️  WARNING: Administrator privileges required
-{"*" * 80}
-""")
+                warning_body = "\n".join([
+                    "[bold yellow]Administrator privileges required[/]",
+                    "Run the terminal as admin and try again to avoid repeated elevation prompts.",
+                ])
+                console.print(
+                    Panel.fit(
+                        warning_body,
+                        title="⚠️ Permission Needed",
+                        border_style="yellow",
+                        padding=(1, 2),
+                    )
+                )
                 raise RuntimeError("Run terminal as admin and try again, otherwise, there will be too many popups for admin requests and no chance to terminate the program.")
         elif choice_selected == "all":
-            print(f"""
-🔍 Processing all program keys:
-{program_keys}
-""")
+            console.print(
+                Panel(
+                    Pretty(program_keys),
+                    title="🔍 Processing All Program Keys",
+                    border_style="cyan",
+                    padding=(1, 2),
+                )
+            )
             pass  # i.e. program_keys = program_keys
         else:
             program_keys = [choice_selected]
@@ -94,7 +110,7 @@ def apply_mapper(choice: Optional[str] = None):
         program_keys = choice_selected
 
     for program_key in program_keys:
-        print(f"\n🔄 Processing {program_key} symlinks...")
+        console.rule(f"🔄 Processing [bold]{program_key}[/] symlinks", style="cyan")
         for file_key, file_map in symlink_mapper[program_key].items():
             this = PathExtended(file_map["this"])
             to_this = PathExtended(file_map["to_this"].replace("REPO_ROOT", REPO_ROOT.as_posix()).replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
@@ -103,67 +119,70 @@ def apply_mapper(choice: Optional[str] = None):
                     for a_target in to_this.expanduser().search("*"):
                         symlink_func(this=this.joinpath(a_target.name), to_this=a_target, prioritize_to_this=prioritize_to_this)
                 except Exception as ex:
-                    print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
+                    console.print(f"❌ [red]Config error[/red]: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
             if "copy" in file_map:
                 try:
                     symlink_copy(this=this, to_this=to_this, prioritize_to_this=prioritize_to_this)
                 except Exception as ex:
-                    print(f"❌ Config error: {program_key} | {file_key} | {ex}")
+                    console.print(f"❌ [red]Config error[/red]: {program_key} | {file_key} | {ex}")
             else:
                 try:
                     symlink_func(this=this, to_this=to_this, prioritize_to_this=prioritize_to_this)
                 except Exception as ex:
-                    print(f"❌ Config error: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
+                    console.print(f"❌ [red]Config error[/red]: {program_key} | {file_key} | missing keys 'this ==> to_this'. {ex}")
 
             if program_key == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
                 try:
-                    print("\n🔒 Setting secure permissions for SSH files...")
+                    console.print("\n[bold]🔒 Setting secure permissions for SSH files...[/bold]")
                     subprocess.run("chmod 700 ~/.ssh/", check=True)
                     subprocess.run("chmod 700 ~/dotfiles/creds/.ssh/", check=True)  # may require sudo
                     subprocess.run("chmod 600 ~/dotfiles/creds/.ssh/*", check=True)
-                    print("✅ SSH permissions set successfully")
+                    console.print("[green]✅ SSH permissions set successfully[/green]")
                 except Exception as e:
                     ERROR_LIST.append(e)
-                    print(f"❌ Error setting SSH permissions: {e}")
+                    console.print(f"❌ [red]Error setting SSH permissions[/red]: {e}")
 
     if system == "Linux":
-        print("\n📜 Setting executable permissions for scripts...")
+        console.print("\n[bold]📜 Setting executable permissions for scripts...[/bold]")
         subprocess.run(f"chmod +x {LIBRARY_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
-        print("✅ Script permissions updated")
+        console.print("[green]✅ Script permissions updated[/green]")
 
     if len(ERROR_LIST) > 0:
-        print(f"""
-{"*" * 80}
-❗ ERRORS ENCOUNTERED DURING PROCESSING
-{"*" * 80}
-{ERROR_LIST}
-{"*" * 80}
-""")
+        console.print(
+            Panel(
+                Pretty(ERROR_LIST),
+                title="❗ Errors Encountered During Processing",
+                border_style="red",
+                padding=(1, 2),
+            )
+        )
     else:
-        print(f"""
-{"*" * 80}
-✅ All symlinks created successfully!
-{"*" * 80}
-""")
+        console.print(
+            Panel.fit(
+                Text("✅ All symlinks created successfully!", justify="center"),
+                title="Symlink Creation Complete",
+                border_style="green",
+            )
+        )
 
 
 def main_symlinks():
-    console = Console()
-    print("\n")
+    console.print("")
     console.rule("[bold blue]🔗 CREATING SYMLINKS 🔗")
     apply_mapper(choice="all")
 
 
 def main_profile():
-    console = Console()
-    print("\n")
+    console.print("")
     console.rule("[bold green]🐚 CREATING SHELL PROFILE 🐚")
     create_default_shell_profile()
-    print(f"""
-{"=" * 80}
-✨ Configuration setup complete! ✨
-{"=" * 80}
-""")
+    console.print(
+        Panel.fit(
+            Text("✨ Configuration setup complete! ✨", justify="center"),
+            title="Profile Setup",
+            border_style="green",
+        )
+    )
 
 
 if __name__ == "__main__":

machineconfig/profile/shell.py

@@ -1,6 +1,6 @@
 """shell"""
 
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
 
 import platform

machineconfig/scripts/python/cloud_copy.py

@@ -2,7 +2,7 @@
 CC
 """
 
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from tenacity import retry, stop_after_attempt, wait_chain, wait_fixed
 import getpass
 import os

machineconfig/scripts/python/cloud_mount.py

@@ -2,7 +2,7 @@
 
 from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.io import read_ini
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 
 import platform
 from typing import Optional, Annotated

machineconfig/scripts/python/cloud_repo_sync.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 import git
 from machineconfig.utils.io import read_ini
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.terminal import Response
 
 from machineconfig.scripts.python.helpers.repo_sync_helpers import fetch_dotfiles

machineconfig/scripts/python/croshell.py

@@ -6,7 +6,7 @@ croshell
 
 from typing import Annotated, Optional
 import typer
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.accessories import randstr
 
 from machineconfig.utils.options import choose_from_options

machineconfig/scripts/python/devops.py

@@ -1,6 +1,6 @@
 """devops with emojis"""
 
-import machineconfig.scripts.python.devops_devapps_install as installer_entry_point
+import machineconfig.utils.installer_utils.installer as installer_entry_point
 import machineconfig.scripts.python.share_terminal as share_terminal
 import machineconfig.scripts.python.repos as repos
 

machineconfig/scripts/python/devops_add_identity.py

@@ -1,7 +1,7 @@
 """ID"""
 
 # from platform import system
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.options import choose_from_options
 from rich.panel import Panel
 from rich.text import Text

machineconfig/scripts/python/devops_add_ssh_key.py

@@ -3,7 +3,7 @@
 from platform import system
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
 from machineconfig.utils.options import choose_from_options
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from rich.console import Console
 from rich.panel import Panel
 from rich import box  # Import box

machineconfig/scripts/python/devops_backup_retrieve.py

@@ -2,7 +2,7 @@
 
 # import subprocess
 from machineconfig.utils.io import read_ini
-from machineconfig.utils.path_extended import PathExtended as PathExtended
+from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT, DEFAULTS_PATH
 from machineconfig.utils.code import print_code
 from machineconfig.utils.options import choose_cloud_interactively, choose_from_options