machineconfig 5.14__tar.gz → 5.15__tar.gz

{machineconfig-5.14/src/machineconfig.egg-info → machineconfig-5.15}/PKG-INFO

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

{machineconfig-5.14 → machineconfig-5.15}/pyproject.toml

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

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/scripts/python/count_lines_frontend.py

@@ -8,8 +8,8 @@ def analyze_repo_development(repo_path: str = typer.Argument(..., help="Path to
     count_lines_path = Path(count_lines.__file__)
     # --project $HOME/code/machineconfig 
     cmd = f"""uv run --python 3.13 --with machineconfig[plot] {count_lines_path} analyze-over-time {repo_path}"""
-    from machineconfig.utils.code import run_script
-    run_script(cmd)
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(cmd)
 
 
 if __name__ == "__main__":

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/scripts/python/croshell.py

@@ -145,8 +145,8 @@ from pathlib import Path
         else: profile = ""
         fire_line = f"uv run --python 3.13 --with machineconfig[plot] {interpreter} {interactivity} {profile} {str(pyfile)}"
 
-    from machineconfig.utils.code import run_script
-    run_script(fire_line)
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(fire_line)
 
 
 def arg_parser() -> None:

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/scripts/python/fire_jobs.py

@@ -221,8 +221,8 @@ python -m machineconfig.cluster.templates.cli_click --file {choice_file} """
             command = "$ErrorActionPreference = 'SilentlyContinue';\n" + command + "\nStart-Sleep -Seconds 0.5"
         else:
             raise NotImplementedError(f"Platform {platform.system()} not supported.")
-    from machineconfig.utils.code import run_script
-    run_script(command)
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(command)
 
 
 def main(

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/scripts/python/interactive.py

@@ -27,27 +27,23 @@ from questionary import Choice
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
-from machineconfig.utils.code import run_script as run_command
+from machineconfig.utils.code import run_shell_script
 
 _ = cast
 console = Console()
 
 
 def display_header() -> None:
-    """Display the script header."""
     header_text = Text("MACHINE CONFIGURATION", style="bold magenta")
     subtitle_text = Text("Interactive Installation Script", style="italic cyan")
     console.print(Panel(f"📦 {header_text}\n{subtitle_text}", border_style="blue", padding=(1, 2)))
 def display_completion_message() -> None:
-    """Display completion message."""
     completion_text = Text("INSTALLATION COMPLETE", style="bold green")
     subtitle_text = Text("System setup finished successfully", style="italic green")
     console.print(Panel(f"✨ {completion_text}\n{subtitle_text}\n\n🎉 Your system has been configured successfully!\n🔄 You may need to reboot to apply all changes.", border_style="green", padding=(1, 2)))
 def display_dotfiles_instructions() -> None:
-    """Display instructions for dotfiles migration."""
     header_text = Text("DOTFILES MIGRATION", style="bold yellow")
     subtitle_text = Text("Configuration transfer options", style="italic yellow")
-
     instructions = """
 🖱️  [bold blue]Method 1: USING MOUSE WITHOUT KB OR BROWSER SHARE[/bold blue]
     On original machine, run:
@@ -65,32 +61,9 @@ def display_dotfiles_instructions() -> None:
     [dim]cd ~
     cloud_copy SHARE_URL . --config ss[/dim]
     (requires symlinks to be created first)"""
-
     console.print(Panel(f"📂 {header_text}\n{subtitle_text}\n\n{instructions}", border_style="yellow", padding=(1, 2)))
 
 
-def install_windows_desktop_apps() -> bool:
-    """Install Windows desktop applications using winget."""
-    if system() != "Windows":
-        console.print("❌ This function is only available on Windows systems.", style="bold red")
-        return False   
-    console.print("🔧 Installing Nerd Fonts", style="bold cyan")
-    try:
-        from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
-        install_nerd_fonts()
-        console.print("✅ Nerd Fonts installed successfully", style="bold green")
-    except Exception as e:
-        console.print(f"❌ Error installing Nerd Fonts: {e}", style="bold red")
-    console.print("🔧 Setting Windows Terminal settings", style="bold cyan")
-    try:
-        from machineconfig.setup_windows.wt_and_pwsh.set_wt_settings import main as set_wt_settings_main
-        set_wt_settings_main()
-        console.print("✅ Windows Terminal settings configured successfully", style="bold green")
-    except Exception as e:
-        console.print(f"❌ Error setting Windows Terminal settings: {e}", style="bold red")    
-    return True
-
-
 def get_installation_choices() -> list[str]:
     """Get user choices for installation options."""
     choices = [
@@ -114,11 +87,15 @@ def get_installation_choices() -> list[str]:
 
 
 def execute_installations(selected_options: list[str]) -> None:
-    """Execute the selected installation options."""
     if system() == "Windows":
-        run_command("$HOME/.local/bin/uv.exe self update")
+        from machineconfig import setup_windows as module
+        script_path = Path(module.__file__).parent / "ve.ps1"
+        run_shell_script(script_path.read_text(encoding="utf-8"))
     else:
-        run_command("$HOME/.local/bin/uv self update")
+        from machineconfig import setup_linux as module
+        script_path = Path(module.__file__).parent / "ve.sh"
+        run_shell_script(script_path.read_text(encoding="utf-8"))
+
     for maybe_a_group in selected_options:
         if maybe_a_group in ("ESSENTIAL", "DEV", "ESSENTIAL_SYSTEM", "DEV_SYSTEM", "TerminalEyeCandy"):
             console.print(Panel("⚡ [bold bright_yellow]CLI APPLICATIONS[/bold bright_yellow]\n[italic]Command-line tools installation[/italic]", border_style="bright_yellow"))
@@ -129,21 +106,25 @@ def execute_installations(selected_options: list[str]) -> None:
                 console.print("✅ CLI applications installed successfully", style="bold green")
             except Exception as e:
                 console.print(f"❌ Error installing CLI applications: {e}", style="bold red")
-            run_command(". $HOME/.bashrc")
+            run_shell_script(". $HOME/.bashrc")
 
     if "upgrade_system" in selected_options:
         if system() == "Windows":
             console.print("❌ System upgrade is not applicable on Windows via this script.", style="bold red")
         elif system() == "Linux":
             console.print(Panel("🔄 [bold magenta]SYSTEM UPDATE[/bold magenta]\n[italic]Package management[/italic]", border_style="magenta"))
-            run_command("sudo nala upgrade -y")
+            run_shell_script("sudo nala upgrade -y")
         else:
             console.print(f"❌ System upgrade not supported on {system()}.", style="bold red")
     if "install_repos" in selected_options:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
-        from machineconfig import setup_linux as module
-        script = Path(module.__file__).parent / "repos.sh"
-        run_command(f"bash {script}")
+        if system() == "Windows":
+            from machineconfig import setup_windows as module
+            script_path = Path(module.__file__).parent / "repos.ps1"
+        else:
+            from machineconfig import setup_linux as module
+            script_path = Path(module.__file__).parent / "repos.sh"
+        run_shell_script(script_path.read_text(encoding="utf-8"))
 
     if "install_ssh_server" in selected_options:
         console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
@@ -152,9 +133,9 @@ def execute_installations(selected_options: list[str]) -> None:
 Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
 Start-Service sshd
 Set-Service -Name sshd -StartupType 'Automatic'"""
-            run_command(f'powershell -Command "{powershell_script}"')
+            run_shell_script(f'powershell -Command "{powershell_script}"')
         else:
-            run_command("sudo nala install openssh-server -y")
+            run_shell_script("sudo nala install openssh-server -y")
 
     if "install_shell_profile" in selected_options:
         console.print(Panel("🐚 [bold green]SHELL PROFILE[/bold green]\n[italic]Shell configuration setup[/italic]", border_style="green"))
@@ -179,8 +160,8 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
                 console.print("✅ Symlinks created successfully", style="bold green")
             except Exception as e:
                 console.print(f"❌ Error creating symlinks: {e}", style="bold red")
-            run_command("sudo chmod 600 $HOME/.ssh/*")
-            run_command("sudo chmod 700 $HOME/.ssh")
+            run_shell_script("sudo chmod 600 $HOME/.ssh/*")
+            run_shell_script("sudo chmod 700 $HOME/.ssh")
         else:
             console.print("⏭️  Skipping symlink creation - finish dotfiles transfer first", style="yellow")
 
@@ -200,7 +181,10 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
             console.print(f"❌ Error retrieving backup data: {e}", style="bold red")
 
     if "install_windows_desktop" in selected_options:
-        install_windows_desktop_apps()
+        from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
+        install_nerd_fonts()
+        from machineconfig.setup_windows.wt_and_pwsh.set_wt_settings import main as set_wt_settings_main
+        set_wt_settings_main()
 
 
 def main() -> None:
@@ -210,7 +194,7 @@ def main() -> None:
     if not selected_options:
         console.print("❌ No options selected. Exiting...", style="bold red")
         sys.exit(0)
-    console.print(f"\n✅ Selected options: {', '.join(selected_options)}", style="bold green")
+    console.print(f"\n✅ Selected options: {'\n'.join(selected_options)}", style="bold green")
     proceed = questionary.confirm("🚀 Proceed with installation?", default=True).ask()
     if not proceed:
         console.print("❌ Installation cancelled.", style="bold red")

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/scripts/python/share_terminal.py

@@ -132,8 +132,8 @@ def main(
 #!/bin/bash
 ttyd --writable -t enableSixel=true {ssl_args} --port {port} --credential "{username}:{password}" -t 'theme={{"background": "black"}}' {start_command}
 """
-    from machineconfig.utils.code import run_script
-    run_script(code)
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(code)
 
 
 def main_with_parser():

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -10,3 +10,4 @@ Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machin
 rm ve.ps1
 
 uv run --python 3.13 --with machineconfig devops interactive
+# uv run --python 3.13 --with machineconfig https://raw.githubusercontent.com/thisismygitrepo/machineconfig/ee4f69e838e1acbb275bfb5a3d3faee23345f2a8/src/machineconfig/scripts/python/devops.py

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/utils/code.py

@@ -98,7 +98,7 @@ def print_code(code: str, lexer: str, desc: str, subtitle: str = ""):
     console.print(Panel(Syntax(code=code, lexer=lexer), title=f"📄 {desc}", subtitle=subtitle), style="bold red")
 
 
-def run_script(program: str):
+def run_shell_script(program: str):
     import tempfile
     if platform.system() == "Windows":
         suffix = ".ps1"

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/utils/files/headers.py

@@ -6,21 +6,28 @@ import random
 from pathlib import Path
 from rich import pretty
 from rich.console import Console
-from rich.text import Text
 from typing import Optional
 
 
 def print_header():
     console = Console()
     pretty.install()
-    _header = f"🐍 Python {platform.python_version()} in VE `{os.getenv('VIRTUAL_ENV')}` On {platform.system()} 🐍"
-    _header = Text(_header)
-    _header.stylize("bold blue")
-    console.rule(_header, style="bold red", align="center")
-    version = "14.5"
-    _ = Text(f"✨ 🐊 Crocodile Shell {version} ✨" + f" Made with 🐍 | Built with ❤️. Running @ {Path.cwd()}")
-    _.stylize("#05f8fc on #293536")
-    console.print(_)
+
+    # Environment Information Panel
+    from rich.panel import Panel
+    from rich.table import Table
+
+    table = Table(show_header=False, show_edge=False, pad_edge=False)
+    table.add_column("Label", style="cyan", no_wrap=True)
+    table.add_column("Value", style="white")
+
+    table.add_row("Python Version", platform.python_version())
+    table.add_row("Operating System", platform.system())
+    table.add_row("Virtual Environment", os.getenv('VIRTUAL_ENV', 'None'))
+    table.add_row("Running @", str(Path.cwd()))
+
+
+    console.print(Panel(table, title="[bold blue]✨ 🐊 Crocodile Shell 14.5 ✨ Made with 🐍 | Built with ❤️[/bold blue]", border_style="blue"))
 def print_logo(logo: str):
     from machineconfig.utils.files.ascii_art import font_box_color, character_color, character_or_box_color
     if platform.system() == "Windows":

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/utils/installer_utils/installer.py

@@ -125,12 +125,12 @@ def install_group(package_group: PACKAGE_GROUPS):
     else:
         options_system = get_installers_system_groups()
         from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
-        from machineconfig.utils.code import run_script
+        from machineconfig.utils.code import run_shell_script
         for an_item in options_system:
             if an_item["appName"] == package_group:
                 program = an_item["fileNamePattern"][get_normalized_arch()][get_os_name()]
                 if program is not None:
-                    run_script(program)
+                    run_shell_script(program)
                     break
 
 

{machineconfig-5.14 → machineconfig-5.15}/src/machineconfig/utils/terminal.py

@@ -147,7 +147,7 @@ class Terminal:
             return os.getuid() == 0  # Check for root on Posix
 '''
 
-    # def run_script(self, script: str, shell: SHELLS = "default", verbose: bool = False):
+    # def run_shell_script(self, script: str, shell: SHELLS = "default", verbose: bool = False):
     #     if self.machine == "Linux":
     #         script = "#!/bin/bash" + "\n" + script  # `source` is only available in bash.
     #     script_file = PathExtended.tmpfile(name="tmp_shell_script", suffix=".ps1" if self.machine == "Windows" else ".sh", folder="tmp_scripts")

{machineconfig-5.14 → machineconfig-5.15/src/machineconfig.egg-info}/PKG-INFO

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