unoverse 0.1.95 → 0.1.97

package/operator/lib/common.sh

@@ -1,7 +1,20 @@
 #!/usr/bin/env bash
 # Shared colors, helpers, and constants
 
-GRAVITY_VERSION="1.0.0"
+# THE VERSION IS THE CLI'S, READ FROM IT. This was the literal "1.0.0", hardcoded when the
+# operator was a script in a repo and never touched again — so `unoverse help` announced
+# v1.0.0 while the published CLI was on 0.1.95, and the one number a developer uses to say
+# which version they are running was wrong by two hundred releases.
+#
+# THE MONOREPO PATH IS TRIED FIRST, and the order matters. Two levels up from scripts/lib
+# is the PLATFORM's package.json, which is genuinely 1.0.0 — so looking there first found a
+# real version that was not this CLI's, and reported it confidently. packages/cli exists
+# only in the monorepo; published, that path misses and the package's own is two levels up.
+GRAVITY_VERSION=$(
+  node -p "require('$GRAVITY_LIB/../../packages/cli/package.json').version" 2>/dev/null \
+  || node -p "require('$GRAVITY_LIB/../../package.json').version" 2>/dev/null \
+  || echo "unknown"
+)
 DOCR_REGISTRY="registry.digitalocean.com"
 
 # Colors

package/operator/lib/deploy.sh

@@ -541,13 +541,30 @@ cmd_deploy() {
   # ── ONE FLOW ────────────────────────────────────────────────────────────────
   # Which ground, is it configured, plan it, apply it, ship it. In that order, every
   # time, whether this is the first deploy or the fiftieth.
-  # A named ground wins; one configured ground is implied; two without a name is refused
-  # (see _pick_ground). Nothing configured at all falls through to creating one below,
-  # which is the first-run path and the only case where an empty answer is not a mistake.
-  local cloud="" rc have=0
-  [ -f "$ROOT/infra/digitalocean/terraform.tfvars" ] || [ -f "$ROOT/infra/aws/terraform.tfvars" ] && have=1
-  if [ "$have" = "1" ]; then
-    cloud=$(SELF_CMD="unoverse deploy" _pick_ground "${GROUND_ARG:-}") || exit 1
+  # NAMING A GROUND THAT DOES NOT EXIST YET MEANS BUILD IT THERE. `unoverse deploy aws` on a
+  # universe with only a DigitalOcean ground used to answer "No aws ground here. Run
+  # unoverse deploy aws to create one" — the command just typed, refusing itself. Those
+  # words already say where this should go, so the only thing left to do is set it up.
+  #
+  # A named ground with no tfvars falls through to the create flow below and skips the
+  # "which cloud?" question, because it has been answered. An UNNAMED deploy still goes
+  # through _pick_ground, which refuses to guess between two configured grounds.
+  local cloud="" rc
+  case "${GROUND_ARG:-}" in
+    do|digitalocean) cloud="digitalocean" ;;
+    aws|amazon)      cloud="aws" ;;
+  esac
+
+  if [ -n "$cloud" ]; then
+    # Named. Configured already? Then use it; otherwise create it below.
+    [ -f "$ROOT/infra/$cloud/terraform.tfvars" ] || { cmd_ground "$([ "$cloud" = "aws" ] && echo aws || echo do)" || {
+        echo ""
+        info "Once that is sorted, run ${BOLD}unoverse deploy $cloud${NC} again. It picks up right here."
+        echo ""
+        exit 1
+      }; }
+  elif [ -f "$ROOT/infra/digitalocean/terraform.tfvars" ] || [ -f "$ROOT/infra/aws/terraform.tfvars" ]; then
+    cloud=$(SELF_CMD="unoverse deploy" _pick_ground "") || exit 1
   fi
 
   if [ -z "$cloud" ]; then

package/operator/lib/help.sh

@@ -25,8 +25,13 @@ cmd_help() {
   # THE ARGUMENT IS ON THE LINE, not in a footnote. It read as a special case for people
   # with two clouds; it is simply how the command is shaped. A cloud is optional when only
   # one ground exists and required when two do.
-  echo -e "    ${GREEN}deploy${NC}      Ship it to a server ${DIM}· aws or digitalocean${NC}"
-  echo -e "    ${GREEN}destroy${NC}     Take it down ${DIM}· aws or digitalocean, shows what goes and what stays${NC}"
+  # SHOW THE COMMAND, not a description of it. "aws or digitalocean" told a reader the
+  # clouds exist without telling them what to type, so the shape of the command still had
+  # to be guessed. Print the line they will actually run.
+  echo -e "    ${GREEN}deploy${NC}      Ship it to a server ${DIM}(first run asks which cloud)${NC}"
+  echo -e "                ${DIM}unoverse deploy aws   ·   unoverse deploy digitalocean${NC}"
+  echo -e "    ${GREEN}destroy${NC}     Take it down ${DIM}(shows what goes, and what stays)${NC}"
+  echo -e "                ${DIM}unoverse destroy aws   ·   unoverse destroy digitalocean${NC}"
   echo -e "    ${GREEN}db-allow${NC}    Let this machine reach the database ${DIM}(run it when you change network)${NC}"
   echo ""
   # Owner-only lane. Printed ONLY when publish.sh is present, so a starter kit never

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoverse",
-  "version": "0.1.95",
+  "version": "0.1.97",
   "description": "The Unoverse front door — create a Studio project, a universe, or a client app, and launch Studio.",
   "license": "SEE LICENSE IN README.md",
   "type": "module",