@brewnet/cli 0.0.2 → 0.0.4

package/dist/index.js

@@ -691,43 +691,14 @@ async function installDockerMacOS() {
   if (dockerAppExists) {
     console.log(chalk2.dim("  [2/3] Docker Desktop\uC774 \uC774\uBBF8 \uC124\uCE58\uB418\uC5B4 \uC788\uC2B5\uB2C8\uB2E4. \uAC74\uB108\uB701\uB2C8\uB2E4."));
   } else {
-    const s2 = ora({
-      text: "[2/3] Docker Desktop \uB2E4\uC6B4\uB85C\uB4DC \uC911... (~600MB, \uC218 \uBD84 \uC18C\uC694)",
-      indent: 2
-    }).start();
-    const brewErrLines = [];
+    console.log(chalk2.dim("  [2/3] Docker Desktop \uC124\uCE58 \uC911... (~600MB, \uC218 \uBD84 \uC18C\uC694)"));
+    console.log(chalk2.dim("        (\uBE44\uBC00\uBC88\uD638 \uC785\uB825\uC774 \uD544\uC694\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4)"));
+    console.log();
     try {
-      const child = execa2("brew", ["install", "--cask", "docker-desktop"], {
+      await execa2("brew", ["install", "--cask", "docker-desktop"], {
         env: augmentedEnv(),
-        stdin: "inherit"
+        stdio: "inherit"
       });
-      const onBrewLine = (line) => {
-        if (/==> Downloading/i.test(line)) {
-          s2.text = "[2/3] Docker Desktop \uB2E4\uC6B4\uB85C\uB4DC \uC911... (~600MB)";
-        } else if (/^\s*#{3,}/.test(line)) {
-          const pct = line.match(/(\d+(?:\.\d+)?)%/);
-          if (pct) s2.text = `[2/3] Docker Desktop \uB2E4\uC6B4\uB85C\uB4DC \uC911... ${Math.round(Number(pct[1]))}%`;
-        } else if (/==> Verifying/i.test(line)) {
-          s2.text = "[2/3] \uD30C\uC77C \uBB34\uACB0\uC131 \uAC80\uC99D \uC911...";
-        } else if (/==> Installing/i.test(line)) {
-          s2.text = "[2/3] Docker Desktop \uC124\uCE58 \uC911...";
-        } else if (/==> Moving/i.test(line)) {
-          s2.text = "[2/3] Applications \uD3F4\uB354\uB85C \uC774\uB3D9 \uC911...";
-        } else if (/already installed/i.test(line)) {
-          s2.text = "[2/3] Docker Desktop \uC774\uBBF8 \uC124\uCE58\uB428 (brew \uAE30\uB85D)";
-        }
-      };
-      child.stdout?.on("data", (chunk) => {
-        chunk.toString().split("\n").forEach(onBrewLine);
-      });
-      child.stderr?.on("data", (chunk) => {
-        const lines = chunk.toString().split("\n");
-        lines.forEach(onBrewLine);
-        lines.forEach((l) => {
-          if (l.trim()) brewErrLines.push(l.trim());
-        });
-      });
-      await child;
       const appNowExists = await (async () => {
         try {
           await execa2("test", ["-d", "/Applications/Docker.app"]);
@@ -737,18 +708,16 @@ async function installDockerMacOS() {
         }
       })();
       if (!appNowExists) {
-        const detail = brewErrLines.slice(-3).join(" | ") || "brew \uCD9C\uB825 \uC5C6\uC74C";
-        s2.fail(`[2/3] Docker Desktop \uC124\uCE58 \uC2E4\uD328 \u2014 brew \uC644\uB8CC \uD6C4 \uC571 \uBC88\uB4E4 \uC5C6\uC74C`);
-        console.log(chalk2.dim(`    brew \uCD9C\uB825: ${detail}`));
+        console.log(chalk2.red("  \u2717 [2/3] Docker Desktop \uC124\uCE58 \uC2E4\uD328 \u2014 brew \uC644\uB8CC \uD6C4 \uC571 \uBC88\uB4E4 \uC5C6\uC74C"));
         return {
           success: false,
           message: "brew install --cask docker \uAC00 exit 0\uC744 \uBC18\uD658\uD588\uC9C0\uB9CC /Applications/Docker.app \uC774 \uC5C6\uC2B5\uB2C8\uB2E4.\n  \uC544\uB798 \uBA85\uB839\uC73C\uB85C \uC9C1\uC811 \uC7AC\uC124\uCE58\uD574\uC8FC\uC138\uC694:\n    brew reinstall --cask docker\n  \uB610\uB294 \uC218\uB3D9 \uC124\uCE58: https://docs.docker.com/desktop/mac/"
         };
       }
-      s2.succeed("[2/3] Docker Desktop \uC124\uCE58 \uC644\uB8CC");
+      console.log(chalk2.green("  \u2714 [2/3] Docker Desktop \uC124\uCE58 \uC644\uB8CC"));
     } catch (err) {
-      const detail = brewErrLines.slice(-3).join(" | ") || (err instanceof Error ? err.message : String(err));
-      s2.fail(`[2/3] Docker Desktop \uC124\uCE58 \uC2E4\uD328: ${detail}`);
+      const detail = err instanceof Error ? err.message : String(err);
+      console.log(chalk2.red(`  \u2717 [2/3] Docker Desktop \uC124\uCE58 \uC2E4\uD328: ${detail}`));
       return {
         success: false,
         message: `brew install --cask docker-desktop \uC2E4\uD328: ${detail}
@@ -4143,13 +4112,18 @@ async function runGenerateStep(state) {
     return "error";
   }
   console.log();
-  const pullSpinner = ora4("  Pulling Docker images...").start();
+  console.log(chalk9.bold("  Pulling Docker images..."));
+  console.log(chalk9.dim("    (\uB124\uD2B8\uC6CC\uD06C \uC18D\uB3C4\uC5D0 \uB530\uB77C \uC218 \uBD84 \uC18C\uC694\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4)"));
+  console.log();
   try {
     const pullCmd = buildPullCommand(composePath);
-    const pullResult = await execCommand(pullCmd.cmd, pullCmd.args);
+    const { execa: execaPull } = await import("execa");
+    const pullResult = await execaPull(pullCmd.cmd, pullCmd.args, {
+      stdio: "inherit",
+      reject: false
+    });
     if (pullResult.exitCode !== 0) {
-      pullSpinner.fail("  Failed to pull Docker images");
-      console.log(chalk9.dim(`    ${pullResult.stderr}`));
+      console.log(chalk9.red("  \u2717 Failed to pull Docker images"));
       const shouldContinue = await confirm5({
         message: "Continue without pulling images? (existing images will be used)",
         default: false
@@ -4158,10 +4132,10 @@ async function runGenerateStep(state) {
         return "error";
       }
     } else {
-      pullSpinner.succeed("  Docker images pulled");
+      console.log(chalk9.green("  \u2714 Docker images pulled"));
     }
   } catch (err) {
-    pullSpinner.fail("  Failed to pull Docker images");
+    console.log(chalk9.red("  \u2717 Failed to pull Docker images"));
     if (err instanceof Error) {
       console.log(chalk9.dim(`    ${err.message}`));
     }
@@ -7823,7 +7797,7 @@ function stripAnsi(str) {
 // src/index.ts
 function createProgram() {
   const program = new Command();
-  program.name("brewnet").description("Your Home Server, Brewed Fresh").version("0.0.2").showHelpAfterError('(run "brewnet --help" for usage information)');
+  program.name("brewnet").description("Your Home Server, Brewed Fresh").version("0.0.4").showHelpAfterError('(run "brewnet --help" for usage information)');
   registerInitCommand(program);
   registerStatusCommand(program);
   registerAddCommand(program);