propagate-cli 1.9.58 → 1.9.61

package/bin/action/propagate.js

@@ -14,7 +14,7 @@ const dryRunOperation = require("../operation/dryRun"),
 const { executeOperations } = require("../utilities/operation"),
       { FAILED_PROPAGATE_MESSAGE, SUCCESSFUL_PROPAGATE_MESSAGE } = require("../messages");
 
-function propagateAction(argument, quietly, dryRun, yes) {
+function propagateAction(subDirectoryName, quietly, dryRun, yes) {
   const operations = [
           createSubDirectoryPathOperation,
           createSubDirectoryMapOperation,
@@ -28,7 +28,7 @@ function propagateAction(argument, quietly, dryRun, yes) {
           saveAndApplyDiffsOperation
         ],
         context = {
-          argument,
+          subDirectoryName,
           quietly,
           dryRun,
           yes

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

@@ -15,7 +15,7 @@ const helpAction = require("./action/help"),
       listForcedDependencyRelationsAction = require("./action/listForcedDependencyRelations"),
       removeForcedDependencyRelationAction = require("./action/removeForcedDependencyRelation");
 
-const { NO_COMMAND_GIVEN_MESSAGE } = require("./messages"),
+const { NO_ARGUMENT_GIVEN_MESSAGE, COMMAND_NOT_RECOGNISED_MESSAGE } = require("./messages"),
       { DEFAULT_YES, DEFAULT_QUIETLY, DEFAULT_DRY_RUN } = require("./defaults"),
       { HELP_COMMAND,
         VERSION_COMMAND,
@@ -38,12 +38,6 @@ function main(command, argument, options) {
           quietly = DEFAULT_QUIETLY } = options;
 
   switch (command) {
-    case null: {
-      console.log(NO_COMMAND_GIVEN_MESSAGE);
-
-      break;
-    }
-
     case HELP_COMMAND: {
       helpAction();
 
@@ -56,14 +50,20 @@ function main(command, argument, options) {
       break;
     }
 
-    case PROPAGATE_COMMAND: {
-      propagateAction(argument, quietly, dryRun, yes);
+    case INITIALISE_COMMAND: {
+      initialiseAction();
 
       break;
     }
 
-    case INITIALISE_COMMAND: {
-      initialiseAction();
+    case PROPAGATE_COMMAND: {
+      if (argument === null) {
+        console.log(NO_ARGUMENT_GIVEN_MESSAGE);
+      } else {
+        const subDirectoryName = argument;  ///
+
+        propagateAction(subDirectoryName, quietly, dryRun, yes);
+      }
 
       break;
     }
@@ -129,9 +129,7 @@ function main(command, argument, options) {
     }
 
     default: {
-      argument = command; ///
-
-      propagateAction(argument, quietly, dryRun, yes);
+      console.log(COMMAND_NOT_RECOGNISED_MESSAGE);
 
       break;
     }

package/bin/messages.js

@@ -1,6 +1,10 @@
 "use strict";
 
-const INVALID_ANSWER_MESSAGE = "You must answer (y)es or (n)o.",
+const NO_RELEASE_MESSAGE = "Either the sub-directory is missing or it does not contain a package.json file.",
+      NO_ARGUMENT_GIVEN_MESSAGE = "No argument has been given.",
+      NO_IGNORED_DEPENDENCIES_MESSAGE = "There are no ignored dependencies.",
+      NO_FORCED_DEPENDENCY_RELATIONS_MESSAGE = "There are no forced dependency relations.",
+      INVALID_ANSWER_MESSAGE = "You must answer (y)es or (n)o.",
       INVALID_DIRECTORY_PATH_MESSAGE = "The directory path should be a relative path, starting with a period or more likely a double period.",
       INVALID_DIRECTORY_NUMBER_MESSAGE = "The directory number should match one of the numbers given above.",
       INVALID_FORCED_DEPENDENT_NAME_MESSAGE = "The dependent name must be non-empty.",
@@ -31,11 +35,7 @@ const INVALID_ANSWER_MESSAGE = "You must answer (y)es or (n)o.",
       SUCCESSFUL_REMOVE_IGNORED_DEPENDENCY_MESSAGE = "The ignored dependency was added successfully.",
       SUCCESSFUL_ADD_FORCED_DEPENDENCY_RELATION_MESSAGE = "The forced dependency relation was added successfully.",
       SUCCESSFUL_REMOVE_FORCED_DEPENDENCY_RELATION_MESSAGE = "The forced dependency relation was added successfully.",
-      NO_RELEASE_MESSAGE = "Either the sub-directory is missing or it does not contain a package.json file.",
-      NO_IGNORED_DEPENDENCIES_MESSAGE = "There are no ignored dependencies.",
-      NO_SUB_DIRECTORY_SPECIFIED_MESSAGE = "No sub-directory has been specified.",
-      NO_FORCED_DEPENDENCY_RELATIONS_MESSAGE = "There are no forced dependency relations.",
-      NO_COMMAND_GIVEN_MESSAGE = "No command has been given.",
+      COMMAND_NOT_RECOGNISED_MESSAGE = "The command is not recognised.",
       RELEASE_NOT_PUBLISHABLE_MESSAGE = "The package.json file must contain both name and version fields in order to be publishable.",
       DIRECTORIES_INCLUDES_DIRECTORY_MESSAGE = "The directory has already been added.",
       CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE = "The action cannot be performed because the configuration file is missing. Run 'propagate initialise' to create one.",
@@ -46,6 +46,10 @@ const INVALID_ANSWER_MESSAGE = "You must answer (y)es or (n)o.",
       FORCED_DEPENDENCY_RELATIONS_INCLUDE_FORCED_DEPENDENCY_RELATION_MESSAGE = "The forced dependency relation has already been added.";
 
 module.exports = {
+  NO_RELEASE_MESSAGE,
+  NO_ARGUMENT_GIVEN_MESSAGE,
+  NO_IGNORED_DEPENDENCIES_MESSAGE,
+  NO_FORCED_DEPENDENCY_RELATIONS_MESSAGE,
   INVALID_ANSWER_MESSAGE,
   INVALID_DIRECTORY_PATH_MESSAGE,
   INVALID_DIRECTORY_NUMBER_MESSAGE,
@@ -77,11 +81,7 @@ module.exports = {
   SUCCESSFUL_REMOVE_IGNORED_DEPENDENCY_MESSAGE,
   SUCCESSFUL_ADD_FORCED_DEPENDENCY_RELATION_MESSAGE,
   SUCCESSFUL_REMOVE_FORCED_DEPENDENCY_RELATION_MESSAGE,
-  NO_RELEASE_MESSAGE,
-  NO_IGNORED_DEPENDENCIES_MESSAGE,
-  NO_SUB_DIRECTORY_SPECIFIED_MESSAGE,
-  NO_FORCED_DEPENDENCY_RELATIONS_MESSAGE,
-  NO_COMMAND_GIVEN_MESSAGE,
+  COMMAND_NOT_RECOGNISED_MESSAGE,
   RELEASE_NOT_PUBLISHABLE_MESSAGE,
   DIRECTORIES_INCLUDES_DIRECTORY_MESSAGE,
   CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE,

package/bin/operation/createSubDirectoryPath.js

@@ -4,22 +4,12 @@ const { pathUtilities } = require("necessary");
 
 const { DEFAULT_DIRECTORY_NAME } = require("../defaults"),
       { retrieveIgnoredDependencies } = require("../configuration"),
-      { NO_SUB_DIRECTORY_SPECIFIED_MESSAGE, IGNORED_DEPENDENCIES_INCLUDE_SUB_DIRECTORY_MESSAGE } = require("../messages");
+      { IGNORED_DEPENDENCIES_INCLUDE_SUB_DIRECTORY_MESSAGE } = require("../messages");
 
 const { concatenatePaths } = pathUtilities;
 
 function createSubDirectoryPathOperation(proceed, abort, context) {
-  const { argument } = context;
-
-  if (argument === null) {
-    console.log(NO_SUB_DIRECTORY_SPECIFIED_MESSAGE);
-
-    abort();
-
-    return;
-  }
-
-  const subDirectoryName = argument,  ////
+  const { subDirectoryName } = context,
         ignoredDependencies = retrieveIgnoredDependencies(),
         ignoredDependenciesIncludesSubDirectoryName = ignoredDependencies.includes(subDirectoryName);
 

package/bin/prepare.js

@@ -0,0 +1,72 @@
+"use strict";
+
+const changeDirectory = require("./changeDirectory");
+
+const { DEFAULT_HELP, DEFAULT_VERSION } = require("./defaults"),
+      { HELP_COMMAND,
+        VERSION_COMMAND,
+        PROPAGATE_COMMAND,
+        INITIALISE_COMMAND,
+        ADD_DIRECTORY_COMMAND,
+        REMOVE_DIRECTORY_COMMAND,
+        LIST_DIRECTORIES_COMMAND,
+        SET_SHELL_COMMANDS_COMMAND,
+        ADD_IGNORED_DEPENDENCY_COMMAND,
+        LIST_IGNORED_DEPENDENCIES_COMMAND,
+        REMOVE_IGNORED_DEPENDENCY_COMMAND,
+        ADD_FORCED_DEPENDENCY_RELATION_COMMAND,
+        LIST_FORCED_DEPENDENCY_RELATIONS_COMMAND,
+        REMOVE_FORCED_DEPENDENCY_RELATION_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) {
+    if ((command !== ADD_DIRECTORY_COMMAND) &&
+        (command !== REMOVE_DIRECTORY_COMMAND) &&
+        (command !== LIST_DIRECTORIES_COMMAND) &&
+        (command !== SET_SHELL_COMMANDS_COMMAND) &&
+        (command !== ADD_IGNORED_DEPENDENCY_COMMAND) &&
+        (command !== LIST_IGNORED_DEPENDENCIES_COMMAND) &&
+        (command !== REMOVE_IGNORED_DEPENDENCY_COMMAND) &&
+        (command !== ADD_FORCED_DEPENDENCY_RELATION_COMMAND) &&
+        (command !== LIST_FORCED_DEPENDENCY_RELATIONS_COMMAND) &&
+        (command !== REMOVE_FORCED_DEPENDENCY_RELATION_COMMAND)) {
+
+      argument = command; ///
+
+      command = PROPAGATE_COMMAND;
+    }
+  }
+
+  if (command === null) {
+    command = PROPAGATE_COMMAND;
+  }
+
+  main(command, argument, options);
+}
+
+module.exports = prepare;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "propagate-cli",
   "author": "James Smith",
-  "version": "1.9.58",
+  "version": "1.9.61",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/propagate-cli",
   "description": "Propagate updated packages throughout a project.",

package/propagate.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 { first, second } = arrayUtilities;
@@ -15,4 +15,4 @@ const { commands, options } = parseArgv(process.argv, abbreviations),
       command = firstCommand || null, ///
       argument = secondCommand || null; ///
 
-configure(command, argument, options, main);
+prepare(command, argument, options, main);

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, PROPAGATE_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 = PROPAGATE_COMMAND;
-    }
-
-    argument = directoryName; ///
-  }
-
-  if (argument === null) {
-    argument = command; ///
-
-    command = PROPAGATE_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;
-}