machineconfig 1.95__py3-none-any.whl → 1.97__py3-none-any.whl

machineconfig/jobs/python_custom_installers/dev/winget.py

@@ -0,0 +1,194 @@
+import subprocess
+import requests
+import tempfile
+from pathlib import Path
+from typing import Optional
+
+
+config_dict = {
+        "repo_url": "CUSTOM",
+        "doc": "winget installer",
+        "filename_template_windows_amd_64": "",
+        "filename_template_linux_amd_64": "",
+        "strip_v": False,
+        "exe_name": "winget"
+}
+
+
+def is_winget_available() -> bool:
+    """
+    Check if winget is available in the system PATH.
+    
+    Returns:
+        bool: True if winget is available, False otherwise
+    """
+    try:
+        result = subprocess.run(
+            ["winget", "--version"],
+            capture_output=True,
+            text=True,
+            timeout=10
+        )
+        return result.returncode == 0
+    except (subprocess.TimeoutExpired, FileNotFoundError, subprocess.SubprocessError):
+        return False
+
+
+def get_latest_winget_release_url() -> Optional[str]:
+    """
+    Get the download URL for the latest winget .msixbundle file from GitHub releases.
+    
+    Returns:
+        Optional[str]: URL to the latest .msixbundle file, or None if not found
+    """
+    try:
+        # Get the latest release information from GitHub API
+        api_url = "https://api.github.com/repos/microsoft/winget-cli/releases/latest"
+        headers = {"Accept": "application/vnd.github.v3+json"}
+        
+        response = requests.get(api_url, headers=headers, timeout=30)
+        response.raise_for_status()
+        
+        release_data = response.json()
+        
+        # Look for .msixbundle file in assets
+        for asset in release_data.get("assets", []):
+            if asset["name"].endswith(".msixbundle"):
+                return asset["browser_download_url"]
+        
+        return None
+    except (requests.RequestException, KeyError, ValueError) as e:
+        print(f"Error fetching latest winget release: {e}")
+        return None
+
+
+def download_file(url: str, destination: Path) -> bool:
+    """
+    Download a file from URL to destination.
+    
+    Args:
+        url: URL to download from
+        destination: Path where to save the file
+        
+    Returns:
+        bool: True if download successful, False otherwise
+    """
+    try:
+        response = requests.get(url, stream=True, timeout=60)
+        response.raise_for_status()
+        
+        with open(destination, 'wb') as f:
+            for chunk in response.iter_content(chunk_size=8192):
+                if chunk:
+                    f.write(chunk)
+        
+        return True
+    except (requests.RequestException, IOError) as e:
+        print(f"Error downloading file: {e}")
+        return False
+
+
+def install_msix_package(package_path: Path) -> bool:
+    """
+    Install an MSIX package using PowerShell.
+    
+    Args:
+        package_path: Path to the .msixbundle file
+        
+    Returns:
+        bool: True if installation successful, False otherwise
+    """
+    try:
+        # Use PowerShell to install the MSIX package
+        powershell_cmd = [
+            "powershell.exe",
+            "-ExecutionPolicy", "Bypass",
+            "-Command",
+            f"Add-AppxPackage -Path '{package_path}'"
+        ]
+        
+        result = subprocess.run(
+            powershell_cmd,
+            capture_output=True,
+            text=True,
+            timeout=300  # 5 minutes timeout
+        )
+        
+        if result.returncode == 0:
+            print("Winget installed successfully!")
+            return True
+        else:
+            print(f"Installation failed with return code {result.returncode}")
+            print(f"Error output: {result.stderr}")
+            return False
+            
+    except (subprocess.SubprocessError, subprocess.TimeoutExpired) as e:
+        print(f"Error installing MSIX package: {e}")
+        return False
+
+
+def ensure_winget_available() -> bool:
+    """
+    Ensure winget is available on the system. If not available, download and install it.
+    
+    Returns:
+        bool: True if winget is available (either was already installed or successfully installed),
+              False if installation failed
+    """
+    # First check if winget is already available
+    if is_winget_available():
+        print("Winget is already available on the system.")
+        return True
+    
+    print("Winget not found. Attempting to download and install...")
+    
+    # Get the latest release URL
+    download_url = get_latest_winget_release_url()
+    if not download_url:
+        print("Could not find the latest winget release URL.")
+        return False
+    
+    print(f"Found latest winget release: {download_url}")
+    
+    # Create temporary directory for download
+    with tempfile.TemporaryDirectory() as temp_dir:
+        temp_path = Path(temp_dir)
+        
+        # Extract filename from URL
+        filename = download_url.split("/")[-1]
+        if not filename.endswith(".msixbundle"):
+            filename = "winget-latest.msixbundle"
+        
+        package_path = temp_path / filename
+        
+        # Download the package
+        print(f"Downloading winget package to {package_path}...")
+        if not download_file(download_url, package_path):
+            print("Failed to download winget package.")
+            return False
+        
+        print("Download completed. Installing winget...")
+        
+        # Install the package
+        if not install_msix_package(package_path):
+            print("Failed to install winget package.")
+            return False
+    
+    # Verify installation
+    if is_winget_available():
+        print("Winget has been successfully installed and is now available!")
+        return True
+    else:
+        print("Installation completed but winget is still not available. You may need to restart your terminal or add it to PATH.")
+        return False
+
+
+if __name__ == "__main__":
+    # Example usage
+    print("=== Winget Installation ===\n")
+    
+    if ensure_winget_available():
+        print("Winget is ready to use!")
+    else:
+        print("Failed to ensure winget availability.")
+

