nukebase 2.1.0 → 2.1.1

package/bin/nukebase.js

@@ -24,7 +24,7 @@ if (!(args.has('version') && !args.command)) {
 const ACCOUNT_COMMANDS = ['login', 'logout', 'accounts', 'use', 'whoami', 'create', 'link'];
 const PROJECT_COMMANDS = [
   'push', 'pull', 'update', 'rollback', 'restorepoints', 'restore-points', 'backup', 'env',
-  'pause', 'restart', 'start', 'resume', 'delete', 'domain', 'logs', 'download',
+  'pause', 'restart', 'resume', 'delete', 'domain', 'logs', 'download',
   'regiontransfer', 'region-transfer'
 ];
 
@@ -49,8 +49,7 @@ Accounts
   whoami                     who owns this project, and are you signed in
 
 New projects
-  start [name] [size]        outside a project: sign in if needed, then create
-                             (inside a project, start = restart)
+  start [name] [size]        sign in if needed, then create and download
   create <name> [size] [email]
                              make a project and download it, e.g.
                              nukebase create demoapp123 256mb you@example.com
@@ -73,7 +72,7 @@ In a project folder (runs as the account that owns the project)
                              then; discards writes since
   rollback list              show restore points (also: restorepoints)
   pause                      stop the project (base fee + disk still accrue)
-  restart | start | resume   restart it; also resumes a paused project
+  restart | resume           restart it; also resumes a paused project
   delete                     delete it on the server; asks for the name
   domain                     connect a custom domain, step by step
   domain <name> [--email e]  connect in one go (DNS already set)
@@ -101,9 +100,20 @@ section of its package.json.`);
 
 let command = args.command;
 
-// `start` means two things: inside a project it restarts the app (as it always
-// has); anywhere else it is the new-user setup (sign in, create, download).
-if (command === 'start' && !require('../lib/project').findProject(process.cwd())) command = 'setup';
+// `start` is the new-user setup (sign in, create, download). It used to double
+// as a restart alias inside a project; now it stops there instead of guessing,
+// so the same words do the same thing in every folder.
+if (command === 'start') {
+  const here = require('../lib/project').findProject(process.cwd());
+  if (here) {
+    const { project } = require('../lib/project').readConfig(here);
+    console.error(`This folder is already the NukeBase project "${project}".`);
+    console.error('  nukebase restart         restart it (resumes a paused project)');
+    console.error('  nukebase create <name>   make a new project (run it elsewhere)');
+    process.exit(1);
+  }
+  command = 'setup';
+}
 
 if (args.has('version') && !command) {
   console.log(version);

package/lib/project-commands.js

@@ -1,5 +1,5 @@
 // Commands that act on the project in the current folder: push, pull, update,
-// rollback, backup, env, pause/restart/delete, domain, logs, download and
+// rollback, backup, env, pause/restart/resume/delete, domain, logs, download and
 // regiontransfer. Loaded by bin/nukebase.js, which runs the command named in
 // process.argv when this module is required.
 const { existsSync, readdirSync, statSync, lstatSync, readlinkSync, symlinkSync, readFileSync, writeFileSync, mkdirSync, unlinkSync, rmdirSync } = require('fs');
@@ -828,7 +828,7 @@ async function pauseProject() {
 async function restartProject() {
   await connectAndLogin();
   await projectPost('/restart', {}, { label: command });
-  console.log(command === 'restart' ? `🔄 Restarting ${project}...` : `▶️  Starting ${project}...`);
+  console.log(command === 'restart' ? `🔄 Restarting ${project}...` : `▶️  Resuming ${project}...`);
   if (AUTO_YES) { await tailLogsUntilSettled(); process.exit(0); }
   watchLogs();
 }
@@ -2343,9 +2343,9 @@ if (command === 'push' && args.positional[0] === 'env') {
   run(backup);
 } else if (command === 'pause') {
   run(pauseProject);
-} else if (command === 'restart' || command === 'start' || command === 'resume') {
+} else if (command === 'restart' || command === 'resume') {
   // One endpoint: /restart launches a stopped unit and bounces a running one,
-  // so start/resume are the same call under the name the user reaches for.
+  // so resume is the same call under the name the user reaches for.
   run(restartProject);
 } else if (command === 'delete') {
   run(deleteProject);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nukebase",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "NukeBase CLI: create, deploy and manage NukeBase projects",
   "bin": {
     "nukebase": "bin/nukebase.js"