occam-open-cli 6.0.171 → 6.0.173

package/bin/action/clone.js

@@ -8,9 +8,8 @@ const cloneOperation = require("../operation/clone"),
 const { executeOperations } = require("../utilities/operation"),
       { SUCCESSFUL_CLONE_MESSAGE, FAILED_CLONE_MESSAGE } = require("../messages");
 
-function cloneAction(argument, quietly, yes, no) {
-  const releaseName = argument,  ///
-        operations = [
+function cloneAction(releaseName, quietly, yes, no) {
+  const operations = [
           releaseNamePromptOperation,
           cloneDependenciesPromptOperation,
           cloneOperation,

package/bin/action/createAccount.js

@@ -8,9 +8,8 @@ const createAccountOperation = require("../operation/createAccount"),
 
 const { executeOperations } = require("../utilities/operation");
 
-function createAccountAction(argument) {
-  const emailAddress = argument,  ///
-        username = null,
+function createAccountAction(emailAddress) {
+  const username = null,
         password = null,
         operations = [
           emailAddressPromptOperation,

package/bin/action/open.js

@@ -7,9 +7,8 @@ const openOperation = require("../operation/open"),
 const { executeOperations } = require("../utilities/operation"),
       { SUCCESSFUL_OPEN_MESSAGE, FAILED_OPEN_MESSAGE } = require("../messages");
 
-function openAction(argument, quietly, yes, no) {
-  const releaseName = argument,  ///
-        operations = [
+function openAction(releaseName, quietly, yes, no) {
+  const operations = [
           releaseNamePromptOperation,
           openOperation,
           openReleasesOperation

package/bin/action/publish.js

@@ -9,13 +9,11 @@ const publishOperation = require("../operation/publish"),
       updateMetaJSONFileVersionOperation = require("../operation/updateMetaJSONFileVersion");
 
 const { DOUBLE_DASH } = require("../constants"),
-      { trimTrailingSlash } = require("../utilities/string"),
       { executeOperations } = require("../utilities/operation"),
       { FAILED_PUBLISH_MESSAGE, SUCCESSFUL_PUBLISH_MESSAGE } = require("../messages");
 
-function publishAction(argument, tail, follow, dryRun, logLevel) {
-  const releaseName = trimTrailingSlash(argument), ///
-        operations = [
+function publishAction(releaseName, tail, follow, dryRun, logLevel) {
+  const operations = [
           getIdentityTokenOperation,
           releaseNamePromptOperation,
           loadProjectOperation,

package/bin/action/resetPassword.js

@@ -5,9 +5,8 @@ const resetPasswordOperation = require("../operation/resetPassword"),
 
 const { executeOperations } = require("../utilities/operation");
 
-function resetPasswordAction(argument) {
-  const emailAddress = argument, ///
-        operations = [
+function resetPasswordAction(emailAddress) {
+  const operations = [
           emailAddressPromptOperation,
           resetPasswordOperation
         ],

package/bin/action/signIn.js

@@ -7,9 +7,8 @@ const signInOperation = require("../operation/signIn"),
 
 const { executeOperations } = require("../utilities/operation");
 
-function signInAction(argument) {
-  const emailAddressOrUsername = argument,  ///
-        password = null,
+function signInAction(emailAddressOrUsername) {
+  const password = null,
         operations = [
           emailAddressOrUsernamePromptOperation,
           passwordPromptOperation,

package/bin/action/withdraw.js

@@ -8,9 +8,8 @@ const withdrawOperation = require("../operation/withdraw"),
 const { executeOperations } = require("../utilities/operation"),
       { FAILED_WITHDRAW_MESSAGE, SUCCESSFUL_WITHDRAW_MESSAGE } = require("../messages");
 
-function withdrawAction(argument) {
-  const releaseName = argument,  ///
-        password = null,
+function withdrawAction(releaseName) {
+  const password = null,
         operations = [
           getIdentityTokenOperation,
           releaseNamePromptOperation,

package/bin/changeDirectory.js

@@ -0,0 +1,37 @@
+"use strict";
+
+const { pathUtilities } = require("necessary");
+
+const { DOUBLE_DOTS } = require("./constants"),
+      { migrateConfigurationFile, checkConfigurationFileExists } = require("./configuration");
+
+const { bottommostNameFromPath } = pathUtilities;
+
+function changeDirectory() {
+  let directoryName = null,
+    configurationFileExists = checkConfigurationFileExists();
+
+  if (!configurationFileExists) {
+    const currentWorkingDirectoryPath = process.cwd(); ///
+
+    process.chdir(DOUBLE_DOTS);
+
+    const oldCurrentWorkingDirectoryPath = currentWorkingDirectoryPath; ///
+
+    configurationFileExists = checkConfigurationFileExists();
+
+    if (configurationFileExists) {
+      const bottommostOldCurrentWorkingDirectoryName = bottommostNameFromPath(oldCurrentWorkingDirectoryPath);
+
+      directoryName = bottommostOldCurrentWorkingDirectoryName; ///
+    } else {
+      process.chdir(oldCurrentWorkingDirectoryPath);
+    }
+  }
+
+  migrateConfigurationFile();
+
+  return directoryName;
+}
+
+module.exports = changeDirectory;

package/bin/main.js

@@ -14,7 +14,7 @@ const helpAction = require("./action/help"),
       resetPasswordAction = require("./action/resetPassword"),
       setShellCommandsAction = require("./action/setShellCommands");
 
-const { NO_COMMAND_GIVEN_MESSAGE } = require("./messages"),
+const { NO_ARGUMENT_GIVEN_MESSAGE, COMMAND_NOT_RECOGNISED_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,
@@ -40,44 +40,64 @@ function main(command, argument, options) {
           logLevel = DEFAULT_LOG_LEVEL } = options;
 
   switch (command) {
-    case null: {
-      console.log(NO_COMMAND_GIVEN_MESSAGE);
+    case HELP_COMMAND: {
+      helpAction();
 
       break;
     }
 
-    case HELP_COMMAND: {
-      helpAction();
+    case VERSION_COMMAND: {
+      versionAction();
 
       break;
     }
 
-    case OPEN_COMMAND: {
-      openAction(argument, quietly, yes, no);
+    case INITIALISE_COMMAND: {
+      initialiseAction();
 
       break;
     }
 
-    case CLONE_COMMAND: {
-      cloneAction(argument, quietly, yes, no);
+    case OPEN_COMMAND: {
+      if (argument === null) {
+        console.log(NO_ARGUMENT_GIVEN_MESSAGE);
+      } else {
+        const releaseName = argument; ///
+
+        openAction(releaseName, quietly, yes, no);
+      }
 
       break;
     }
 
-    case VERSION_COMMAND: {
-      versionAction();
+    case CLONE_COMMAND: {
+      if (argument === null) {
+        console.log(NO_ARGUMENT_GIVEN_MESSAGE);
+      } else {
+        const releaseName = argument;  ///
+
+        cloneAction(releaseName, quietly, yes, no);
+      }
 
       break;
     }
 
     case PUBLISH_COMMAND: {
-      publishAction(argument, tail, follow, dryRun, logLevel);
+      if (argument === null) {
+        console.log(NO_ARGUMENT_GIVEN_MESSAGE);
+      } else {
+        const releaseName = argument;  ///
+
+        publishAction(releaseName, tail, follow, dryRun, logLevel);
+      }
 
       break;
     }
 
     case SIGN_IN_COMMAND: {
-      signInAction(argument);
+      const emailAddressOrUsername = argument;  ///
+
+      signInAction(emailAddressOrUsername);
 
       break;
     }
@@ -89,13 +109,9 @@ function main(command, argument, options) {
     }
 
     case WITHDRAW_COMMAND: {
-      withdrawAction(argument);
+      const releaseName = argument;  ///
 
-      break;
-    }
-
-    case INITIALISE_COMMAND: {
-      initialiseAction();
+      withdrawAction(releaseName);
 
       break;
     }
@@ -107,13 +123,17 @@ function main(command, argument, options) {
     }
 
     case CREATE_ACCOUNT_COMMAND: {
-      createAccountAction(argument);
+      const emailAddress = argument;  ///
+
+      createAccountAction(emailAddress);
 
       break;
     }
 
     case RESET_PASSWORD_COMMAND: {
-      resetPasswordAction(argument);
+      const emailAddress = argument; ///
+
+      resetPasswordAction(emailAddress);
 
       break;
     }
@@ -125,9 +145,7 @@ function main(command, argument, options) {
     }
 
     default: {
-      argument = command; ///
-
-      openAction(argument, quietly, yes, no);
+      console.log(COMMAND_NOT_RECOGNISED_MESSAGE);
 
       break;
     }

package/bin/messages.js

@@ -1,6 +1,7 @@
 "use strict";
 
-const NO_COMMAND_GIVEN_MESSAGE = "No command has been given.",
+const NO_ARGUMENT_GIVEN_MESSAGE = "No argument has been given.",
+      COMMAND_NOT_RECOGNISED_MESSAGE = "The command is not recognised.",
       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.",
@@ -29,7 +30,8 @@ const NO_COMMAND_GIVEN_MESSAGE = "No command has been given.",
       SUCCESSFUL_SET_SHELL_COMMANDS_MESSAGE = "The shell commands have been set successfully.";
 
 module.exports = {
-  NO_COMMAND_GIVEN_MESSAGE,
+  NO_ARGUMENT_GIVEN_MESSAGE,
+  COMMAND_NOT_RECOGNISED_MESSAGE,
   PASSWORDS_DO_NOT_MATCH_MESSAGE,
   SERVER_FAILED_TO_RESPOND_ERROR_MESSAGE,
   CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE,

package/bin/prepare.js

@@ -0,0 +1,44 @@
+"use strict";
+
+const changeDirectory = require("./changeDirectory");
+
+const { DEFAULT_HELP, DEFAULT_VERSION } = require("./defaults"),
+      { HELP_COMMAND, VERSION_COMMAND, INITIALISE_COMMAND, OPEN_COMMAND } = require("./commands");
+
+function prepare(command, argument, options, main) {
+  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) || (command === INITIALISE_COMMAND)) {
+    main(command, argument, options);
+
+    return;
+  }
+
+  const directoryName = changeDirectory();
+
+  if (directoryName !== null) {
+    argument = directoryName; ///
+  }
+
+  if (argument === null) {
+    argument = command; ///
+
+    command = OPEN_COMMAND;
+  }
+
+  if (command === null) {
+    command = OPEN_COMMAND;
+  }
+
+  main(command, argument, options);
+}
+
+module.exports = prepare;

package/bin/utilities/string.js

@@ -2,12 +2,6 @@
 
 const { EMPTY_STRING } = require("../constants");
 
-function trimTrailingSlash(string) {
-  string = string.replace(/\/$/, EMPTY_STRING); ///
-
-  return string;
-}
-
 function trimTrailingCarriageReturn(string) {
   string = string.replace(/\n$/, EMPTY_STRING); ///
 
@@ -15,6 +9,5 @@ function trimTrailingCarriageReturn(string) {
 }
 
 module.exports = {
-  trimTrailingSlash,
   trimTrailingCarriageReturn
 };

package/open.js

@@ -4,7 +4,7 @@ const { parseArgv } = require("argumentative"),
       { arrayUtilities } = require("necessary");
 
 const main = require("./bin/main"),
-      configure = require("./bin/configure"),
+      prepare = require("./bin/prepare"),
       abbreviations = require("./bin/abbreviations");
 
 const { argv } = process,
@@ -16,4 +16,4 @@ const { commands, options } = parseArgv(argv, abbreviations),
       command = firstCommand || null, ///
       argument = secondCommand || null; ///
 
-configure(command, argument, options, main);
+prepare(command, argument, options, main);

package/package.json

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

package/bin/configure.js

@@ -1,77 +0,0 @@
-"use strict";
-
-const { pathUtilities } = require("necessary");
-
-const { DOUBLE_DOTS } = require("./constants"),
-      { DEFAULT_HELP, DEFAULT_VERSION } = require("./defaults"),
-      { migrateConfigurationFile, checkConfigurationFileExists } = require("./configuration"),
-      { HELP_COMMAND, VERSION_COMMAND, INITIALISE_COMMAND, PUBLISH_COMMAND } = require("./commands");
-
-const { bottommostNameFromPath } = pathUtilities;
-
-function configure(command, argument, options, main) {
-  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;
-  }
-
-  const directoryName = changeDirectory(command);
-
-  if (directoryName !== null) {
-    if (command !== null) {
-      command = PUBLISH_COMMAND;
-    }
-
-    argument = directoryName; ///
-  }
-
-  if (argument === null) {
-    argument = command; ///
-
-    command = PUBLISH_COMMAND;
-  }
-
-  main(command, argument, options);
-}
-
-module.exports = configure;
-
-function changeDirectory(command) {
-  let directoryName = null,
-    configurationFileExists = checkConfigurationFileExists();
-
-  if (!configurationFileExists) {
-    const currentWorkingDirectoryPath = process.cwd(); ///
-
-    process.chdir(DOUBLE_DOTS);
-
-    const oldCurrentWorkingDirectoryPath = currentWorkingDirectoryPath; ///
-
-    configurationFileExists = checkConfigurationFileExists();
-
-    if (configurationFileExists) {
-      const bottommostOldCurrentWorkingDirectoryName = bottommostNameFromPath(oldCurrentWorkingDirectoryPath);
-
-      directoryName = bottommostOldCurrentWorkingDirectoryName; ///
-    } else {
-      process.chdir(oldCurrentWorkingDirectoryPath);
-    }
-  }
-
-  if (command !== INITIALISE_COMMAND) {
-    migrateConfigurationFile();
-  }
-
-  return directoryName;
-}