occam-open-cli 6.0.173 → 6.0.175

package/bin/action/createAccount.js

@@ -3,8 +3,8 @@
 const createAccountOperation = require("../operation/createAccount"),
       passwordPromptOperation = require("../operation/prompt/password"),
       usernamePromptOperation = require("../operation/prompt/username"),
-      setIdentityTokenOperation = require("../operation/setIdentityToken"),
-      emailAddressPromptOperation = require("../operation/prompt/emailAddress");
+      emailAddressPromptOperation = require("../operation/prompt/emailAddress"),
+      updateIdentityTokenOperation = require("../operation/updateIdentityToken");
 
 const { executeOperations } = require("../utilities/operation");
 
@@ -16,7 +16,7 @@ function createAccountAction(emailAddress) {
           usernamePromptOperation,
           passwordPromptOperation,
           createAccountOperation,
-          setIdentityTokenOperation
+          updateIdentityTokenOperation
         ],
         context = {
           emailAddress,

package/bin/action/setOptions.js

@@ -1,7 +1,7 @@
 "use strict";
 
-const setOptionsOperation = require("../operation/setOptions"),
-      useSSHPromptOperation = require("../operation/prompt/useSSH"),
+const useSSHPromptOperation = require("../operation/prompt/useSSH"),
+      updateOptionsOperation = require("../operation/updateOptions"),
       gitHubHostNamePromptOperation = require("../operation/prompt/gitHubHostName");
 
 const { executeOperations } = require("../utilities/operation"),
@@ -11,7 +11,7 @@ function setOptionsAction() {
   const operations = [
           useSSHPromptOperation,
           gitHubHostNamePromptOperation,
-          setOptionsOperation
+          updateOptionsOperation
         ],
         context = {};
 

package/bin/action/setShellCommands.js

@@ -1,14 +1,16 @@
 "use strict";
 
-const setShellCommandsPromptOperation = require("../operation/prompt/setShellCommands");
+const updateShellCommandsOperation = require("../operation/updateShellCommands"),
+      setShellCommandsPromptOperation = require("../operation/prompt/setShellCommands");
 
 const { executeOperations } = require("../utilities/operation"),
-      { retrieveShellCommands, updateShellCommands } = require("../configuration"),
+      { retrieveShellCommands } = require("../configuration"),
       { FAILED_SET_SHELL_COMMANDS_MESSAGE, SUCCESSFUL_SET_SHELL_COMMANDS_MESSAGE } = require("../messages");
 
 function setShellCommandsAction() {
   const operations = [
-          setShellCommandsPromptOperation
+          setShellCommandsPromptOperation,
+          updateShellCommandsOperation
         ],
         shellCommands = retrieveShellCommands(),
         context = {
@@ -22,10 +24,6 @@ function setShellCommandsAction() {
       return;
     }
 
-    const { shellCommands } = context;
-
-    updateShellCommands(shellCommands);
-
     console.log(SUCCESSFUL_SET_SHELL_COMMANDS_MESSAGE);
   }, context);
 }

package/bin/action/signIn.js

@@ -2,7 +2,7 @@
 
 const signInOperation = require("../operation/signIn"),
       passwordPromptOperation = require("../operation/prompt/password"),
-      setIdentityTokenOperation = require("../operation/setIdentityToken"),
+      updateIdentityTokenOperation = require("../operation/updateIdentityToken"),
       emailAddressOrUsernamePromptOperation = require("../operation/prompt/emailAddressOrUsername");
 
 const { executeOperations } = require("../utilities/operation");
@@ -13,7 +13,7 @@ function signInAction(emailAddressOrUsername) {
           emailAddressOrUsernamePromptOperation,
           passwordPromptOperation,
           signInOperation,
-          setIdentityTokenOperation
+          updateIdentityTokenOperation
         ],
         context = {
           emailAddressOrUsername,

package/bin/configuration/version_5_1.js

@@ -1,12 +1,15 @@
 "use strict";
 
 const { VERSION_5_1 } = require("../versions"),
-      { DEFAULT_HOST, DEFAULT_SHELL_COMMANDS } = require("../defaults");
+      { DEFAULT_HOST, DEFAULT_USE_SSH, DEFAULT_SHELL_COMMANDS } = require("../defaults");
 
 function createConfiguration() {
   const version = VERSION_5_1,
         host = DEFAULT_HOST,
-        options = {},
+        useSSH = DEFAULT_USE_SSH,
+        options = {
+          useSSH,
+        },
         shellCommands = DEFAULT_SHELL_COMMANDS,
         identityToken = null,
         configuration = {

package/bin/defaults.js

@@ -15,6 +15,7 @@ const DEFAULT_NO = false,
       DEFAULT_DRY_RUN = false,
       DEFAULT_VERSION = false,
       DEFAULT_QUIETLY = false,
+      DEFAULT_USE_SSH = false,
       DEFAULT_LOG_LEVEL = INFO_LEVEL,
       DEFAULT_SHELL_COMMANDS = EMPTY_STRING,
       DEFAULT_GITHUB_HOST_NAME = "github.com";
@@ -29,6 +30,7 @@ module.exports = {
   DEFAULT_DRY_RUN,
   DEFAULT_VERSION,
   DEFAULT_QUIETLY,
+  DEFAULT_USE_SSH,
   DEFAULT_LOG_LEVEL,
   DEFAULT_SHELL_COMMANDS,
   DEFAULT_GITHUB_HOST_NAME

package/bin/operation/{setIdentityToken.js → updateIdentityToken.js}

@@ -2,7 +2,7 @@
 
 const { updateIdentityToken } = require("../configuration");
 
-function setIdentityTokenOperation(proceed, abort, context) {
+function updateIdentityTokenOperation(proceed, abort, context) {
   const { identityToken } = context;
 
   if (identityToken !== null) {
@@ -12,4 +12,4 @@ function setIdentityTokenOperation(proceed, abort, context) {
   proceed();
 }
 
-module.exports = setIdentityTokenOperation;
+module.exports = updateIdentityTokenOperation;

package/bin/operation/{setOptions.js → updateOptions.js}

@@ -2,7 +2,7 @@
 
 const { updateOptions } = require("../configuration");
 
-function setOptionsOperation(proceed, abort, context) {
+function updateOptionsOperation(proceed, abort, context) {
   const { useSSH } = context,
         options = {};
 
@@ -22,4 +22,4 @@ function setOptionsOperation(proceed, abort, context) {
   proceed();
 }
 
-module.exports = setOptionsOperation;
+module.exports = updateOptionsOperation;

package/bin/operation/updateShellCommands.js

@@ -0,0 +1,13 @@
+"use strict";
+
+const { updateShellCommands } = require("../configuration");
+
+function updateShellCommandsOperation(proceed, abort, context) {
+  const { shellCommands } = context;
+
+  updateShellCommands(shellCommands);
+
+  proceed();
+}
+
+module.exports = updateShellCommandsOperation;

package/bin/prepare.js

@@ -3,7 +3,14 @@
 const changeDirectory = require("./changeDirectory");
 
 const { DEFAULT_HELP, DEFAULT_VERSION } = require("./defaults"),
-      { HELP_COMMAND, VERSION_COMMAND, INITIALISE_COMMAND, OPEN_COMMAND } = require("./commands");
+      { HELP_COMMAND,
+        OPEN_COMMAND,
+        VERSION_COMMAND,
+        SIGN_IN_COMMAND,
+        SIGN_OUT_COMMAND,
+        INITIALISE_COMMAND,
+        SET_OPTIONS_COMMAND,
+        SET_SHELL_COMMANDS_COMMAND } = require("./commands");
 
 function prepare(command, argument, options, main) {
   const { help = DEFAULT_HELP, version = DEFAULT_VERSION } = options;
@@ -29,9 +36,11 @@ function prepare(command, argument, options, main) {
   }
 
   if (argument === null) {
-    argument = command; ///
+    if ((command !== SIGN_IN_COMMAND) && (command !== SIGN_OUT_COMMAND) && (command !== SET_OPTIONS_COMMAND) && (command !== SET_SHELL_COMMANDS_COMMAND)) {
+      argument = command; ///
 
-    command = OPEN_COMMAND;
+      command = OPEN_COMMAND;
+    }
   }
 
   if (command === null) {

package/package.json

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