propagate-cli 1.9.50 → 1.9.52

package/README.md

@@ -82,11 +82,7 @@ If you would like to contribute or would simply like to have a look at the code,
 Propagate has the following commands and options:
 
 ```
-  propagate [<options>]                    Propagate the current package
-
-  propagate [<options>] <sub-directory>    Propagate a package in the given sub-directory
-
-  propagate [<command>] [<options>]
+  propagate [<options>] [<command>] [<argument>]
 
 Commands:
 

package/bin/action/help.js

@@ -3,11 +3,7 @@
 function helpAction() {
   console.log(`Usage: 
   
-  propagate [<options>]                    Propagate the current package
-
-  propagate [<options>] <sub-directory>    Propagate a package in the given sub-directory
-
-  propagate [<command>] [<options>]
+  propagate [<options>] [<command>] [<argument>]
 
 Commands:
 

package/bin/configuration.js

@@ -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 = {
   retrieveDirectories,
   retrieveShellCommands,
@@ -108,7 +120,8 @@ module.exports = {
   updateForcedDependencyRelations,
   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(1);
-  }
-}

package/bin/configure.js

@@ -2,23 +2,39 @@
 
 const { pathUtilities } = require("necessary");
 
-const { TWO_DOTS } = require("./constants"),
-      { PROPAGATE_COMMAND } = require("./commands"),
+const { DOUBLE_DOTS } = require("./constants"),
       { DEFAULT_HELP, DEFAULT_VERSION } = require("./defaults"),
-      { checkConfigurationFileExists, migrateConfigurationFile } = require("./configuration");
+      { HELP_COMMAND, VERSION_COMMAND, PROPAGATE_COMMAND } = require("./commands"),
+      { migrateConfigurationFile, checkConfigurationFileExists } = require("./configuration");
 
 const { bottommostNameFromPath } = pathUtilities;
 
 function configure(command, argument, options, main) {
-  let configurationFileExists = checkConfigurationFileExists();
+  let configurationFileExists;
 
-  if (!configurationFileExists) {
-    const { help = DEFAULT_HELP, version = DEFAULT_VERSION } = options;
+  const { help = DEFAULT_HELP, version = DEFAULT_VERSION } = options;
 
-    if ((help === false) && (version === false) && (command === null)) {
+  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 === null) {
+    if (!configurationFileExists) {
       const currentWorkingDirectoryPath = process.cwd(); ///
 
-      process.chdir(TWO_DOTS);
+      process.chdir(DOUBLE_DOTS);
 
       const oldCurrentWorkingDirectoryPath = currentWorkingDirectoryPath; ///
 
@@ -27,16 +43,14 @@ function configure(command, argument, options, main) {
       if (configurationFileExists) {
         const bottommostOldCurrentWorkingDirectoryName = bottommostNameFromPath(oldCurrentWorkingDirectoryPath);
 
-        command = PROPAGATE_COMMAND;  ///
-
         argument = bottommostOldCurrentWorkingDirectoryName; ///
+
+        command = PROPAGATE_COMMAND;  ///
       }
     }
   }
 
-  if (configurationFileExists) {
-    migrateConfigurationFile();
-  }
+  migrateConfigurationFile();
 
   main(command, argument, options);
 }

package/bin/constants.js

@@ -3,6 +3,7 @@
 const YES = "yes",
       TWO_DOTS = "..",
       PROPAGATE = "propagate",
+      DOUBLE_DOTS = "..",
       EMPTY_STRING = "",
       PACKAGE_JSON = "package.json",
       DEPENDENCIES = "dependencies",
@@ -13,6 +14,7 @@ module.exports = {
   YES,
   TWO_DOTS,
   PROPAGATE,
+  DOUBLE_DOTS,
   EMPTY_STRING,
   PACKAGE_JSON,
   DEPENDENCIES,

package/bin/main.js

@@ -15,7 +15,8 @@ const helpAction = require("./action/help"),
       listForcedDependencyRelationsAction = require("./action/listForcedDependencyRelations"),
       removeForcedDependencyRelationAction = require("./action/removeForcedDependencyRelation");
 
-const { DEFAULT_YES, DEFAULT_QUIETLY, DEFAULT_DRY_RUN, DEFAULT_HELP, DEFAULT_VERSION} = require("./defaults"),
+const { NO_COMMAND_GIVEN_MESSAGE } = require("./messages"),
+      { DEFAULT_YES, DEFAULT_QUIETLY, DEFAULT_DRY_RUN } = require("./defaults"),
       { HELP_COMMAND,
         VERSION_COMMAND,
         PROPAGATE_COMMAND,
@@ -32,24 +33,19 @@ const { DEFAULT_YES, DEFAULT_QUIETLY, DEFAULT_DRY_RUN, DEFAULT_HELP, DEFAULT_VER
         REMOVE_FORCED_DEPENDENCY_RELATION_COMMAND } = require("./commands");
 
 function main(command, argument, options) {
-  const commandMissing = (command === null),
-        { yes = DEFAULT_YES,
-          help = DEFAULT_HELP,
+  const { yes = DEFAULT_YES,
           dryRun = DEFAULT_DRY_RUN,
-          version = DEFAULT_VERSION,
           quietly = DEFAULT_QUIETLY } = 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();
 
@@ -134,11 +130,13 @@ function main(command, argument, options) {
       break;
     }
 
-
-    default:
+    default: {
       argument = command; ///
 
       propagateAction(argument, quietly, dryRun, yes);
+
+      break;
+    }
   }
 }
 

package/bin/messages.js

@@ -35,6 +35,7 @@ const INVALID_ANSWER_MESSAGE = "You must answer (y)es or (n)o.",
       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.",
       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.",
@@ -80,6 +81,7 @@ module.exports = {
   NO_IGNORED_DEPENDENCIES_MESSAGE,
   NO_SUB_DIRECTORY_SPECIFIED_MESSAGE,
   NO_FORCED_DEPENDENCY_RELATIONS_MESSAGE,
+  NO_COMMAND_GIVEN_MESSAGE,
   RELEASE_NOT_PUBLISHABLE_MESSAGE,
   DIRECTORIES_INCLUDES_DIRECTORY_MESSAGE,
   CONFIGURATION_FILE_DOES_NOT_EXIST_MESSAGE,

package/package.json

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