occam-open-cli 6.0.144 → 6.0.146

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);
 
@@ -76,6 +76,8 @@ function createConfigurationFile() {
 }
 
 function migrateConfigurationFile() {
+  assertConfigurationFileExists();
+
   let json = readRCFile();
 
   const migrationMap = {
@@ -97,6 +99,16 @@ function checkConfigurationFileExists() {
   return configurationFileExists;
 }
 
+function assertConfigurationFileExists() {
+  const configurationFileExists = checkConfigurationFileExists();
+
+  if (!configurationFileExists) {
+    console.log(CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE);
+
+    process.exit(1);
+  }
+}
+
 module.exports = {
   retrieveHost,
   retrieveOptions,
@@ -108,7 +120,8 @@ module.exports = {
   removeIdentityToken,
   createConfigurationFile,
   migrateConfigurationFile,
-  checkConfigurationFileExists
+  checkConfigurationFileExists,
+  assertConfigurationFileExists
 };
 
 function readConfigurationFile() {
@@ -136,13 +149,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,35 @@
 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 } = 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 (false) {
+    ///
+  } else if (help) {
+    command = HELP_COMMAND;
+  } else if (version) {
+    command = VERSION_COMMAND;
+  }
+
+  if ((command === HELP_COMMAND) || (command === VERSION_COMMAND)) {
+    main(command, argument, options);
+
+    return;
+  }
+
+  configurationFileExists = checkConfigurationFileExists();
+
+  if (command === PUBLISH_COMMAND) {
+    if (!configurationFileExists) {
       const currentWorkingDirectoryPath = process.cwd(); ///
 
       process.chdir(DOUBLE_DOTS);
@@ -29,9 +48,7 @@ function configure(command, argument, options, main) {
     }
   }
 
-  if (configurationFileExists) {
-    migrateConfigurationFile();
-  }
+  migrateConfigurationFile();
 
   main(command, argument, options);
 }

package/bin/main.js

@@ -14,7 +14,8 @@ const helpAction = require("./action/help"),
       resetPasswordAction = require("./action/resetPassword"),
       setShellCommandsAction = require("./action/setShellCommands");
 
-const { DEFAULT_NO, DEFAULT_YES, DEFAULT_HELP, DEFAULT_TAIL, DEFAULT_FOLLOW, DEFAULT_DRY_RUN, DEFAULT_VERSION, DEFAULT_QUIETLY, DEFAULT_LOG_LEVEL } = require("./defaults"),
+const { NO_COMMAND_GIVEN_MESSAGE } = require("./messages"),
+      { DEFAULT_NO, DEFAULT_YES, DEFAULT_TAIL, DEFAULT_FOLLOW, DEFAULT_DRY_RUN, DEFAULT_QUIETLY, DEFAULT_LOG_LEVEL } = require("./defaults"),
       { HELP_COMMAND,
         OPEN_COMMAND,
         CLONE_COMMAND,
@@ -30,28 +31,23 @@ const { DEFAULT_NO, DEFAULT_YES, DEFAULT_HELP, DEFAULT_TAIL, DEFAULT_FOLLOW, DEF
         SET_SHELL_COMMANDS_COMMAND } = require("./commands");
 
 function main(command, argument, options) {
-  const commandMissing = (command === null),
-        { no = DEFAULT_NO,
+  const { no = DEFAULT_NO,
           yes = DEFAULT_YES,
-          help = DEFAULT_HELP,
           tail = DEFAULT_TAIL,
           follow = DEFAULT_FOLLOW,
           dryRun = DEFAULT_DRY_RUN,
-          version = DEFAULT_VERSION,
           quietly = DEFAULT_QUIETLY,
           logLevel = DEFAULT_LOG_LEVEL } = options;
 
-  if (false) {
-    ///
-  } else if (help) {
-    command = HELP_COMMAND;
-  } else if (version) {
-    command = VERSION_COMMAND;
-  } else if (commandMissing) {
-    command = HELP_COMMAND;
-  }
-
   switch (command) {
+    case null: {
+      console.log(NO_COMMAND_GIVEN_MESSAGE);
+
+      process.exit(1);
+
+      break;
+    }
+
     case HELP_COMMAND: {
       helpAction();
 

package/bin/messages.js

@@ -1,6 +1,7 @@
 "use strict";
 
-const PASSWORDS_DO_NOT_MATCH_MESSAGE = "The passwords do not match.",
+const NO_COMMAND_GIVEN_MESSAGE = "No command has been given.",
+      PASSWORDS_DO_NOT_MATCH_MESSAGE = "The passwords do not match.",
       SERVER_FAILED_TO_RESPOND_ERROR_MESSAGE = "The server did not respond in a timely or intelligible fashion. If this problem persists then please be kind enough to report it.",
       CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE = "The action cannot be performed because the configuration file is missing. Run 'open initialise' to create one.",
       SIGN_OUT_MESSAGE = "You have been signed out.",
@@ -28,6 +29,7 @@ const PASSWORDS_DO_NOT_MATCH_MESSAGE = "The passwords do not match.",
       SUCCESSFUL_SET_SHELL_COMMANDS_MESSAGE = "The shell commands have been set successfully.";
 
 module.exports = {
+  NO_COMMAND_GIVEN_MESSAGE,
   PASSWORDS_DO_NOT_MATCH_MESSAGE,
   SERVER_FAILED_TO_RESPOND_ERROR_MESSAGE,
   CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE,

package/package.json

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