@thegetty/quire-cli 1.0.0-pre-release.11 → 1.0.0-pre-release.13

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@thegetty/quire-cli",
   "description": "Quire command-line interface",
-  "version": "1.0.0-pre-release.11",
+  "version": "1.0.0-pre-release.13",
   "author": "Getty Digital",
-  "license": "J Paul Getty Trust",
+  "license": "SEE LICENSE IN https://github.com/thegetty/quire/blob/main/LICENSE",
   "bugs": {
     "url": "https://github.com/thegetty/quire/issues"
   },

package/src/commands/build.js

@@ -1,6 +1,7 @@
 import Command from '#src/Command.js'
 import { api, cli, paths, projectRoot  } from '#lib/11ty/index.js'
 import { clean } from '#helpers/clean.js'
+import testcwd from '#helpers/test-cwd.js'
 
 /**
  * Quire CLI `build` Command
@@ -56,6 +57,8 @@ export default class BuildCommand extends Command {
   }
 
   preAction(command) {
+    testcwd(command)
+
     const options = command.opts()
     if (options.debug) {
       console.debug('[CLI] Calling \'build\' command pre-action with options', options)

package/src/commands/clean.js

@@ -1,6 +1,7 @@
 import Command from '#src/Command.js'
 import { clean } from '#helpers/clean.js'
 import { paths, projectRoot  } from '#lib/11ty/index.js'
+import testcwd from '#helpers/test-cwd.js'
 
 /**
  * Quire CLI `clean` Command
@@ -53,4 +54,8 @@ export default class CleanCommand extends Command {
 
     console.debug(`[CLI] ${message} ${deletedPaths}`)
   }
+
+  preAction(command) {
+    testcwd(command)
+  }
 }

package/src/commands/preview.js

@@ -1,5 +1,6 @@
 import Command from '#src/Command.js'
 import { api, cli, paths, projectRoot  } from '#lib/11ty/index.js'
+import testcwd from '#helpers/test-cwd.js'
 
 /**
  * Quire CLI `preview` Command
@@ -53,4 +54,8 @@ export default class PreviewCommand extends Command {
       api.serve(options)
     }
   }
+
+  preAction(command) {
+    testcwd(command)
+  }
 }

package/src/commands/version.js

@@ -1,5 +1,7 @@
 import Command from '#src/Command.js'
+import { paths, projectRoot  } from '#lib/11ty/index.js'
 import * as quire from '#lib/quire/index.js'
+import testcwd from '#helpers/test-cwd.js'
 
 /**
  * Quire CLI `version` Command
@@ -21,7 +23,7 @@ export default class VersionCommand extends Command {
       [ '<version>', 'the local quire version to use' ],
     ],
     options: [
-      [ '-g', '--global', 'set the quire version globally' ],
+      // [ '-g', '--global', 'set the quire version globally' ],
     ],
   }
 
@@ -29,9 +31,13 @@ export default class VersionCommand extends Command {
     super(VersionCommand.definition)
   }
 
-  async action(path, starter, options = {}) {
+  action(args, options = {}) {
     if (options.debug) {
       console.info('Command \'%s\' called with options %o', this.name, options)
     }
   }
+
+  preAction(command) {
+    testcwd(command)
+  }
 }

package/src/helpers/is-quire.js

@@ -20,8 +20,8 @@ const QUIRE_DOT_FILES = Object.freeze([
  * @param    {String}   dirpath   path to a local directory
  * @return   {Promise}
  */
-export function isQuire (dirpath) {
+export default function (dirpath) {
   return fs.readdirSync(dirpath)
-    .includes((file) => QUIRE_DOT_FILES.includes(file))
+    .find((entry) => QUIRE_DOT_FILES.includes(entry))
 }
 

package/src/helpers/test-cwd.js

@@ -3,17 +3,13 @@ import isQuire from '#helpers/is-quire.js'
 /**
  * Test current working directory is a Quire project directory
  *
- * @param  {String}  projectPath
- * @return  {Boolean}
+ * @param  {Command}  command  the command from which testcwd was called
  */
 export default (command) => {
-  const message = `[CLI] the '${command.name}' command must be run from a Quire project directory.`
+  const message = `[CLI] ${ command ? command.name() : '' } command must be run while in a Quire project directory. Use 'cd' to navigate to your project directory and re-run the 'quire ${ command ? command.name() : '' }' command.`
 
-  return (projectPath) => {
-    if (!isQuire(process.cwd()) && !isQuire(projectPath)) {
-      if (command) console.error(message)
-      return false
-    }
-    return true
+  if (!isQuire(process.cwd())) {
+    console.error(message)
+    process.exit(1)
   }
 }