machineconfig/jobs/python_custom_installers/{dev/docker.py → docker.py}

@@ -35,11 +35,16 @@ def main(version: Optional[str]):
 {'⚠️' * 20}
 """)
         raise NotImplementedError(error_msg)
-    elif platform.system() == "Linux":
-        print("🐧 Installing Docker on Linux using official script...")
+    elif platform.system() in ["Linux", "Darwin"]:
+        system_name = "Linux" if platform.system() == "Linux" else "macOS"
+        print(f"🐧 Installing Docker on {system_name} using official script...")
         import machineconfig.jobs.python_custom_installers as module
         from pathlib import Path
-        program = Path(module.__file__).parent.joinpath("scripts/linux/docker.sh").read_text(encoding="utf-8")
+        if platform.system() == "Linux":
+            program = Path(module.__file__).parent.joinpath("scripts/linux/docker.sh").read_text(encoding="utf-8")
+        else:  # Darwin/macOS
+            # For macOS, we'll use the same script or recommend Homebrew
+            program = "brew install --cask docker"
     else:
         error_msg = f"Unsupported platform: {platform.system()}"
         print(f"""

machineconfig/jobs/python_custom_installers/gh.py

@@ -55,9 +55,10 @@ def main(version: Optional[str]):
 🪟 WINDOWS SETUP | Configuring GitHub CLI for Windows...
 """)
         program = "gh extension install github/gh-copilot"
-    elif platform.system() == "Linux":
-        print("""
-🐧 LINUX SETUP | Configuring GitHub CLI for Linux...
+    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()}...
 """)
         program = """
 gh extension install github/gh-copilot

machineconfig/jobs/python_custom_installers/hx.py

