ump 3.2.0 → 3.3.0

package/lib/commands.js

@@ -28,13 +28,13 @@ const commands = {
     // 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.
     // **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 +45,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,7 @@ const config = {
     regexPrefix: '(?:\\-\\sv|version[\'"]?\\:\\s*[\'"])',
     regexReplace: '(?:[0-9]+\\.){2}[0-9]+[0-9a-zA-Z\\-_\\+\\.]*',
     regexFlags: 'g',
+    autostash: true,
   },
 
   messages: {
@@ -93,6 +94,12 @@ Object.assign(config, {
       description: 'If set, ump will run in debug mode, outputting a json file instead of doing something',
       type: 'boolean',
     },
+    a: {
+      alias: 'autostash',
+      description: 'Whether to use the --autostash flag when running `git pull`',
+      type: 'boolean',
+      default: true,
+    },
     extras: {
       description: 'Array of objects. ONLY AVAILABLE VIA .umprc OR when using ump() AS MODULE. Props: file, prefix (optional regex string), replaced (optional regex string), flags (optional). See https://github.com/kswedberg/ump/blob/master/README.md for more info.',
     },

package/lib/utils.js

@@ -257,7 +257,7 @@ const peach = (arr, fn) => {
       const called = func();
       // If the function doesn't return a "then-able", create one with Promise.resolve():
 
-      return (typeof called.then === 'function' ? called : Promise.resolve(called))
+      return (called && typeof called.then === 'function' ? called : Promise.resolve(called))
       .then([].concat.bind(result));
     });
 

package/package.json

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