@fredlackey/devutils 0.0.16 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fredlackey/devutils",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "A globally-installable Node.js CLI toolkit for bootstrapping and configuring development environments across any machine.",
   "main": "src/index.js",
   "bin": {

package/src/commands/setup.js

@@ -11,8 +11,8 @@ const readline = require('readline');
 const shell = require('../utils/common/shell');
 const osUtils = require('../utils/common/os');
 
-// Essential tools that DevUtils CLI requires
-const ESSENTIAL_TOOLS = [
+// Essential tools that DevUtils CLI requires (shared across all platforms)
+const CORE_TOOLS = [
   {
     name: 'git',
     command: 'git',
@@ -39,6 +39,31 @@ const ESSENTIAL_TOOLS = [
   }
 ];
 
+// Homebrew is required on macOS before installing other tools
+const HOMEBREW_TOOL = {
+  name: 'brew',
+  command: 'brew',
+  description: 'Package manager (required)',
+  install: 'homebrew'
+};
+
+/**
+ * Get the list of essential tools for the current platform.
+ * On macOS, Homebrew is included first since other tools depend on it.
+ * @returns {Array<object>} Array of tool definitions
+ */
+function getEssentialTools() {
+  const platform = osUtils.detect();
+
+  // On macOS, Homebrew must be installed first since all other tools use it
+  if (platform.type === 'macos') {
+    return [HOMEBREW_TOOL, ...CORE_TOOLS];
+  }
+
+  // On other platforms, just use the core tools
+  return CORE_TOOLS;
+}
+
 /**
  * Create readline interface for prompts
  * @returns {readline.Interface}
@@ -69,8 +94,9 @@ function confirm(rl, question) {
  * @returns {Array<object>} Array of missing tools
  */
 function checkMissingTools() {
+  const tools = getEssentialTools();
   const missing = [];
-  for (const tool of ESSENTIAL_TOOLS) {
+  for (const tool of tools) {
     if (!shell.commandExists(tool.command)) {
       missing.push(tool);
     }
@@ -83,7 +109,8 @@ function checkMissingTools() {
  * @returns {Array<{ tool: object, installed: boolean }>}
  */
 function getToolStatuses() {
-  return ESSENTIAL_TOOLS.map(tool => ({
+  const tools = getEssentialTools();
+  return tools.map(tool => ({
     tool,
     installed: shell.commandExists(tool.command)
   }));
@@ -97,11 +124,18 @@ function getToolStatuses() {
 async function installTool(tool) {
   try {
     const installer = require(`../installs/${tool.install}`);
-    if (typeof installer.install === 'function') {
-      return await installer.install();
+    if (typeof installer.install !== 'function') {
+      console.error(`  No install function found for ${tool.name}`);
+      return false;
     }
-    console.error(`  No install function found for ${tool.name}`);
-    return false;
+
+    // Run the installer
+    await installer.install();
+
+    // Verify installation by checking if the command now exists
+    // This is more reliable than trusting return values from installers
+    const isNowInstalled = shell.commandExists(tool.command);
+    return isNowInstalled;
   } catch (err) {
     console.error(`  Failed to install ${tool.name}: ${err.message}`);
     return false;

package/src/installs/homebrew.js

@@ -277,21 +277,20 @@ async function install_macos() {
   console.log('  - Xcode Command Line Tools (if not already installed)');
   console.log('');
 
-  // Run the official Homebrew installer in non-interactive mode
-  // NONINTERACTIVE=1 prevents prompts for confirmation
+  // Run the official Homebrew installer with interactive terminal support
+  // This allows the installer to prompt for sudo password when needed
   console.log('Downloading and running the Homebrew installer...');
   console.log('This may take several minutes...');
+  console.log('You may be prompted for your password to complete the installation.');
   console.log('');
 
-  const installResult = await shell.exec(
-    `NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`,
-    { timeout: 600000 } // 10 minute timeout for slow connections
+  const exitCode = await shell.spawnInteractive(
+    `/bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`
   );
 
-  if (installResult.code !== 0) {
+  if (exitCode !== 0) {
     throw new Error(
-      `Failed to install Homebrew.\n` +
-      `Output: ${installResult.stderr || installResult.stdout}\n\n` +
+      `Failed to install Homebrew (exit code: ${exitCode}).\n\n` +
       `Troubleshooting:\n` +
       `  1. If Xcode Command Line Tools installation hung, run:\n` +
       `     xcode-select --install\n` +
@@ -419,18 +418,17 @@ async function install_ubuntu() {
   console.log('');
   console.log('Downloading and running the Homebrew installer...');
   console.log('This may take several minutes...');
+  console.log('You may be prompted for your password to complete the installation.');
   console.log('');
 
-  // Run the official Homebrew installer in non-interactive mode
-  const installResult = await shell.exec(
-    `NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`,
-    { timeout: 600000 } // 10 minute timeout
+  // Run the official Homebrew installer with interactive terminal support
+  const exitCode = await shell.spawnInteractive(
+    `/bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`
   );
 
-  if (installResult.code !== 0) {
+  if (exitCode !== 0) {
     throw new Error(
-      `Failed to install Homebrew.\n` +
-      `Output: ${installResult.stderr || installResult.stdout}\n\n` +
+      `Failed to install Homebrew (exit code: ${exitCode}).\n\n` +
       `Troubleshooting:\n` +
       `  1. Ensure all dependencies are installed:\n` +
       `     sudo apt-get install -y build-essential procps curl file git\n` +
@@ -548,18 +546,17 @@ async function install_raspbian() {
   console.log('');
   console.log('Downloading and running the Homebrew installer...');
   console.log('This may take several minutes (or longer on slower hardware)...');
+  console.log('You may be prompted for your password to complete the installation.');
   console.log('');
 
-  // Run the official Homebrew installer in non-interactive mode
-  const installResult = await shell.exec(
-    `NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`,
-    { timeout: 1200000 } // 20 minute timeout for slower Raspberry Pi hardware
+  // Run the official Homebrew installer with interactive terminal support
+  const exitCode = await shell.spawnInteractive(
+    `/bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`
   );
 
-  if (installResult.code !== 0) {
+  if (exitCode !== 0) {
     throw new Error(
-      `Failed to install Homebrew.\n` +
-      `Output: ${installResult.stderr || installResult.stdout}\n\n` +
+      `Failed to install Homebrew (exit code: ${exitCode}).\n\n` +
       `Troubleshooting:\n` +
       `  1. Ensure all dependencies are installed:\n` +
       `     sudo apt-get install -y build-essential procps curl file git\n` +
@@ -706,18 +703,17 @@ async function install_amazon_linux() {
   console.log('');
   console.log('Downloading and running the Homebrew installer...');
   console.log('This may take several minutes...');
+  console.log('You may be prompted for your password to complete the installation.');
   console.log('');
 
-  // Run the official Homebrew installer in non-interactive mode
-  const installResult = await shell.exec(
-    `NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`,
-    { timeout: 600000 } // 10 minute timeout
+  // Run the official Homebrew installer with interactive terminal support
+  const exitCode = await shell.spawnInteractive(
+    `/bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`
   );
 
-  if (installResult.code !== 0) {
+  if (exitCode !== 0) {
     throw new Error(
-      `Failed to install Homebrew.\n` +
-      `Output: ${installResult.stderr || installResult.stdout}\n\n` +
+      `Failed to install Homebrew (exit code: ${exitCode}).\n\n` +
       `Troubleshooting:\n` +
       `  1. Ensure Development Tools are installed:\n` +
       `     sudo dnf groupinstall -y "Development Tools"  # Amazon Linux 2023\n` +
@@ -835,18 +831,17 @@ async function install_ubuntu_wsl() {
   console.log('');
   console.log('Downloading and running the Homebrew installer...');
   console.log('This may take several minutes...');
+  console.log('You may be prompted for your password to complete the installation.');
   console.log('');
 
-  // Run the official Homebrew installer in non-interactive mode
-  const installResult = await shell.exec(
-    `NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`,
-    { timeout: 600000 } // 10 minute timeout
+  // Run the official Homebrew installer with interactive terminal support
+  const exitCode = await shell.spawnInteractive(
+    `/bin/bash -c "$(curl -fsSL ${HOMEBREW_INSTALL_URL})"`
   );
 
-  if (installResult.code !== 0) {
+  if (exitCode !== 0) {
     throw new Error(
-      `Failed to install Homebrew in WSL.\n` +
-      `Output: ${installResult.stderr || installResult.stdout}\n\n` +
+      `Failed to install Homebrew in WSL (exit code: ${exitCode}).\n\n` +
       `Troubleshooting:\n` +
       `  1. Ensure WSL 2 is being used (WSL 1 has known issues):\n` +
       `     Run in PowerShell: wsl --set-version Ubuntu 2\n` +

package/src/utils/common/shell.js

@@ -207,10 +207,55 @@ async function spawnAsync(command, args = [], options = {}) {
   });
 }
 
+/**
+ * Spawns an interactive command with terminal passthrough.
+ *
+ * Use this function for commands that need user interaction, such as:
+ * - Commands that prompt for sudo password
+ * - Interactive installers that ask questions
+ * - Commands that show progress with cursor movement
+ *
+ * Unlike exec() or spawnAsync(), this function connects the child process
+ * directly to the parent's terminal (stdin, stdout, stderr), allowing the
+ * user to interact with the command as if they ran it directly.
+ *
+ * @param {string} command - The command to run (passed to shell)
+ * @param {Object} [options] - Options
+ * @param {string} [options.cwd] - Working directory for the command
+ * @param {Object} [options.env] - Environment variables (defaults to process.env)
+ * @returns {Promise<number>} Exit code (0 = success, non-zero = failure)
+ *
+ * @example
+ * // Run an installer that needs sudo password
+ * const exitCode = await spawnInteractive('/bin/bash -c "$(curl -fsSL https://example.com/install.sh)"');
+ * if (exitCode !== 0) {
+ *   console.error('Installation failed');
+ * }
+ */
+async function spawnInteractive(command, options = {}) {
+  return new Promise((resolve) => {
+    const child = spawn(command, [], {
+      stdio: 'inherit',  // Connect to parent's terminal
+      shell: true,       // Run through shell to support complex commands
+      cwd: options.cwd,
+      env: options.env || process.env
+    });
+
+    child.on('close', (code) => {
+      resolve(code || 0);
+    });
+
+    child.on('error', () => {
+      resolve(1);
+    });
+  });
+}
+
 module.exports = {
   exec,
   execSync,
   which,
   commandExists,
-  spawnAsync
+  spawnAsync,
+  spawnInteractive
 };