@@ -2,7 +2,7 @@
 Installers do not add runtime files to the machine, hence this script.
 """
 
-from crocodile.file_management import P
+from machineconfig.utils.path_reduced import P as PathExtended
 from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
 from typing import Optional
 import platform
@@ -61,30 +61,31 @@ def main(version: Optional[str], install_lib: bool = False):
 
 
     print("\n🗑️  [Step 3/5] Cleaning up previous installation (if any)...")
-    runtime_path = P.home().joinpath(".config/helix/runtime")
-    contrib_path = P.home().joinpath(".config/helix/contrib")
+    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 = P("~/.config/helix").expanduser()
+    target_config_dir = PathExtended("~/.config/helix").expanduser()
     target_config_dir.mkdir(parents=True, exist_ok=True)
 
-    if platform.system() == "Linux":
-        target_bin_path = LINUX_INSTALL_PATH
+    if platform.system() in ["Linux", "Darwin"]:
+        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)
         if install_lib:
             contrib.move(folder=target_config_dir, overwrite=True)
             runtime.move(folder=target_config_dir, overwrite=True)
-        console.print(Panel(f"""✅ SUCCESS | Helix editor installed successfully on Linux!
+        system_name = "Linux" if platform.system() == "Linux" else "macOS"
+        console.print(Panel(f"""✅ SUCCESS | Helix editor installed successfully on {system_name}!
 
 📂 Executable: {target_bin_path / exe_name}
 🔧 Config:     {target_config_dir}""", title="Success", expand=False))
     elif platform.system() == "Windows":
-        target_bin_path = WINDOWS_INSTALL_PATH
+        target_bin_path = PathExtended(WINDOWS_INSTALL_PATH)
         exe_name = "hx.exe"
         hx_file.move(folder=target_bin_path, overwrite=True)
         if install_lib:

machineconfig/jobs/python_custom_installers/scripts/linux/vscode.sh

@@ -5,46 +5,105 @@
 # This script installs Visual Studio Code on Ubuntu/Debian-based Linux distributions
 # Reference: https://code.visualstudio.com/docs/setup/linux
 
-# sudo rm /etc/apt/sources.list.d/vscode.sources
-# sudo apt-get update
+# Function to handle errors
+handle_error() {
+    echo "❌ Error occurred during installation. Cleaning up..."
+    sudo rm -f /tmp/packages.microsoft.gpg
+    sudo rm -f /tmp/code.deb
+    exit 1
+}
 
-
-
-echo """#=======================================================================
-🔑 ADDING REPOSITORY KEYS | Setting up Microsoft repository
+# Function to install via direct .deb download (fallback method)
+install_vscode_direct() {
+    echo """#=======================================================================
+📦 FALLBACK INSTALLATION | Installing VS Code via direct download
 #=======================================================================
 """
+    
+    echo "⬇️ Downloading VS Code .deb package..."
+    wget -O /tmp/code.deb "https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-x64"
+    
+    echo "📦 Installing VS Code from .deb package..."
+    sudo dpkg -i /tmp/code.deb
+    
+    # Fix any dependency issues
+    sudo apt-get install -f -y
+    
+    # Cleanup
+    rm -f /tmp/code.deb
+    
+    echo "✅ VS Code installed via direct download method"
+}
 
-# Check if GPG key is already installed
-if [ ! -f /etc/apt/keyrings/packages.microsoft.gpg ]; then
-    echo "🔐 Downloading and installing Microsoft GPG key..."
-    wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
-    sudo install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
-    rm -f packages.microsoft.gpg
-else
-    echo "✅ Microsoft GPG key already installed"
-fi
 
-# Check if VS Code repository is already added
-if [ ! -f /etc/apt/sources.list.d/vscode.list ]; then
-    echo "📝 Adding VS Code repository to sources list..."
-    echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" | sudo tee /etc/apt/sources.list.d/vscode.list > /dev/null
-else
-    echo "✅ VS Code repository already configured"
-fi
 
 echo """#=======================================================================
