@maravilla-labs/cli 0.1.8 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maravilla-labs/cli",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "NPM wrapper for the Maravilla CLI binary; downloads the right release for your platform.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Maravilla Labs",

package/scripts/postinstall.js

@@ -204,6 +204,7 @@ async function install() {
   // Decide whether to download based on current vs requested version
   const force = process.env.MARAVILLA_FORCE_INSTALL === '1';
   let requested = null;
+  // Handle both "cli-v0.1.9" and "v0.1.9" formats
   const m = tag.match(/v(\d+\.\d+\.\d+)/);
   if (m) requested = m[1];
 
@@ -248,22 +249,63 @@ async function install() {
   log('Extracting archive');
   await extractArchive(archive, tmpDir, ext);
 
+  // Find the actual binary - it might be directly in tmpDir or in a subdirectory
   const innerDir = path.join(tmpDir, art);
-  const srcPath = path.join(innerDir, EXECUTABLE);
+  let srcPath = path.join(innerDir, EXECUTABLE);
+  
+  // Check if binary exists in expected location
+  if (!fs.existsSync(srcPath)) {
+    // Try direct path in tmpDir
+    const directPath = path.join(tmpDir, EXECUTABLE);
+    if (fs.existsSync(directPath)) {
+      srcPath = directPath;
+      log(chalk.yellow('Binary found in root of archive'));
+    } else {
+      // List directory contents to debug
+      const files = await fs.promises.readdir(tmpDir, { recursive: true });
+      console.error('Archive contents:', files);
+      throw new Error(`Binary not found at expected paths. Looking for: ${EXECUTABLE}`);
+    }
+  }
+  
+  // Remove existing binary first to ensure clean replacement
+  try {
+    await fs.promises.unlink(INSTALL_PATH);
+    log('Removed existing binary');
+  } catch (e) {
+    // File might not exist, that's okay
+  }
+  
+  // Copy new binary
   await fs.promises.copyFile(srcPath, INSTALL_PATH);
   await fs.promises.chmod(INSTALL_PATH, 0o755);
-  log(chalk.green(`Installed to ${INSTALL_PATH}`));
+  
+  // Verify the file was actually copied
+  const stats = await fs.promises.stat(INSTALL_PATH);
+  log(chalk.green(`Installed to ${INSTALL_PATH} (${stats.size} bytes)`));
 
   // Self-check: run --version
+  // Use absolute path and clear environment to avoid caching issues
   await new Promise((resolve, reject) => {
     log('Verifying install by running --version');
-    const child = spawn(INSTALL_PATH, ['--version'], { stdio: ['ignore', 'pipe', 'pipe'] });
+    const child = spawn(INSTALL_PATH, ['--version'], { 
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env: { ...process.env, NODE_DISABLE_COLORS: '1' },
+      shell: false
+    });
     let out = '';
     child.stdout.on('data', (d) => (out += d.toString()))
     child.on('error', reject);
     child.on('exit', (code) => {
       if (code === 0) {
-        log(chalk.green(`Version: ${out.trim()}`));
+        const version = out.trim();
+        log(chalk.green(`Version: ${version}`));
+        
+        // Extra check: if we expected a specific version, verify it
+        if (requested && !version.includes(requested)) {
+          log(chalk.yellow(`Warning: Expected version ${requested} but got ${version}`));
+          log(chalk.yellow('The binary might be cached. Try running the command directly.'));
+        }
         resolve();
       } else {
         reject(new Error(`Version check failed with code ${code}`));

package/scripts/update.js

@@ -111,11 +111,27 @@ async function main() {
 		log(`Updating to ${chalk.cyan(tag)}`);
 	}
 
-		return await new Promise((resolve) => {
-			const env = { ...process.env, MARAVILLA_FORCE_INSTALL: '1' };
-			const child = spawn(process.execPath, [postinstall], { stdio: 'inherit', env });
+	// Force the specific version we want
+	const env = { 
+		...process.env, 
+		MARAVILLA_FORCE_INSTALL: '1',
+		MARAVILLA_VERSION: tag  // Pass the tag to ensure we get the right version
+	};
+	
+	const result = await new Promise((resolve) => {
+		const child = spawn(process.execPath, [postinstall], { stdio: 'inherit', env });
 		child.on('exit', (code) => resolve(code ?? 0));
 	});
+	
+	// Verify the update worked
+	if (result === 0) {
+		const newVersion = await currentVersion();
+		if (newVersion) {
+			log(chalk.green(`✅ Successfully updated to v${newVersion}`));
+		}
+	}
+	
+	return result;
 }
 
 main().then((code) => process.exit(code)).catch((e) => {