ump 3.2.1 → 3.4.0

package/README.md

@@ -21,12 +21,14 @@ For programmatic use (i.e. requiring it as a module in a node.js script), instal
   * `-m`, `--message`:      Message to be used for the commit and tag when `-r` or `-p` is set. Default: Release %s
   * `-r`, `--release`:      If set, runs `git add` and `git commit` for the bumped files and pushes a tagged release.
   * `-p`, `--publish`:      If set, automatically runs with the `--release` flag and then publishes the release to npm.
+  * `-a`, `--autostash`:    Default: `true`. Whether to use the `--autostash` flag when running `git pull`
+  * `-x`, `--skip-pull`:    If set, skips executing the initial git pull command during a release/publish task. USE WITH CAUTION.
   * `-d`, `--debug`:        If set, ump will run in debug mode, outputting a json file instead of doing something
   * `-h`, `--help`:         Shows help information on the command line
 
 ## Module Usage
 
-The only required option is `files`, which takes an array of files. All other options are the same as the command-line long-hand options: `message, release, publish, debug` (not `help`).
+The only required option is `files`, which takes an array of files. All other options are the same as the command-line *long-hand* options — `message, release, publish, debug` (not `help`). Note: the `skip-pull` option can be written as either kebab case (`skip-pull`) or camel case (`skipPull`).
 
 ```js
 import ump from 'ump';

package/lib/commands.js

@@ -27,14 +27,24 @@ const commands = {
   gitPull: function gitPull(opts) {
     // Need to pull before mucking with files, so we can stop it if git branch isn't clean.
     // Otherwise files will be bumped and committed but not pushed and things will get messed up.
+    // However, if the user is SURE this task can be skipped, the option is available
+
+    if (opts.skipPull) {
+      return {
+        log: '',
+        cmd: function() {
+          log.color('SKIPPED git pull', 'yellow');
+        },
+      };
+    }
     // **We can autostash on pull because we handle existence of uncommitted files later
-    const pullAutostash = 'git pull --autostash';
+    const pull = opts.autostash ? 'git pull --autostash' : 'git pull';
 
     return {
-      log: pullAutostash,
+      log: pull,
       cmd: function() {
 
-        return exec(pullAutostash)
+        return exec(pull)
         .then(({stdout, stderr}) => {
           console.log(stdout);
 
@@ -45,7 +55,7 @@ const commands = {
               utils.error(config.messages.gitPull);
             }
           } else {
-            log.color(`Executed ${pullAutostash}`, 'cyan');
+            log.color(`Executed ${pull}`, 'cyan');
           }
         })
         .catch((err) => {

package/lib/config.js

@@ -16,6 +16,8 @@ const config = {
     regexPrefix: '(?:\\-\\sv|version[\'"]?\\:\\s*[\'"])',
     regexReplace: '(?:[0-9]+\\.){2}[0-9]+[0-9a-zA-Z\\-_\\+\\.]*',
     regexFlags: 'g',
+    autostash: true,
+    skipPull: false,
   },
 
   messages: {
@@ -88,6 +90,18 @@ Object.assign(config, {
       description: 'If set, automatically runs with the `--release` flag and then publishes the release to npm.',
       type: 'boolean',
     },
+    a: {
+      alias: 'autostash',
+      description: 'Whether to use the --autostash flag when running `git pull`',
+      type: 'boolean',
+      default: true,
+    },
+    x: {
+      alias: 'skip-pull',
+      description: 'If set, skips executing the initial git pull command during a release/publish task. USE WITH CAUTION.',
+      type: 'boolean',
+      default: false,
+    },
     d: {
       alias: 'debug',
       description: 'If set, ump will run in debug mode, outputting a json file instead of doing something',

package/lib/utils.js

@@ -209,6 +209,7 @@ const utils = {
     opts.files = utils.getFiles(opts.files);
     opts.extraFiles = utils.getFiles(opts.extras || []);
     opts.sourceFile = opts.files[0];
+    opts.skipPull = opts.skipPull || opts['skip-pull'];
 
     // opts.publish always implies opts.release as well (git push && git push --tags)
     if (opts.publish) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ump",
   "title": "ump",
-  "version": "3.2.1",
+  "version": "3.4.0",
   "description": "Bump without the B",
   "scripts": {
     "test": "npm run test:clean && npm run test:pre && npm run test:run",

package/ump.js

@@ -44,7 +44,9 @@ const ump = async function(options) {
 
   if (opts.release) {
     // opts.dirty = commands.commitDirty(opts);
+
     // gitPull needs to happen first, so we don't update files when we can't complete things
+    // The skipPull option is available if we are SURE we don't need to pull
     sequence.unshift(commands.gitPull(opts));
     sequence.push(commands.gitRelease(opts));
   }