-📦 INSTALLING VS CODE | Updating and installing packages
+� INSTALLING VS CODE | Using direct download method
 #=======================================================================
 """
 
-# Update package lists for VS Code repository only
-echo "🔄 Updating package lists for VS Code repository..."
-sudo nala update -o Dir::Etc::sourcelist="sources.list.d/vscode.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
+# Try direct download method first (more reliable)
+echo "📥 Installing Visual Studio Code via direct download..."
+install_vscode_direct
 
-# Install VS Code
-echo "📥 Installing Visual Studio Code..."
-sudo nala install code -y
+# If direct download failed, try repository method
+if ! command -v code >/dev/null 2>&1; then
+    echo "⚠️ Direct download failed, trying repository method..."
+    
+    echo """#=======================================================================
+🔑 SETTING UP MICROSOFT REPOSITORY | Fallback method
+#=======================================================================
+"""
+    
+    # Clean up any existing conflicting configurations
+    echo "🧹 Cleaning up existing Microsoft repository configurations..."
+    
+    # More thorough cleanup - remove all possible Microsoft configurations
+    sudo rm -f /etc/apt/sources.list.d/vscode.list*
+    sudo rm -f /etc/apt/sources.list.d/code.list*
+    sudo rm -f /etc/apt/sources.list.d/microsoft*.list*
+    sudo rm -f /etc/apt/sources.list.d/*.microsoft.*
+    sudo rm -f /etc/apt/keyrings/packages.microsoft.gpg*
+    sudo rm -f /etc/apt/keyrings/microsoft.gpg*
+    sudo rm -f /usr/share/keyrings/microsoft.gpg*
+    sudo rm -f /usr/share/keyrings/packages.microsoft.gpg*
+    
+    # Remove any Microsoft entries from main sources.list and backup files
+    sudo sed -i '/packages\.microsoft\.com/d' /etc/apt/sources.list*
+    
+    # Clean APT cache to ensure fresh start  
+    sudo apt clean
+    sudo rm -rf /var/lib/apt/lists/*
+    
+    echo "🔄 Updating APT package lists to clear any cached conflicts..."
+    sudo apt update
+    
+    echo "🔐 Downloading and installing Microsoft GPG key..."
+    # Create keyrings directory if it doesn't exist
+    sudo mkdir -p /etc/apt/keyrings
+    
+    # Download and install the GPG key
+    wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /tmp/packages.microsoft.gpg
+    sudo install -D -o root -g root -m 644 /tmp/packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
+    sudo chmod 644 /etc/apt/keyrings/packages.microsoft.gpg
+    rm -f /tmp/packages.microsoft.gpg
+    
+    echo "📝 Adding VS Code repository to sources list..."
+    echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" | sudo tee /etc/apt/sources.list.d/vscode.list > /dev/null
+    
+    # Verify the repository was added correctly
+    echo "🔍 Verifying repository configuration..."
+    cat /etc/apt/sources.list.d/vscode.list
+    
+    # Update package lists specifically for the new repository
+    echo "🔄 Updating package lists for VS Code repository..."
+    if sudo apt update; then
+        echo "📥 Installing Visual Studio Code from repository..."
+        sudo nala install code -y
+    else
+        echo "❌ Repository method also failed. VS Code may not be installed."
+    fi
+fi
 
 echo """#=======================================================================
 🔄 CHECKING FOR VS CODE INSIDERS | Updating if installed
@@ -63,5 +122,13 @@ echo """#=======================================================================
 ✅ INSTALLATION COMPLETE | VS Code has been installed successfully
 #=======================================================================
 """
-echo "🚀 You can now launch VS Code from your applications menu or by typing 'code' in terminal"
+
+# Verify installation
+if command -v code >/dev/null 2>&1; then
+    echo "🚀 VS Code installed successfully! Version: $(code --version | head -1)"
+    echo "💡 You can launch VS Code from your applications menu or by typing 'code' in terminal"
+else
+    echo "⚠️ VS Code installation may have failed. Trying fallback method..."
+    install_vscode_direct
+fi
 

machineconfig/jobs/python_custom_installers/{dev/warp-cli.py → warp-cli.py}

@@ -34,7 +34,7 @@ def main(version: Optional[str]):
 {'⚠️' * 20}
 """)
         raise NotImplementedError(error_msg)
-    elif platform.system() == "Linux":
+    elif platform.system() in ["Linux", "Darwin"]:
         print("""
 🐧 LINUX SETUP | Installing Cloudflare WARP CLI using installation script...
 """)