machineconfig 6.82__py3-none-any.whl → 7.98__py3-none-any.whl

machineconfig/cluster/sessions_managers/wt_utils/wt_helpers.py

@@ -0,0 +1,199 @@
+import subprocess
+import random
+import string
+import json
+import shlex
+import logging
+from typing import Any
+from pathlib import Path
+
+from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
+
+logger = logging.getLogger(__name__)
+
+POWERSHELL_CMD = "powershell" if __import__("platform").system().lower() == "windows" else "pwsh"
+
+
+def generate_random_suffix(length: int) -> str:
+    """Generate a random string suffix for unique PowerShell script names."""
+    return "".join(random.choices(string.ascii_lowercase + string.digits, k=length))
+
+
+def parse_command(command: str) -> tuple[str, list[str]]:
+    try:
+        parts = shlex.split(command)
+        if not parts:
+            raise ValueError("Empty command provided")
+        return parts[0], parts[1:] if len(parts) > 1 else []
+    except ValueError as e:
+        logger.error(f"Error parsing command '{command}': {e}")
+        parts = command.split()
+        return parts[0] if parts else "", parts[1:] if len(parts) > 1 else []
+
+
+def escape_for_wt(text: str) -> str:
+    """Escape text for use in Windows Terminal commands."""
+    text = text.replace('"', '""')
+    if " " in text or ";" in text or "&" in text or "|" in text:
+        return f'"{text}"'
+    return text
+
+
+def validate_layout_config(layout_config: LayoutConfig) -> None:
+    """Validate layout configuration format and content."""
+    if not layout_config["layoutTabs"]:
+        raise ValueError("Layout must contain at least one tab")
+    for tab in layout_config["layoutTabs"]:
+        if not tab["tabName"].strip():
+            raise ValueError(f"Invalid tab name: {tab['tabName']}")
+        if not tab["command"].strip():
+            raise ValueError(f"Invalid command for tab '{tab['tabName']}': {tab['command']}")
+        if not tab["startDir"].strip():
+            raise ValueError(f"Invalid startDir for tab '{tab['tabName']}': {tab['startDir']}")
+
+
+def generate_wt_command_string(layout_config: LayoutConfig, window_name: str) -> str:
+    """Generate complete Windows Terminal command string."""
+    command_parts = []
+    
+    for i, tab in enumerate(layout_config["layoutTabs"]):
+        is_first = i == 0
+        
+        if is_first:
+            tab_parts = ["wt", "-w", escape_for_wt(window_name)]
+        else:
+            tab_parts = ["new-tab"]
+        
+        tab_name = tab["tabName"]
+        cwd = tab["startDir"]
+        command = tab["command"]
+        
+        if cwd.startswith("~/"):
+            cwd = cwd.replace("~/", f"{Path.home()}/")
+        elif cwd == "~":
+            cwd = str(Path.home())
+        
+        tab_parts.extend(["-d", escape_for_wt(cwd)])
+        tab_parts.extend(["--title", escape_for_wt(tab_name)])
+        tab_parts.append("--")
+        
+        # Split the command into arguments
+        command_args = shlex.split(command)
+        tab_parts.extend(command_args)
+        
+        command_parts.append(" ".join(tab_parts))
+    
+    return " `; ".join(command_parts)
+
+
+def check_wt_session_status(session_name: str) -> dict[str, Any]:
+    try:
+        ps_script = """
+try {
+    $wtProcesses = Get-Process -Name 'WindowsTerminal' -ErrorAction SilentlyContinue
+    if ($wtProcesses) {
+        $processInfo = @()
+        $wtProcesses | ForEach-Object {
+            $info = @{
+                "Id" = $_.Id
+                "ProcessName" = $_.ProcessName
+                "StartTime" = $_.StartTime.ToString()
+            }
+            $processInfo += $info
+        }
+        $processInfo | ConvertTo-Json -Depth 2
+    }
+} catch {
+    # No Windows Terminal processes found
+}
+"""
+
+        result = subprocess.run([POWERSHELL_CMD, "-Command", ps_script], capture_output=True, text=True, timeout=5)
+
+        if result.returncode == 0:
+            output = result.stdout.strip()
+            if output and output != "":
+                try:
+                    processes = json.loads(output)
+                    if not isinstance(processes, list):
+                        processes = [processes]
+
+                    return {"wt_running": True, "session_exists": len(processes) > 0, "session_name": session_name, "all_windows": processes, "session_windows": processes}
+                except Exception as e:
+                    return {"wt_running": True, "session_exists": False, "error": f"Failed to parse process info: {e}", "session_name": session_name}
+            else:
+                return {"wt_running": False, "session_exists": False, "session_name": session_name, "all_windows": []}
+        else:
+            return {"wt_running": False, "error": result.stderr, "session_name": session_name}
+
+    except subprocess.TimeoutExpired:
+        return {"wt_running": False, "error": "Timeout while checking Windows Terminal processes", "session_name": session_name}
+    except FileNotFoundError:
+        return {"wt_running": False, "error": f"PowerShell ({POWERSHELL_CMD}) not found in PATH", "session_name": session_name}
+    except Exception as e:
+        return {"wt_running": False, "error": str(e), "session_name": session_name}
+
+
+def check_command_status(tab_name: str, layout_config: LayoutConfig) -> dict[str, Any]:
+    """Check if a command is running by looking for processes."""
+    tab_config = None
+    for tab in layout_config["layoutTabs"]:
+        if tab["tabName"] == tab_name:
+            tab_config = tab
+            break
+
+    if tab_config is None:
+        return {"status": "unknown", "error": f"Tab '{tab_name}' not found in layout config", "running": False, "pid": None, "command": None}
+
+    command = tab_config["command"]
+
+    try:
+        primary_cmd = command.split()[0] if command.strip() else ""
+        if not primary_cmd:
+            return {"status": "error", "error": "Empty command", "running": False, "command": command, "tab_name": tab_name}
+
+        ps_script = f"""
+try {{
+    $processes = Get-Process -Name '{primary_cmd}' -ErrorAction SilentlyContinue
+    if ($processes) {{
+        $processes | ForEach-Object {{
+            $procInfo = @{{
+                "pid" = $_.Id
+                "name" = $_.ProcessName
+                "start_time" = $_.StartTime.ToString()
+            }}
+            Write-Output ($procInfo | ConvertTo-Json -Compress)
+        }}
+    }}
+}} catch {{
+    # No processes found or other error
+}}
+"""
+
+        result = subprocess.run([POWERSHELL_CMD, "-Command", ps_script], capture_output=True, text=True, timeout=5)
+
+        if result.returncode == 0:
+            output_lines = [line.strip() for line in result.stdout.strip().split("\n") if line.strip()]
+            matching_processes = []
+
+            for line in output_lines:
+                if line.startswith("{") and line.endswith("}"):
+                    try:
+                        proc_info = json.loads(line)
+                        matching_processes.append(proc_info)
+                    except json.JSONDecodeError:
+                        continue
+
+            if matching_processes:
+                return {"status": "running", "running": True, "processes": matching_processes, "command": command, "tab_name": tab_name}
+            else:
+                return {"status": "not_running", "running": False, "processes": [], "command": command, "tab_name": tab_name}
+        else:
+            return {"status": "error", "error": f"Command failed: {result.stderr}", "running": False, "command": command, "tab_name": tab_name}
+
+    except subprocess.TimeoutExpired:
+        logger.error(f"Timeout checking command status for tab '{tab_name}'")
+        return {"status": "timeout", "error": "Timeout checking process status", "running": False, "command": command, "tab_name": tab_name}
+    except Exception as e:
+        logger.error(f"Error checking command status for tab '{tab_name}': {e}")
+        return {"status": "error", "error": str(e), "running": False, "command": command, "tab_name": tab_name}

