gitarsenal-cli 1.8.6 → 1.8.7

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.6",
+  "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}`));