@cruxgarden/cli 0.0.6 → 0.0.8

package/lib/commands.js

@@ -16,23 +16,40 @@ export function showBanner() {
   // Check if banner was already shown in this shell session
   if (process.env.CRUX_BANNER_SHOWN) return;
 
-  // Custom ASCII art - replace this with your own!
-  const banner = `
- ██████╗██████╗ ██╗   ██╗██╗  ██╗
-██╔════╝██╔══██╗██║   ██║╚██╗██╔╝
-██║     ██████╔╝██║   ██║ ╚███╔╝
-██║     ██╔══██╗██║   ██║ ██╔██╗
-╚██████╗██║  ██║╚██████╔╝██╔╝ ██╗
- ╚═════╝╚═╝  ╚═╝ ╚═════╝ ╚═╝  ╚═╝
-
- ██████╗  █████╗ ██████╗ ██████╗ ███████╗███╗   ██╗
-██╔════╝ ██╔══██╗██╔══██╗██╔══██╗██╔════╝████╗  ██║
-██║  ███╗███████║██████╔╝██║  ██║█████╗  ██╔██╗ ██║
-██║   ██║██╔══██║██╔══██╗██║  ██║██╔══╝  ██║╚██╗██║
-╚██████╔╝██║  ██║██║  ██║██████╔╝███████╗██║ ╚████║
- ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═════╝ ╚══════╝╚═╝  ╚═══╝`;
-
-  console.log(chalk.hex(SUCCESS_GREEN)(banner));
+  const bannerLines = [
+    " ██████╗██████╗ ██╗   ██╗██╗  ██╗",
+    "██╔════╝██╔══██╗██║   ██║╚██╗██╔╝",
+    "██║     ██████╔╝██║   ██║ ╚███╔╝",
+    "██║     ██╔══██╗██║   ██║ ██╔██╗",
+    "╚██████╗██║  ██║╚██████╔╝██╔╝ ██╗",
+    " ╚═════╝╚═╝  ╚═╝ ╚═════╝ ╚═╝  ╚═╝",
+    "",
+    " ██████╗  █████╗ ██████╗ ██████╗ ███████╗███╗   ██╗",
+    "██╔════╝ ██╔══██╗██╔══██╗██╔══██╗██╔════╝████╗  ██║",
+    "██║  ███╗███████║██████╔╝██║  ██║█████╗  ██╔██╗ ██║",
+    "██║   ██║██╔══██║██╔══██╗██║  ██║██╔══╝  ██║╚██╗██║",
+    "╚██████╔╝██║  ██║██║  ██║██████╔╝███████╗██║ ╚████║",
+    " ╚═════╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═════╝ ╚══════╝╚═╝  ╚═══╝"
+  ];
+
+  // Randomly pick a color from the CLI color palette
+  const colors = [
+    chalk.hex(SUCCESS_GREEN),  // Green
+    chalk.cyan,                 // Cyan
+    chalk.yellow,               // Yellow
+    chalk.magenta,              // Magenta
+    chalk.blue,                 // Blue
+    chalk.red,                  // Red
+  ];
+
+  const randomColor = colors[Math.floor(Math.random() * colors.length)];
+
+  // Print each line with the same random color
+  console.log();
+  bannerLines.forEach((line) => {
+    console.log(randomColor(line));
+  });
+
   console.log(chalk.gray("  Nursery Environment - Demo & Trial\n"));
 
   // Set environment variable so it persists for this shell session
@@ -89,7 +106,8 @@ function runCommandAsync(command, options = {}) {
         );
         reject(error);
       } else {
-        resolve(stdout);
+        // Return both stdout and stderr since Docker commands often write to stderr
+        resolve({ stdout, stderr, combined: stdout + stderr });
       }
     });
 
@@ -117,11 +135,36 @@ function askConfirmation(question) {
   });
 }
 