machineconfig/cluster/sessions_managers/zellij_local_manager.py

@@ -276,7 +276,9 @@ class ZellijLocalManager:
                 print(f"📊 Quick Summary: {global_summary['running_commands']}/{global_summary['total_commands']} commands running across {global_summary['healthy_sessions']}/{global_summary['total_sessions']} sessions")
 
         logger.info(f"Starting monitoring routine with {wait_ms}ms intervals")
-        sched = Scheduler(routine=routine, wait_ms=wait_ms, logger=logger)
+        from machineconfig.utils.scheduler import LoggerTemplate
+        from typing import cast
+        sched = Scheduler(routine=routine, wait_ms=wait_ms, logger=cast(LoggerTemplate, logger))
         sched.run()
 
     def save(self, session_id: Optional[str]) -> str:

machineconfig/cluster/sessions_managers/zellij_remote_manager.py

@@ -88,8 +88,9 @@ class ZellijSessionManager:
                 # Print statuses
                 for i, status in enumerate(statuses):
                     print(f"Manager {i}: {status}")
-
-        sched = Scheduler(routine=routine, wait_ms=60_000, logger=logger)
+        from machineconfig.utils.scheduler import LoggerTemplate
+        from typing import cast
+        sched = Scheduler(routine=routine, wait_ms=60_000, logger=cast(LoggerTemplate, logger))
         sched.run()
 
     def save(self, session_id: Optional[str]) -> str:

