gitarsenal-cli 1.8.5 → 1.8.7

package/activate_venv.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 cd "$(dirname "$0")"
-source "/Users/rohansharma/RepoStarter/gitarsenal-cli/venv/bin/activate"
+source ".venv/bin/activate"
 exec "$@"

package/bin/gitarsenal.js

@@ -11,6 +11,48 @@ const { runContainer } = require('../lib/sandbox');
 const updateNotifier = require('update-notifier');
 const pkg = require('../package.json');
 const boxen = require('boxen');
+const { spawn } = require('child_process');
+const fs = require('fs');
+
+// Function to activate virtual environment
+function activateVirtualEnvironment() {
+  const isWindows = process.platform === 'win32';
+  const venvPath = path.join(__dirname, '..', '.venv');
+  
+  // Check if virtual environment exists
+  if (!fs.existsSync(venvPath)) {
+    console.log(chalk.yellow('⚠️ Virtual environment not found. Please run: npm install'));
+    return false;
+  }
+  
+  // Set environment variables to use the virtual environment
+  const pythonPath = isWindows ? 
+    path.join(venvPath, 'Scripts', 'python.exe') : 
+    path.join(venvPath, 'bin', 'python');
+  
+  const pipPath = isWindows ? 
+    path.join(venvPath, 'Scripts', 'pip.exe') : 
+    path.join(venvPath, 'bin', 'pip');
+  
+  // Update PATH to prioritize virtual environment
+  const pathSeparator = isWindows ? ';' : ':';
+  const venvBinPath = isWindows ? 
+    path.join(venvPath, 'Scripts') : 
+    path.join(venvPath, 'bin');
+  
+  process.env.PATH = `${venvBinPath}${pathSeparator}${process.env.PATH}`;
+  process.env.VIRTUAL_ENV = venvPath;
+  process.env.PYTHONPATH = venvPath;
+  
+  // Set Python executable path for child processes
+  process.env.PYTHON_EXECUTABLE = pythonPath;
+  process.env.PIP_EXECUTABLE = pipPath;
+  
+  return true;
+}
+
+// Activate virtual environment
+activateVirtualEnvironment();
 
 // Check for updates
 updateNotifier({ pkg }).notify();
@@ -302,11 +344,10 @@ async function handleKeysAdd(options) {
     }
     
     // Call Python script to add the key
-    const { spawn } = require('child_process');
-    const path = require('path');
     const scriptPath = path.join(__dirname, '..', 'python', 'gitarsenal_keys.py');
+    const pythonExecutable = process.env.PYTHON_EXECUTABLE || 'python';
     
