unoverse 0.1.46 → 0.1.48

package/operator/lib/deploy.sh

@@ -23,15 +23,36 @@ cmd_deploy() {
     done
   fi
 
+  # NO SERVER YET is not an error, it is the first question. deploy owns the whole
+  # journey: pick the cloud right here (ground is no longer a command to know about),
+  # prefill its Terraform, and name the two commands left. `terraform apply` stays the
+  # developer's own explicit act — it creates billable infrastructure.
   if [ ! -f "$env_prod" ]; then
-    fail ".env.production not found, and no applied Terraform ground to render it from"
     echo ""
-    info "Provision first — then deploy renders the env itself:"
-    info "  unoverse ground                          # prefill terraform.tfvars"
-    info "  cd infra/digitalocean && terraform init && terraform apply    # or infra/aws"
-    info "  cd ../.. && unoverse deploy init"
+    echo -e "  ${CYAN}${BOLD}Where should this universe live?${NC}"
     echo ""
-    exit 1
+    echo -e "  ${CYAN}❯${NC} 1  ${BOLD}DigitalOcean${NC}"
+    echo -e "    2  AWS"
+    echo ""
+    local cloud_choice cloud
+    read -r -p "  Enter to choose, or type 2: " cloud_choice
+    case "$cloud_choice" in
+      2) cloud=aws ;;
+      *) cloud=digitalocean ;;
+    esac
+    echo ""
+    cmd_ground "$([ "$cloud" = "aws" ] && echo aws || echo do)" || {
+      echo ""
+      info "Once that is sorted, run ${BOLD}unoverse deploy${NC} again. It picks up right here."
+      echo ""
+      exit 1
+    }
+    echo ""
+    info "Your $cloud ground is prefilled. Two commands left:"
+    info "  cd infra/$cloud && terraform init && terraform apply   ${DIM}# creates the server (billable)${NC}"
+    info "  cd ../.. && unoverse deploy                            ${DIM}# ships the platform onto it${NC}"
+    echo ""
+    exit 0
   fi
 
   # Read deploy target from .env.production

package/operator/lib/ground.sh

@@ -18,11 +18,26 @@ _ground_do() {
   local out="$dir/terraform.tfvars"
 
   if ! command -v doctl >/dev/null 2>&1; then
-    fail "doctl is not installed"
-    info "  brew install doctl        (macOS)"
-    info "  https://docs.digitalocean.com/reference/doctl/how-to/install/"
-    info "Then authenticate: doctl auth init"
-    return 1
+    # Offer to install rather than sending the developer away with homework: brew is
+    # already on most Macs that got this far. Their yes, their machine, our command.
+    if command -v brew >/dev/null 2>&1; then
+      local REPLY
+      read -r -p "  doctl (the DigitalOcean CLI) is needed. Install it now with brew? [Y/n] " REPLY
+      if [[ ! "$REPLY" =~ ^[Nn]$ ]]; then
+        brew install doctl || { fail "brew install doctl failed"; return 1; }
+        ok "doctl installed"
+      else
+        fail "doctl is needed to continue"
+        info "  https://docs.digitalocean.com/reference/doctl/how-to/install/"
+        return 1
+      fi
+    else
+      fail "doctl is not installed"
+      info "  brew install doctl        (macOS)"
+      info "  https://docs.digitalocean.com/reference/doctl/how-to/install/"
+      info "Then authenticate: doctl auth init"
+      return 1
+    fi
   fi
   if ! doctl account get >/dev/null 2>&1; then
     fail "doctl is not authenticated"

package/operator/lib/help.sh

@@ -22,8 +22,7 @@ cmd_help() {
   echo -e "    ${GREEN}stop${NC}        Stop it"
   echo -e "    ${GREEN}check${NC}       Is it healthy ${DIM}(services, schema, environment)${NC}"
   echo -e "    ${GREEN}logs${NC}        What is it doing ${DIM}(unoverse logs <service> for one)${NC}"
-  echo -e "    ${GREEN}ground${NC}      Prepare a server in your cloud ${DIM}(unoverse ground do|aws, prefills Terraform)${NC}"
-  echo -e "    ${GREEN}deploy${NC}      Ship it to your server ${DIM}(images + your work + migrations)${NC}"
+  echo -e "    ${GREEN}deploy${NC}      Ship it to a server ${DIM}(first run asks which cloud)${NC}"
   echo ""
   # Owner-only lane. Printed ONLY when publish.sh is present, so a starter kit never
   # advertises a command it does not have (sync-starter.sh deletes that file).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoverse",
-  "version": "0.1.46",
+  "version": "0.1.48",
   "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",