machineconfig/cluster/sessions_managers/zellij_utils/process_monitor.py

@@ -53,7 +53,7 @@ class ProcessMonitor:
         command = tab_config["command"]
         try:
             check_script = self._create_process_check_script(command)
-            remote_cmd = f"$HOME/.local/bin devops self run-python -c {shlex.quote(check_script)}"
+            remote_cmd = f"$HOME/.local/bin devops self python -c {shlex.quote(check_script)}"
             result = self.remote_executor.run_command(remote_cmd, timeout=15)
             if result.returncode == 0:
                 try:
@@ -139,7 +139,7 @@ if __name__ == "__main__":
             check_timestamp = timestamp_result.stdout.strip() if timestamp_result.returncode == 0 else "unknown"
 
             check_script = self._create_fresh_check_script(command)
-            remote_cmd = f"$HOME/.local/bin/devops self run-python -c {shlex.quote(check_script)}"
+            remote_cmd = f"$HOME/.local/bin/devops self python -c {shlex.quote(check_script)}"
             result = self.remote_executor.run_command(remote_cmd, timeout=15)
 
             if result.returncode == 0:

machineconfig/jobs/installer/custom/boxes.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 from rich.console import Console
 from rich.panel import Panel
-from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import WINDOWS_INSTALL_PATH
 
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
@@ -40,7 +40,7 @@ def main(installer_data: InstallerData, version: Optional[str] = None) -> None:
     )
 
     installer = Installer(installer_data=installer_data_modified)
-    downloaded, _version_to_be_installed = installer.download(version=version)
+    downloaded, _version_to_be_installed = installer.binary_download(version=version)
     decomp_path = downloaded.decompress()
     from pathlib import Path
     for item in decomp_path.rglob("*"):

machineconfig/jobs/installer/custom/hx.py