-    const pythonProcess = spawn('python', [
+    const pythonProcess = spawn(pythonExecutable, [
       scriptPath,
       'add',
       '--service', service,
@@ -341,11 +382,10 @@ async function handleKeysList() {
     const spinner = ora('Fetching API keys...').start();
     
     // Call Python script to list keys
-    const { spawn } = require('child_process');
-    const path = require('path');
     const scriptPath = path.join(__dirname, '..', 'python', 'gitarsenal_keys.py');
+    const pythonExecutable = process.env.PYTHON_EXECUTABLE || 'python';
     
-    const pythonProcess = spawn('python', [
+    const pythonProcess = spawn(pythonExecutable, [
       scriptPath,
       'list'
     ], { stdio: 'inherit' });
@@ -384,11 +424,10 @@ async function handleKeysView(options) {
     }
     
     // Call Python script to view the key
-    const { spawn } = require('child_process');
-    const path = require('path');
     const scriptPath = path.join(__dirname, '..', 'python', 'gitarsenal_keys.py');
+    const pythonExecutable = process.env.PYTHON_EXECUTABLE || 'python';
     
-    const pythonProcess = spawn('python', [
+    const pythonProcess = spawn(pythonExecutable, [
       scriptPath,
       'view',
       '--service', service
@@ -446,11 +485,10 @@ async function handleKeysDelete(options) {
     spinner.start();
     
     // Call Python script to delete the key
-    const { spawn } = require('child_process');
-    const path = require('path');
     const scriptPath = path.join(__dirname, '..', 'python', 'gitarsenal_keys.py');
+    const pythonExecutable = process.env.PYTHON_EXECUTABLE || 'python';
     
-    const pythonProcess = spawn('python', [
+    const pythonProcess = spawn(pythonExecutable, [
       scriptPath,
       'delete',
       '--service', service

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitarsenal-cli",
-  "version": "1.8.5",
+  "version": "1.8.7",
   "description": "CLI tool for creating Modal sandboxes with GitHub repositories",
   "main": "index.js",
   "bin": {

package/scripts/postinstall.js

@@ -32,7 +32,7 @@ async function checkAndInstallUv() {
       'pip3 install uv',
       'cargo install uv'
     ];
-    
+    a
     for (const method of installMethods) {
       try {
         console.log(chalk.gray(`🔄 Trying to install uv with: ${method}`));
@@ -65,74 +65,67 @@ async function checkAndInstallUv() {
   }
 }
 
-// Function to create and activate virtual environment
+// Function to create and activate virtual environment using uv
 async function createVirtualEnvironment() {
-  const venvPath = path.join(__dirname, '..', 'venv');
   const packages = ['modal', 'gitingest', 'requests'];
   
-  console.log(chalk.yellow(`📦 Creating virtual environment and installing packages: ${packages.join(', ')}`));
+  console.log(chalk.yellow(`📦 Creating virtual environment with uv and installing packages: ${packages.join(', ')}`));
   
   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) {
+    // First, ensure uv is available
+    let uvAvailable = false;
+    try {
+      await execAsync('uv --version');
+      uvAvailable = true;
+    } catch (error) {
+      console.log(chalk.yellow('⚠️ uv not found, attempting to install...'));
+      await checkAndInstallUv();
       try {
-        await execAsync(`${cmd} --version`);
-        pythonCmd = cmd;
-        break;
-      } catch (error) {
-        // Continue to next command
+        await execAsync('uv --version');
+        uvAvailable = true;
+      } catch (installError) {
+        console.log(chalk.red('❌ Failed to install uv'));
+        return false;
       }
     }
     
-    if (!pythonCmd) {
-      console.log(chalk.red('❌ No Python command found'));
+    if (!uvAvailable) {
+      console.log(chalk.red('❌ uv is required but not available'));
       return false;
     }
     
-    console.log(chalk.gray(`🔄 Creating virtual environment with ${pythonCmd}...`));
+    console.log(chalk.gray(`🔄 Creating virtual environment with uv...`));
     
-    // Create virtual environment
-    await execAsync(`${pythonCmd} -m venv "${venvPath}"`, {
+    // Create virtual environment using uv
+    await execAsync('uv venv', {
+      cwd: path.join(__dirname, '..'),
       env: { ...process.env, PYTHONIOENCODING: 'utf-8' }
     });
     
-    console.log(chalk.green('✅ Virtual environment created successfully!'));
+    console.log(chalk.green('✅ Virtual environment created successfully with uv!'));
     
-    // 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 with uv...`));
     
-    console.log(chalk.gray(`🔄 Installing packages in virtual environment...`));
-    
-    // Install packages in virtual environment
-    await execAsync(`"${pipPath}" install ${packages.join(' ')}`, {
+    // Install packages using uv pip
+    await execAsync(`uv pip install ${packages.join(' ')}`, {
+      cwd: path.join(__dirname, '..'),
       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 isWindows = process.platform === 'win32';
+    const venvPath = path.join(__dirname, '..', '.venv');
+    
     const activateScript = isWindows ? 
       `@echo off
 cd /d "%~dp0"
-call "${venvPath.replace(/\\/g, '\\\\')}\\Scripts\\activate.bat"
+call ".venv\\Scripts\\activate.bat"
 %*` :
       `#!/bin/bash
 cd "$(dirname "$0")"
-source "${venvPath}/bin/activate"
+source ".venv/bin/activate"
 exec "$@"`;
     
     const activateScriptPath = path.join(__dirname, '..', 'activate_venv' + (isWindows ? '.bat' : '.sh'));
@@ -146,12 +139,12 @@ exec "$@"`;
     
     return true;
   } catch (error) {
-    console.log(chalk.red(`❌ Error creating virtual environment: ${error.message}`));
+    console.log(chalk.red(`❌ Error creating virtual environment with uv: ${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'));
+    console.log(chalk.yellow('   uv venv'));
+    console.log(chalk.yellow('   uv pip install modal gitingest requests'));
+    console.log(chalk.yellow('   source .venv/bin/activate  # On Unix/macOS'));
+    console.log(chalk.yellow('   .venv\\Scripts\\activate.bat  # On Windows'));
     return false;
   }
 }
@@ -338,8 +331,8 @@ if __name__ == "__main__":
    • Visit: https://gitarsenal.dev
 
 💡 To activate the virtual environment:
-   • Unix/macOS: source venv/bin/activate
-   • Windows: venv\\Scripts\\activate.bat
+   • 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