occam-open-cli 6.0.144 → 6.0.145

package/bin/action/help.js

@@ -3,7 +3,7 @@
 function helpAction() {
   console.log(`Usage: 
   
-  open [<command>] [<argument>]
+  open [<options>] [<command>] [<argument>]
 
 Commands:
 

package/bin/configuration.js

@@ -14,7 +14,7 @@ const { rc } = configurationUtilities,
       { migrate } = versionUtilities,
       { setRCBaseExtension, checkRCFileExists, updateRCFile, writeRCFile, readRCFile } = rc;
 
-const rcBaseExtension = OPEN;
+const rcBaseExtension = OPEN; ///
 
 setRCBaseExtension(rcBaseExtension);
 
@@ -97,6 +97,16 @@ function checkConfigurationFileExists() {
   return configurationFileExists;
 }
 
+function assertConfigurationFileExists() {
+  const configurationFileExists = checkConfigurationFileExists();
+
+  if (!configurationFileExists) {
+    console.log(CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE);
+
+    process.exit();
+  }
+}
+
 module.exports = {
   retrieveHost,
   retrieveOptions,
@@ -108,7 +118,8 @@ module.exports = {
   removeIdentityToken,
   createConfigurationFile,
   migrateConfigurationFile,
-  checkConfigurationFileExists
+  checkConfigurationFileExists,
+  assertConfigurationFileExists
 };
 
 function readConfigurationFile() {
@@ -136,13 +147,3 @@ function updateConfigurationFile(addedConfiguration, ...deleteConfigurationNames
 
   updateRCFile(addedProperties, ...deletedPropertyNames);
 }
-
-function assertConfigurationFileExists() {
-  const configurationFileExists = checkConfigurationFileExists();
-
-  if (!configurationFileExists) {
-    console.log(CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE);
-
-    process.exit();
-  }
-}

package/bin/configure.js

@@ -3,16 +3,27 @@
 const { pathUtilities } = require("necessary");
 
 const { DOUBLE_DOTS } = require("./constants"),
-      { PUBLISH_COMMAND } = require("./commands"),
-      { checkConfigurationFileExists, migrateConfigurationFile } = require("./configuration");
+      { DEFAULT_HELP, DEFAULT_VERSION } = require("./defaults"),
+      { HELP_COMMAND, VERSION_COMMAND, PUBLISH_COMMAND } = require("./commands"),
+      { migrateConfigurationFile, checkConfigurationFileExists, assertConfigurationFileExists } = require("./configuration");
 
 const { bottommostNameFromPath } = pathUtilities;
 
 function configure(command, argument, options, main) {
-  let configurationFileExists = checkConfigurationFileExists();
+  let configurationFileExists;
 
-  if (command === PUBLISH_COMMAND) {  ///
-    if (argument === null) {
+  const { help = DEFAULT_HELP, version = DEFAULT_VERSION } = options;
+
+  if ((help === true) || (version === true) || (command === HELP_COMMAND) || (command === VERSION_COMMAND)) {
+    main(command, argument, options);
+
+    return;
+  }
+
+  configurationFileExists = checkConfigurationFileExists();
+
+  if (command === null) {
+    if (!configurationFileExists) {
       const currentWorkingDirectoryPath = process.cwd(); ///
 
       process.chdir(DOUBLE_DOTS);
@@ -24,14 +35,16 @@ function configure(command, argument, options, main) {
       if (configurationFileExists) {
         const bottommostOldCurrentWorkingDirectoryName = bottommostNameFromPath(oldCurrentWorkingDirectoryPath);
 
+        command = PUBLISH_COMMAND;  ///
+
         argument = bottommostOldCurrentWorkingDirectoryName; ///
       }
     }
   }
 
-  if (configurationFileExists) {
-    migrateConfigurationFile();
-  }
+  assertConfigurationFileExists();
+
+  migrateConfigurationFile();
 
   main(command, argument, options);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-open-cli",
   "author": "James Smith",
-  "version": "6.0.144",
+  "version": "6.0.145",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-open-cli",
   "description": "Occam's command line package management tool.",