@@ -3,37 +3,39 @@ Installers do not add runtime files to the machine, hence this script.
 """
 
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import WINDOWS_INSTALL_PATH
 from typing import Optional
 import platform
 
-from machineconfig.utils.installer_utils.installer_abc import LINUX_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import LINUX_INSTALL_PATH
 from machineconfig.utils.installer_utils.installer_class import Installer
 from rich.console import Console
 from rich.panel import Panel
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
+LANGUAGES_SUPPORTED_GRAMMER = ["python.so", "nu.so", "bash.so", "lua.so", "powershell.so"]
 config_dict: InstallerData = {
     "appName": "hx",
     "repoURL": "CMD",
     "doc": "Helix is a post-modern modal text editor.",
     "fileNamePattern": {
         "amd64": {
-            "linux": "hx-linux-amd64.tar.xz",
-            "macos": "hx-macos-amd64.tar.xz",
-            "windows": "hx-windows-amd64.zip",
+            "linux": "helix-{version}-x86_64-linux.tar.xz",
+            "macos": "helix-{version}-x86_64-macos.tar.xz",
+            "windows": "helix-{version}-x86_64-windows.zip",
         },
         "arm64": {
-            "linux": "hx-linux-arm64.tar.xz",
-            "macos": "hx-macos-arm64.tar.xz",
-            "windows": "hx-windows-arm64.zip",
+            "linux": "helix-{version}-arm64-linux.tar.xz",
+            "macos": "helix-{version}-arm64-macos.tar.xz",
+            "windows": "helix-{version}-arm64-windows.zip",
         },
     },
 }
 
 
-def main(version: Optional[str], install_lib: bool = False):
+def main(installer_data: InstallerData, version: Optional[str], install_lib: bool = True):
+    _ = installer_data
     console = Console()
 
     console.print(Panel(f"HELIX EDITOR INSTALLER 🧬\nPlatform: {platform.system()}\nVersion:  {'latest' if version is None else version}", title="Installer", expand=False))
@@ -43,7 +45,7 @@ def main(version: Optional[str], install_lib: bool = False):
     inst = Installer(installer_data=config_dict_copy)
 
     print("\n📥 [Step 1/5] Downloading Helix editor...")
-    downloaded, _version_to_be_installed = inst.download(version=version)
+    downloaded, _version_to_be_installed = inst.binary_download(version=version)
     print("   ✨ Download complete.")
 
     print("\n🔍 [Step 2/5] Locating executable and components...")
@@ -57,6 +59,7 @@ def main(version: Optional[str], install_lib: bool = False):
         raise FileNotFoundError(f"Could not find 'hx' executable in {downloaded.name}")
 
     assert len(hx_file_search) == 1, f"Expected 1 'hx' executable, found {len(hx_file_search)}"
+
     hx_file = hx_file_search[0]
     contrib = hx_file.parent / "contrib"
     runtime = contrib.parent / "runtime"
@@ -72,9 +75,6 @@ def main(version: Optional[str], install_lib: bool = False):
     print("\n🗑️  [Step 3/5] Cleaning up previous installation (if any)...")
     runtime_path = PathExtended.home().joinpath(".config/helix/runtime")
     contrib_path = PathExtended.home().joinpath(".config/helix/contrib")
-    runtime_path.delete(sure=True, verbose=False)
-    contrib_path.delete(sure=True, verbose=False)
-    print(f"   ✨ Cleaned '{runtime_path}' and '{contrib_path}'.")
 
     print("\n📦 [Step 4/5] Installing Helix components...")
     target_config_dir = PathExtended.home().joinpath(".config/helix").expanduser()
@@ -84,9 +84,41 @@ def main(version: Optional[str], install_lib: bool = False):
         target_bin_path = PathExtended(LINUX_INSTALL_PATH) if platform.system() == "Linux" else PathExtended("/usr/local/bin")
         exe_name = "hx"
         hx_file.move(folder=target_bin_path, overwrite=True)
+
+        # Always install contrib (regardless of install_lib flag) — treat it like the executable.
+        contrib_path.delete(sure=True, verbose=False)
+        contrib.move(folder=target_config_dir, overwrite=True)
+
+        # Install runtime only if install_lib is True. When copying runtime, copy all subfolders
+        # except 'grammars' (for which we only copy the specific python.so file if present).
         if install_lib:
-            contrib.move(folder=target_config_dir, overwrite=True)
-            runtime.move(folder=target_config_dir, overwrite=True)
+            runtime_path.delete(sure=True, verbose=False)
+            print(f"   ✨ Cleaned '{runtime_path}' and '{contrib_path}'.")
+            target_runtime = target_config_dir.joinpath("runtime")
+            target_runtime.mkdir(parents=True, exist_ok=True)
+
+            # iterate runtime children and copy selectively
+            for child in runtime.iterdir():
+                # skip non-existent or weird entries
+                if not child.exists():
+                    continue
+                if child.name == "grammars":
+                    # copy only the specific language files from runtime/grammars if they exist
+                    for a_language in LANGUAGES_SUPPORTED_GRAMMER:
+                        lang_file = child.joinpath(a_language)
+                        if lang_file.exists() and lang_file.is_file():
+                            dest = target_runtime.joinpath("grammars")
+                            lang_file.copy(folder=dest, overwrite=True)
+                else:
+                    # copy the whole child (file or directory) into target_runtime
+                    # for directories, copy will create target_runtime/<child.name>
+                    try:
+                        child.copy(folder=target_runtime, overwrite=True)
+                    except Exception:
+                        # fallback: try copying contents if it's a directory
+                        if child.is_dir():
+                            for sub in child.iterdir():
+                                sub.copy(folder=target_runtime.joinpath(child.name), overwrite=True)
         system_name = "Linux" if platform.system() == "Linux" else "macOS"
         console.print(
             Panel(
@@ -102,9 +134,34 @@ def main(version: Optional[str], install_lib: bool = False):
         target_bin_path = PathExtended(WINDOWS_INSTALL_PATH)
         exe_name = "hx.exe"
         hx_file.move(folder=target_bin_path, overwrite=True)
+
+        # Always install contrib (regardless of install_lib flag)
+        contrib_path.delete(sure=True, verbose=False)
+        contrib.move(folder=target_config_dir, overwrite=True)
+
+        # Install runtime only if install_lib is True. Copy selectively as on POSIX.
         if install_lib:
-            contrib.move(folder=target_config_dir, overwrite=True)
-            runtime.move(folder=target_config_dir, overwrite=True)
+            runtime_path.delete(sure=True, verbose=False)
+            print(f"   ✨ Cleaned '{runtime_path}' and '{contrib_path}'.")
+            target_runtime = target_config_dir.joinpath("runtime")
+            target_runtime.mkdir(parents=True, exist_ok=True)
+
+            for child in runtime.iterdir():
+                if not child.exists():
+                    continue
+                if child.name == "grammars":
+                    for a_language in LANGUAGES_SUPPORTED_GRAMMER:
+                        lang_file = child.joinpath(a_language)
+                        if lang_file.exists() and lang_file.is_file():
+                            dest = target_runtime.joinpath("grammars")
+                            lang_file.copy(folder=dest, overwrite=True)
+                else:
+                    try:
+                        child.copy(folder=target_runtime, overwrite=True)
+                    except Exception:
+                        if child.is_dir():
+                            for sub in child.iterdir():
+                                sub.copy(folder=target_runtime.joinpath(child.name), overwrite=True)
         console.print(
             Panel(
                 f"""✅ SUCCESS | Helix editor installed successfully on Windows!
