gitarsenal-cli 1.8.3 → 1.8.5

package/scripts/postinstall.js

@@ -15,44 +15,145 @@ const pythonScriptPath = path.join(pythonScriptDir, 'test_modalSandboxScript.py'
 // Path to the original Python script
 const originalScriptPath = path.join(__dirname, '..', '..', '..', 'mcp-server', 'src', 'utils', 'test_modalSandboxScript.py');
 
-// Function to install Python packages
-async function installPythonPackages() {
+// Function to check and install uv
+async function checkAndInstallUv() {
+  try {
+    // Check if uv is already installed
+    await execAsync('uv --version');
+    console.log(chalk.green('✅ uv is already installed'));
+    return true;
+  } catch (error) {
+    console.log(chalk.yellow('⚠️ uv not found. Attempting to install...'));
+    
+    // Try different methods to install uv
+    const installMethods = [
+      'curl -LsSf https://astral.sh/uv/install.sh | sh',
+      'pip install uv',
+      'pip3 install uv',
+      'cargo install uv'
+    ];
+    
+    for (const method of installMethods) {
+      try {
+        console.log(chalk.gray(`🔄 Trying to install uv with: ${method}`));
+        
+        if (method.includes('curl')) {
+          // For curl installation, we need to handle the shell script
+          await execAsync(method, { 
+            env: { ...process.env, SHELL: '/bin/bash' },
+            stdio: 'inherit'
+          });
+        } else {
+          await execAsync(method);
+        }
+        
+        // Verify installation
+        await execAsync('uv --version');
+        console.log(chalk.green('✅ uv installed successfully!'));
+        return true;
+      } catch (installError) {
+        console.log(chalk.gray(`⚠️ ${method} failed, trying next...`));
+      }
+    }
+    
+    console.log(chalk.yellow('⚠️ Could not install uv automatically'));
+    console.log(chalk.yellow('💡 Please install uv manually:'));
+    console.log(chalk.yellow('   curl -LsSf https://astral.sh/uv/install.sh | sh'));
+    console.log(chalk.yellow('   or: pip install uv'));
+    console.log(chalk.yellow('   or: cargo install uv'));
+    return false;
+  }
+}
+
+// Function to create and activate virtual environment
+async function createVirtualEnvironment() {
+  const venvPath = path.join(__dirname, '..', 'venv');
   const packages = ['modal', 'gitingest', 'requests'];
   
-  console.log(chalk.yellow(`📦 Installing Python packages: ${packages.join(', ')}`));
-  
-  // Try different pip commands
-  const pipCommands = [
-    'pip3 install',
-    'pip install', 
-    'python -m pip install',
-    'py -m pip install'
-  ];
+  console.log(chalk.yellow(`📦 Creating virtual environment and installing packages: ${packages.join(', ')}`));
   
-  for (const pipCommand of pipCommands) {
-    try {
-      // Check if pip command exists
-      const [pipCmd] = pipCommand.split(' ');
-      await execAsync(`${pipCmd} --version`);
-      
-      console.log(chalk.gray(`🔄 Using: ${pipCommand}`));
-      
-      await execAsync(`${pipCommand} ${packages.join(' ')}`, { 
-        env: { ...process.env, PYTHONIOENCODING: 'utf-8' }
-      });
-      
-      console.log(chalk.green('✅ Python packages installed successfully!'));
-      return true;
-    } catch (error) {
-      console.log(chalk.gray(`⚠️ ${pipCommand} failed, trying next...`));
+  try {
+    // Create virtual environment directory
+    await fs.ensureDir(path.dirname(venvPath));
+    
+    // Try different Python commands to create virtual environment
+    const pythonCommands = ['python3', 'python', 'py'];
+    let pythonCmd = null;
+    
+    for (const cmd of pythonCommands) {
+      try {
+        await execAsync(`${cmd} --version`);
+        pythonCmd = cmd;
+        break;
+      } catch (error) {
+        // Continue to next command
+      }
     }
+    
+    if (!pythonCmd) {
+      console.log(chalk.red('❌ No Python command found'));
+      return false;
+    }
+    
+    console.log(chalk.gray(`🔄 Creating virtual environment with ${pythonCmd}...`));
+    
+    // Create virtual environment
+    await execAsync(`${pythonCmd} -m venv "${venvPath}"`, {
+      env: { ...process.env, PYTHONIOENCODING: 'utf-8' }
+    });
+    
+    console.log(chalk.green('✅ Virtual environment created successfully!'));
+    
+    // Determine the pip path based on OS
+    const isWindows = process.platform === 'win32';
+    const pipPath = isWindows ? path.join(venvPath, 'Scripts', 'pip.exe') : path.join(venvPath, 'bin', 'pip');
+    const pythonPath = isWindows ? path.join(venvPath, 'Scripts', 'python.exe') : path.join(venvPath, 'bin', 'python');
+    
+    // Verify virtual environment was created properly
+    if (!(await fs.pathExists(pipPath))) {
+      console.log(chalk.red('❌ Virtual environment pip not found'));
+      return false;
+    }
+    
+    console.log(chalk.gray(`🔄 Installing packages in virtual environment...`));
+    
+    // Install packages in virtual environment
+    await execAsync(`"${pipPath}" install ${packages.join(' ')}`, {
+      env: { ...process.env, PYTHONIOENCODING: 'utf-8' }
+    });
+    
+    console.log(chalk.green('✅ Python packages installed successfully in virtual environment!'));
+    
+    // Create a script to activate the virtual environment
+    const activateScript = isWindows ? 
+      `@echo off
+cd /d "%~dp0"
+call "${venvPath.replace(/\\/g, '\\\\')}\\Scripts\\activate.bat"
+%*` :
+      `#!/bin/bash
+cd "$(dirname "$0")"
+source "${venvPath}/bin/activate"
+exec "$@"`;
+    
+    const activateScriptPath = path.join(__dirname, '..', 'activate_venv' + (isWindows ? '.bat' : '.sh'));
+    await fs.writeFile(activateScriptPath, activateScript);
+    
+    if (!isWindows) {
+      await fs.chmod(activateScriptPath, 0o755);
+    }
+    
+    console.log(chalk.green(`✅ Virtual environment activation script created: ${activateScriptPath}`));
+    
+    return true;
+  } catch (error) {
+    console.log(chalk.red(`❌ Error creating virtual environment: ${error.message}`));
+    console.log(chalk.yellow('💡 Please run manually:'));
+    console.log(chalk.yellow('   python3 -m venv venv'));
+    console.log(chalk.yellow('   source venv/bin/activate  # On Unix/macOS'));
+    console.log(chalk.yellow('   venv\\Scripts\\activate.bat  # On Windows'));
+    console.log(chalk.yellow('   pip install modal gitingest requests'));
+    return false;
   }
-  
-  console.log(chalk.red('❌ Failed to install Python packages'));
-  console.log(chalk.yellow('💡 Please run manually:'));
-  console.log(chalk.yellow('   pip install modal gitingest requests'));
-  console.log(chalk.yellow('   or: pip3 install modal gitingest requests'));
-  return false;
 }
 
 // Function to check Python
@@ -105,9 +206,13 @@ async function postinstall() {
     console.log(chalk.blue('🔍 Checking Git installation...'));
     await checkGit();
     
-    // Install Python packages
-    console.log(chalk.blue('🔍 Installing Python dependencies...'));
-    await installPythonPackages();
+    // Check and install uv if needed
+    console.log(chalk.blue('🔍 Checking for uv package manager...'));
+    await checkAndInstallUv();
+    
+    // Install Python packages in virtual environment
+    console.log(chalk.blue('🔍 Installing Python dependencies in virtual environment...'));
+    await createVirtualEnvironment();
     
     // Create the Python directory if it doesn't exist
     await fs.ensureDir(pythonScriptDir);
@@ -222,15 +327,21 @@ if __name__ == "__main__":
 
  What was installed:
    • GitArsenal CLI (npm package)
-   • Modal (Python package)
-   • GitIngest (Python package) 
-   • Requests (Python package)
+   • Virtual environment with Python packages:
+     - Modal
+     - GitIngest  
+     - Requests
 
 💡 Next steps:
    • Run: gitarsenal --help
    • Run: gitarsenal setup
    • Visit: https://gitarsenal.dev
 
+💡 To activate the virtual environment:
+   • Unix/macOS: source venv/bin/activate
+   • Windows: venv\\Scripts\\activate.bat
+   • Or use: ./activate_venv.sh (Unix/macOS) or activate_venv.bat (Windows)
+
  Having issues? Run: gitarsenal --debug
     `));