+function checkDockerAvailable() {
+  try {
+    execSync("docker info", { stdio: "pipe" });
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+
+function ensureDockerRunning() {
+  if (!checkDockerAvailable()) {
+    console.error(
+      chalk.red(
+        "\n✗ Docker is not running or not installed.\n",
+      ),
+    );
+    console.log(chalk.gray("Please ensure Docker is installed and running:"));
+    console.log(chalk.gray("  • Start Docker Desktop, or"));
+    console.log(chalk.gray("  • Start the Docker daemon\n"));
+    console.log(chalk.gray("Then try your command again.\n"));
+    process.exit(1);
+  }
+}
+
 // ============================================================================
 // Nursery Environment Commands
 // ============================================================================
 
 export async function startNursery(options) {
+  ensureDockerRunning();
   const spinner = ora("Starting Crux Garden Nursery environment...").start();
 
   try {
@@ -144,12 +187,21 @@ export async function startNursery(options) {
       spinner.text =
         "Starting nursery services (api, postgres, redis)...";
       await runCommandAsync(
-        "docker-compose -f docker-compose.nursery.yml up -d --remove-orphans && docker rm cruxgarden-nursery-migrations 2>/dev/null || true",
+        "docker-compose -f docker-compose.nursery.yml up -d --remove-orphans",
         {
           silent: true,
         },
       );
 
+      // Clean up the migrations container if it exists (cross-platform)
+      await runCommandAsync(
+        "docker rm cruxgarden-nursery-migrations",
+        {
+          silent: true,
+          ignoreError: true,
+        },
+      );
+
       spinner.succeed("Crux Garden Nursery environment started!");
       console.log(
         chalk.hex(SUCCESS_GREEN)("\n✓ API running on:"),
@@ -198,6 +250,7 @@ export async function startNursery(options) {
 }
 
 export async function stopNursery() {
+  ensureDockerRunning();
   const spinner = ora("Stopping Crux Garden Nursery environment...").start();
   await runCommandAsync("docker-compose -f docker-compose.nursery.yml down", {
     silent: true,
@@ -212,6 +265,7 @@ export async function stopNursery() {
 }
 
 export async function logsNursery(options) {
+  ensureDockerRunning();
   if (options.follow) {
     console.log(
       chalk.gray("Following nursery logs (press Ctrl+C to exit)...\n"),
@@ -236,6 +290,7 @@ export async function logsNursery(options) {
 }
 
 export async function cleanNursery() {
+  ensureDockerRunning();
   console.log(
     chalk.yellow(
       "\n⚠️  This will delete all nursery containers and volumes (including data)!\n",
@@ -273,6 +328,7 @@ export async function cleanNursery() {
 }
 
 export async function purgeNursery() {
+  ensureDockerRunning();
   console.log(
     chalk.yellow(
       "\n⚠️  This will delete ALL nursery resources (containers, volumes, AND images)!\n",
@@ -316,24 +372,62 @@ export async function purgeNursery() {
 }
 
 export async function updateNursery() {
+  ensureDockerRunning();
   const spinner = ora(
-    "Downloading latest Crux Garden API image from ghcr.io...",
+    "Checking for latest Crux Garden API image from ghcr.io...",
   ).start();
 
-  await runCommandAsync("docker-compose -f docker-compose.nursery.yml pull", {
-    silent: true,
-  });
+  try {
+    // Get the current local image digest before pulling
+    const beforeResult = await runCommandAsync(
+      "docker images --digests --format '{{.Digest}}' ghcr.io/cruxgarden/api:latest",
+      { silent: true, ignoreError: true }
+    );
+    const digestBefore = beforeResult?.combined?.trim() || beforeResult?.stdout?.trim() || "";
 
-  spinner.succeed("Latest nursery image downloaded!");
-  console.log(
-    chalk.gray("Run"),
-    chalk.cyan("crux nursery restart"),
-    chalk.gray("to use the new image."),
-  );
+    // Pull latest images
+    spinner.text = "Pulling latest images...";
+    await runCommandAsync("docker-compose -f docker-compose.nursery.yml pull", {
+      silent: true,
+    });
+
+    // Get the image digest after pulling
+    const afterResult = await runCommandAsync(
+      "docker images --digests --format '{{.Digest}}' ghcr.io/cruxgarden/api:latest",
+      { silent: true, ignoreError: true }
+    );
+    const digestAfter = afterResult?.combined?.trim() || afterResult?.stdout?.trim() || "";
+
+    // Compare digests to see if image was updated
+    if (digestBefore && digestAfter && digestBefore === digestAfter) {
+      spinner.succeed("Nursery image is already up-to-date!");
+      console.log(
+        chalk.gray("\nYou're running the latest version."),
+      );
+    } else if (digestAfter) {
+      spinner.succeed("Latest nursery image downloaded!");
+      console.log(
+        chalk.gray("\nRun"),
+        chalk.cyan("crux nursery restart"),
+        chalk.gray("to use the new image."),
+      );
+    } else {
+      spinner.succeed("Images pulled successfully!");
+      console.log(
+        chalk.gray("\nRun"),
+        chalk.cyan("crux nursery restart"),
+        chalk.gray("to use the latest images."),
+      );
+    }
+  } catch (error) {
+    spinner.fail("Failed to update images");
+    throw error;
+  }
   console.log();
 }
 
 export async function resetNursery() {
+  ensureDockerRunning();
   console.log(
     chalk.yellow(
       "\n⚠️  This will delete all nursery data and start fresh with the latest image!\n",
@@ -371,9 +465,18 @@ export async function resetNursery() {
     // Start fresh
     spinner.text = "Starting fresh nursery environment...";
     await runCommandAsync(
-      "docker-compose -f docker-compose.nursery.yml up -d --remove-orphans && docker rm cruxgarden-nursery-migrations 2>/dev/null || true",
+      "docker-compose -f docker-compose.nursery.yml up -d --remove-orphans",
+      {
+        silent: true,
+      },
+    );
+
+    // Clean up the migrations container if it exists (cross-platform)
+    await runCommandAsync(
+      "docker rm cruxgarden-nursery-migrations",
       {
         silent: true,
+        ignoreError: true,
       },
     );
 
@@ -406,12 +509,14 @@ export async function restartNursery() {
 }
 
 export async function statusNursery() {
+  ensureDockerRunning();
   console.log(chalk.bold("\nCrux Garden Nursery Environment Status:\n"));
   runCommand("docker-compose -f docker-compose.nursery.yml ps");
   console.log();
 }
 
 export async function connectNurseryDb() {
+  ensureDockerRunning();
   console.log(chalk.gray("Connecting to Nursery PostgreSQL...\n"));
   runCommand(
     "docker exec -it cruxgarden-nursery-postgres psql -U cruxgarden -d cruxgarden",
@@ -419,16 +524,19 @@ export async function connectNurseryDb() {
 }
 
 export async function connectNurseryRedis() {
+  ensureDockerRunning();
   console.log(chalk.gray("Connecting to Nursery Redis...\n"));
   runCommand("docker exec -it cruxgarden-nursery-redis redis-cli");
 }
 
 export async function connectNurseryApi() {
+  ensureDockerRunning();
   console.log(chalk.gray("Opening shell in Nursery API container...\n"));
   runCommand("docker exec -it cruxgarden-nursery-api sh");
 }
 
 export async function stopNurseryDb() {
+  ensureDockerRunning();
   const spinner = ora("Stopping nursery database services...").start();
   await runCommandAsync(
     "docker-compose -f docker-compose.nursery.yml stop postgres redis",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cruxgarden/cli",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Crux Garden CLI",
   "type": "module",
   "bin": {
@@ -19,7 +19,10 @@
     "docker:nursery:db:stop": "cd docker && docker-compose -f docker-compose.nursery.yml stop postgres redis",
     "docker:nursery:redis:connect": "docker exec -it cruxgarden-nursery-redis redis-cli",
     "docker:nursery:db:connect": "docker exec -it cruxgarden-nursery-postgres psql -U cruxgarden -d cruxgarden",
-    "docker:nursery:api:connect": "docker exec -it cruxgarden-nursery-api sh"
+    "docker:nursery:api:connect": "docker exec -it cruxgarden-nursery-api sh",
+    "publish:patch": "npm version patch && npm publish && git push && git push --tags",
+    "publish:minor": "npm version minor && npm publish && git push && git push --tags",
+    "publish:major": "npm version major && npm publish && git push && git push --tags"
   },
   "engines": {
     "node": ">=18.0.0"