@@ -137,4 +194,4 @@ def main(version: Optional[str], install_lib: bool = False):
 
 
 if __name__ == "__main__":
-    main(version=None)
+    pass

machineconfig/jobs/installer/custom/yazi.py

@@ -0,0 +1,119 @@
+
+from typing import Optional
+import platform
+from machineconfig.utils.installer_utils.installer_class import Installer
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+
+installer_standard: InstallerData =    {
+      "appName": "yazi",
+      "repoURL": "https://github.com/sxyazi/yazi",
+      "doc": "⚡ Blazing Fast Terminal File Manager.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "yazi-x86_64-unknown-linux-musl.zip",
+          "macos": "yazi-x86_64-apple-darwin.zip",
+          "windows": "yazi-x86_64-pc-windows-msvc.zip"
+        },
+        "arm64": {
+          "linux": "yazi-aarch64-unknown-linux-musl.zip",
+          "macos": "yazi-aarch64-apple-darwin.zip",
+          "windows": "yazi-aarch64-pc-windows-msvc.zip"
+        }
+      }
+    }
+
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data
+    inst = Installer(installer_data=installer_standard)
+    inst.install(version=version)
+
+    print("\n" * 5)
+    print("Installing Yazi plugins and flavors...")
+    installer_standard["appName"] = "ya"
+    inst = Installer(installer_data=installer_standard)
+    inst.install(version=version)
+
+    print("\n" * 5)
+    print("Cloning Yazi plugins and flavors repositories...")
+
+    from pathlib import Path
+    system_name = platform.system().lower()
+    home_dir = Path.home()
+    if system_name == "windows":
+        yazi_plugins_dir = home_dir.joinpath("AppData", "Roaming", "yazi", "config")
+    else:
+        yazi_plugins_dir = home_dir.joinpath(".config", "yazi")
+    
+    yazi_plugins_path = yazi_plugins_dir.joinpath("plugins")
+    yazi_flavours_path = yazi_plugins_dir.joinpath("flavors")
+    if yazi_plugins_path.exists():
+        if yazi_plugins_path.is_file():
+            yazi_plugins_path.unlink()
+        elif yazi_plugins_path.is_dir():
+            import shutil
+            shutil.rmtree(yazi_plugins_path)
+    yazi_plugins_dir.mkdir(parents=True, exist_ok=True)
+    import git
+    git.Repo.clone_from("https://github.com/yazi-rs/plugins", yazi_plugins_path)
+    if yazi_flavours_path.exists():
+        if yazi_flavours_path.is_file():
+            yazi_flavours_path.unlink()
+        elif yazi_flavours_path.is_dir():
+            import shutil
+            shutil.rmtree(yazi_flavours_path)
+    yazi_plugins_dir.mkdir(parents=True, exist_ok=True)
+    import git
+    git.Repo.clone_from("https://github.com/yazi-rs/flavors", yazi_flavours_path)
+
+    # previewers:
+    if platform.system() == "Linux":
+        script = r"""
+sudo nala install poppler-utils -y || true  # For PDF preview, needed by yazi.
+"""
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script)
+    elif platform.system() == "Darwin":
+        script = r"""
+brew install --upgrade poppler || true  # For PDF preview, needed by yazi.
+"""
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script)
+    elif platform.system() == "Windows":
+        popler_installer: InstallerData = {
+            "appName": "poppler",
+            "repoURL": "https://github.com/oschwartz10612/poppler-windows",
+            "doc": "PDF rendering library - Windows builds.",
+            "fileNamePattern": {
+                "amd64": {
+                    "windows": "Release-{version}.zip",
+                    "linux": None,
+                    "macos": None,
+                },
+                "arm64": {
+                    "windows": None,
+                    "linux": None,
+                    "macos": None,
+                }
+            }
+        }
+        inst_poppler = Installer(installer_data=popler_installer)
+        inst_poppler.install(version=None)
+    # assuming ouch is already installed
+    script = """
+ya pkg add 'ndtoan96/ouch'  # make ouch default previewer in yazi for compressed files
+ya pkg add 'AnirudhG07/rich-preview'  # rich-cli based previewer for yazi
+ya pack -a 'stelcodes/bunny'
+ya pkg add 'Tyarel8/goto-drives'
+ya pkg add 'uhs-robert/sshfs'
+ya pkg add 'boydaihungst/file-extra-metadata'
+ya pkg add 'wylie102/duckdb'
+
+
+"""
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(script)
+
+
+if __name__ == "__main__":
+    pass

