occam-open-cli 5.0.122 → 5.0.124

package/README.md

@@ -35,10 +35,10 @@ These are the commands and options:
 
 Commands:
 
-  version                                        Show the version
-
   help                                           Show this help
   
+  version                                        Show the version
+
   [install] <package_name>                       Install a package
 
   initialise                                     Create a configuration file
@@ -68,6 +68,8 @@ Options:
   --quietly|-q                                   Run with almost no console logging
 
   --log-level|-l                                 Set the log level when publishing
+  
+  --yes|-y                                       Initially answer yes to prompts
 ```
 
 This is slightly different from `npm` in that `open` is usually executed from the parent directory of a project rather than from within the project sub-directory itself. Projects might reside in a `~/Mathematics/` directory, for example, in which case you should initialise `open` in there:

package/bin/abbreviations.js

@@ -1,14 +1,16 @@
 "use strict";
 
-const { HELP_OPTION, DRY_RUN_OPTION, VERSION_OPTION, QUIETLY_OPTION, LOG_LEVEL_OPTION } = require("./options");
+const { YES_OPTION, HELP_OPTION, DRY_RUN_OPTION, VERSION_OPTION, QUIETLY_OPTION, LOG_LEVEL_OPTION } = require("./options");
 
-const h = HELP_OPTION,
+const y = YES_OPTION,
+      h = HELP_OPTION,
       d = DRY_RUN_OPTION,
       v = VERSION_OPTION,
       q = QUIETLY_OPTION,
       l = LOG_LEVEL_OPTION
 
 module.exports = {
+  y,
   h,
   d,
   v,

package/bin/action/help.js

@@ -7,10 +7,10 @@ function helpAction() {
 
 Commands:
 
-  version                                        Show the version
-
   help                                           Show this help
   
+  version                                        Show the version
+
   [install] <package_name>                       Install a package
 
   initialise                                     Create a configuration file
@@ -40,6 +40,8 @@ Options:
   --quietly|-q                                   Run with almost no console logging
 
   --log-level|-l                                 Set the log level when publishing
+  
+  --yes|-y                                       Initially answer yes to prompts
 
 Further information:
 

package/bin/action/open.js

@@ -7,7 +7,7 @@ const openOperation = require("../operation/open"),
 const { executeOperations } = require("../utilities/operation"),
       { SUCCESSFUL_OPEN_MESSAGE, FAILED_OPEN_MESSAGE } = require("../messages");
 
-function openAction(argument, quietly) {
+function openAction(argument, quietly, yes) {
   const releaseName = argument,  ///
         operations = [
           releaseNamePromptOperation,
@@ -15,6 +15,7 @@ function openAction(argument, quietly) {
           unpackReleasesOperation
         ],
         context = {
+          yes,
           quietly,
           releaseName
         };

package/bin/actions.js

@@ -13,7 +13,7 @@ const helpAction = require("./action/help"),
       createAccountAction = require("./action/createAccount"),
       resetPasswordAction = require("./action/resetPassword");
 
-const { DEFAULT_HELP, DEFAULT_DRY_RUN, DEFAULT_VERSION, DEFAULT_QUIETLY, DEFAULT_LOG_LEVEL } = require("./defaults"),
+const { DEFAULT_YES, DEFAULT_HELP, DEFAULT_DRY_RUN, DEFAULT_VERSION, DEFAULT_QUIETLY, DEFAULT_LOG_LEVEL } = require("./defaults"),
       { HELP_COMMAND,
         OPEN_COMMAND,
         CLONE_COMMAND,
@@ -29,7 +29,8 @@ const { DEFAULT_HELP, DEFAULT_DRY_RUN, DEFAULT_VERSION, DEFAULT_QUIETLY, DEFAULT
 
 function actions(command, argument, options) {
   const commandMissing = (command === null),
-        { help = DEFAULT_HELP,
+        { yes = DEFAULT_YES,
+          help = DEFAULT_HELP,
           dryRun = DEFAULT_DRY_RUN,
           version = DEFAULT_VERSION,
           quietly = DEFAULT_QUIETLY,
@@ -47,7 +48,7 @@ function actions(command, argument, options) {
 
   switch (command) {
     case HELP_COMMAND : helpAction(); break;
-    case OPEN_COMMAND : openAction(argument, quietly); break;
+    case OPEN_COMMAND : openAction(argument, quietly, yes); break;
     case CLONE_COMMAND : cloneAction(argument, quietly); break;
     case VERSION_COMMAND : versionAction(); break;
     case PUBLISH_COMMAND : publishAction(argument, dryRun, logLevel); break;

package/bin/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 
-const END = "end",
+const YES = "yes",
+      END = "end",
       DATA = "data",
       OPEN = "open",
       HOST_URL = "hostURL",
@@ -12,6 +13,7 @@ const END = "end",
       PACKAGE_JSON = "package.json";
 
 module.exports = {
+  YES,
   END,
   DATA,
   OPEN,

package/bin/defaults.js

@@ -4,7 +4,8 @@ const { levels } = require("necessary");
 
 const { INFO_LEVEL } = levels;
 
-const DEFAULT_HELP = false,
+const DEFAULT_YES = false,
+      DEFAULT_HELP = false,
       DEFAULT_HOST = "https://openmathematics.org",
       DEFAULT_DRY_RUN = false,
       DEFAULT_VERSION = false,
@@ -13,6 +14,7 @@ const DEFAULT_HELP = false,
       DEFAULT_GITHUB_HOST_NAME = "github.com";
 
 module.exports = {
+  DEFAULT_YES,
   DEFAULT_HELP,
   DEFAULT_HOST,
   DEFAULT_DRY_RUN,

package/bin/messages.js

@@ -4,6 +4,7 @@ const 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.",
+      INVALID_ANSWER_MESSAGE = "You must answer (y)es or (n)o.",
       INVALID_USERNAME_MESSAGE = "Usernames must consist of groups of at least two and no more than sixteen numbers or lowercase letters, separated by dashes.",
       INVALID_PASSWORD_MESSAGE = "Passwords must consist of at least eight letters, numbers or common punctuation symbols.",
       INVALID_AFFIRMATION_MESSAGE = "You must answer (y)es or (n)o.",
@@ -29,6 +30,7 @@ module.exports = {
   SERVER_FAILED_TO_RESPOND_ERROR_MESSAGE,
   CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE,
   SIGN_OUT_MESSAGE,
+  INVALID_ANSWER_MESSAGE,
   INVALID_USERNAME_MESSAGE,
   INVALID_PASSWORD_MESSAGE,
   INVALID_AFFIRMATION_MESSAGE,

package/bin/operation/open.js

@@ -17,7 +17,9 @@ function openOperation(proceed, abort, context) {
       releases
     });
 
-    proceed();
+    success ?
+      proceed() :
+        abort();
   });
 }
 

package/bin/operation/unpackReleases.js

@@ -1,8 +1,16 @@
 "use strict";
 
-const { fileSystemUtilities } = require("necessary");
+const { shellUtilities, fileSystemUtilities, asynchronousUtilities } = require("necessary");
 
-const { writeFile, checkEntryExists } = fileSystemUtilities;
+const { YES } = require("../constants"),
+      { validateAnswer } = require("../utilities/validate"),
+      { isAnswerAffirmative } = require("../utilities/prompt"),
+      { INVALID_ANSWER_MESSAGE } = require("../messages");
+
+const { writeFile, removeEntry, checkEntryExists, isEntryDirectory } = fileSystemUtilities;
+
+const { prompt } = shellUtilities,
+      { forEach } = asynchronousUtilities;
 
 function unpackReleasesOperation(proceed, abort, context) {
   const { releases } = context;
@@ -13,30 +21,77 @@ function unpackReleasesOperation(proceed, abort, context) {
     return;
   }
 
-  releases.forEach((release) => {
-    const { name } = release,
-          path = name, ///
-          entryExists = checkEntryExists(path);
+  const done = proceed; ///
 
-    if (entryExists) {
-      const { quietly } = context;
+  forEach(releases, unpackReleasePromptOperation, done, context);
+}
 
-      if (!quietly) {
-        console.log(`Cannot write the '${name}' package to disk because an entry of that name already exists.`);
-      }
+module.exports = unpackReleasesOperation;
+
+function unpackReleasePromptOperation(release, next, done, context) {
+  const { name } = release,
+        entryPath = name, ///
+        entryExists = checkEntryExists(entryPath);
+
+  if (!entryExists) {
+    unpackRelease(release);
 
-      return;
+    next();
+
+    return;
+  }
+
+  const entryDirectory = isEntryDirectory(entryPath);
+
+  if (entryDirectory) {
+    const { quietly } = context;
+
+    if (!quietly) {
+      console.log(`Cannot write the '${name}' package to disk because a directory of that name already exists.`);
     }
 
-    const filePath = path,  ///
-          releaseJSON = release,  ///
-          releaseJSONString = JSON.stringify(releaseJSON),
-          content = releaseJSONString; ///
+    next();
 
-    writeFile(filePath, content);
-  });
+    return;
+  }
+
+  const { yes } = context,
+        answer = yes ?
+                   YES :
+                     null,
+        description = `Overwrite the existing '${name}' package? (y)es (n)o: `,
+        errorMessage = INVALID_ANSWER_MESSAGE,
+        validationFunction = validateAnswer,  ///
+        options = {
+        answer,
+          description,
+          errorMessage,
+          validationFunction
+        };
+
+  prompt(options, (answer) => {
+    const valid = (answer !== null);
 
-  proceed();
+    if (valid) {
+      const affirmative = isAnswerAffirmative(answer);
+
+      if (affirmative) {
+        removeEntry(entryPath);
+
+        unpackRelease(release);
+      }
+
+      next();
+    }
+  });
 }
 
-module.exports = unpackReleasesOperation;
+function unpackRelease(release) {
+  const { name } = release,
+        filePath = name,  ///
+        releaseJSON = release,  ///
+        releaseJSONString = JSON.stringify(releaseJSON),
+        content = releaseJSONString; ///
+
+  writeFile(filePath, content);
+}

package/bin/options.js

@@ -1,12 +1,14 @@
 "use strict";
 
-const HELP_OPTION = "help",
+const YES_OPTION = "yes",
+      HELP_OPTION = "help",
       VERSION_OPTION = "version",
       QUIETLY_OPTION = "quietly",
       DRY_RUN_OPTION = "dry-run",
       LOG_LEVEL_OPTION = "log-level";
 
 module.exports = {
+  YES_OPTION,
   HELP_OPTION,
   VERSION_OPTION,
   QUIETLY_OPTION,

package/bin/utilities/validate.js

@@ -1,5 +1,6 @@
 "use strict";
 
+function validateAnswer(answer) { return  /^(:?yes|no|y|n)$/i.test(answer); }
 
 function validateUsername(username) { return /^[a-z0-9]{2,16}(?:-[a-z0-9]{2,16}){0,4}$/.test(username); }
 
@@ -32,6 +33,7 @@ function validateEmailAddressOrUsername(emailAddressOrUsername) {
 }
 
 module.exports = {
+  validateAnswer,
   validateUsername,
   validatePassword,
   validateAffirmation,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-open-cli",
   "author": "James Smith",
-  "version": "5.0.122",
+  "version": "5.0.124",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-open-cli",
   "description": "Occam's command line package management tool.",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "argumentative": "^2.0.21",
-    "necessary": "^11.1.4",
+    "necessary": "^11.2.0",
     "occam-file-system": "^5.0.83"
   },
   "scripts": {},