machineconfig/jobs/installer/custom_dev/brave.py

@@ -27,7 +27,7 @@ def main(installer_data: InstallerData, version: Optional[str]) -> None:
         console.print("🪟 Installing Brave Browser on Windows using winget...", style="bold")
         program = """
 
-winget install --Name "Brave Browser" --Id Brave.Brave --source winget --accept-package-agreements --accept-source-agreements
+winget install --no-upgrade --name "Brave"                        --Id "Brave.Brave"                --source winget --scope user --accept-package-agreements --accept-source-agreements
 
 """
     elif platform.system() in ["Linux", "Darwin"]:
@@ -70,9 +70,11 @@ winget install --Name "Brave Browser" --Id Brave.Brave --source winget --accept-
     )
 
     console.print("🔄 EXECUTING | Running Brave Browser installation...", style="bold yellow")
+    from machineconfig.utils.code import print_code, run_shell_script
     try:
-        subprocess.run(program, shell=True, text=True, check=True)
-        console.print("✅ Brave Browser installation completed successfully", style="bold green")
+        print_code(code=program, lexer="shell", desc="Installation Script Preview")
+        run_shell_script(program)
+        console.print("✅ Installation completed successfully!", style="bold green")
     except subprocess.CalledProcessError as e:
         console.print(f"❌ Installation failed with exit code {e.returncode}", style="bold red")
         raise

machineconfig/jobs/installer/custom_dev/cloudflare_warp_cli.py

@@ -0,0 +1,23 @@
+
+from typing import Optional
+import platform
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data, version
+    system = platform.system()
+    if system == "Windows":
+        raise NotImplementedError("Installer is not yet implemented for Windows.")
+    elif system == "Linux":
+        from pathlib import Path
+        import machineconfig.jobs.installer as module
+        program = Path(module.__file__).parent.joinpath("linux_scripts/cloudflare_warp_cli.sh").read_text(encoding="utf-8")
+    elif system == "Darwin":
+        program = "brew install --cask cloudflare-warp"
+    else:
+        raise NotImplementedError(f"Unsupported platform: {system}")
+    import subprocess
+    subprocess.run(program, shell=True, check=True)
+    return f"Cloudflare WARP CLI installed successfully on {system}."
+

machineconfig/jobs/installer/custom_dev/code.py

@@ -32,7 +32,10 @@ def main(installer_data: InstallerData, version: Optional[str] = None) -> None:
         install_script = """brew install --cask visual-studio-code"""
     elif platform.system() == "Windows":
         console.print("🪟 Installing VS Code on Windows using winget...", style="bold")
-        install_script = """winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements"""
+        install_script = """
+winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements
+
+"""
     else:
         error_msg = f"Unsupported platform: {platform.system()}"
         console.print(

machineconfig/jobs/installer/custom_dev/dubdb_adbc.py

@@ -25,6 +25,6 @@ installer_data: InstallerData = {
 
 def main(installer_data: InstallerData, version: Optional[str]) -> None:
     _ = version
-    from machineconfig.utils.installer import Installer
+    from machineconfig.utils.installer_utils.installer_runner import Installer
     installer = Installer(installer_data)
     installer.install(version=None)

machineconfig/jobs/installer/custom_dev/nerdfont.py

@@ -108,4 +108,4 @@ def main(installer_data: InstallerData, version: Optional[str]) -> None:
 
 
 if __name__ == "__main__":
-    pass
+    main(1, None)  # type: ignore