ump 3.1.0 → 3.2.0

package/lib/commands.js

@@ -1,11 +1,10 @@
 'use strict';
 
 import path from 'path';
-import Promises from 'bluebird';
 import fs from 'fs-extra';
 import {promisify} from 'util';
 import childProcess from 'child_process';
-import {utils} from './utils.js';
+import {utils, peach} from './utils.js';
 import {config} from './config.js';
 import {log} from './log.js';
 
@@ -29,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 pullRebase = 'git pull --rebase --autostash';
+    const pullAutostash = 'git pull --autostash';
 
     return {
-      log: pullRebase,
+      log: pullAutostash,
       cmd: function() {
 
-        return exec(pullRebase)
+        return exec(pullAutostash)
         .then(({stdout, stderr}) => {
           console.log(stdout);
 
@@ -45,6 +44,8 @@ const commands = {
             } else {
               utils.error(config.messages.gitPull);
             }
+          } else {
+            log.color(`Executed ${pullAutostash}`, 'cyan');
           }
         })
         .catch((err) => {
@@ -83,7 +84,7 @@ const commands = {
     return {
       log: `* Update version (using RegEx) to ${newVersion} in ${opts.extraFiles.join(', ')}`,
       cmd: function() {
-        return Promises.each(opts.extras, (item) => {
+        return peach(opts.extras, (item) => {
           const file = item.file || item;
           const prefix = typeof item.prefix !== 'undefined' ? item.prefix : config.defaults.regexPrefix;
           const replace = typeof item.replaced !== 'undefined' ? item.replaced : config.defaults.regexReplace;
@@ -157,20 +158,22 @@ const commands = {
           utils.error(`Git working directory not clean:\n\t${lines.join('\n\t')}`);
         }
 
-        return Promises.each(releaseSteps, (command) => {
+        try {
+          const ret = await peach(releaseSteps, (command) => {
+            return exec(command)
+            .then(() => {
+              log.color(`Executed ${command}`, 'cyan');
+            })
+            .catch(utils.error);
+          });
 
-          return exec(command)
-          .then(() => {
-            log.color(`Executed ${command}`, 'cyan');
-          })
-          .catch(utils.error);
-        })
-        .catch((error) => {
+          return ret;
+        } catch (error) {
           const err = error || config.messages.noRepo;
 
           log.color(err, 'red');
           utils.error(opts);
-        });
+        }
       },
     };
   },

package/lib/utils.js

@@ -1,8 +1,6 @@
 'use strict';
 
 import path from 'path';
-import childProcess from 'child_process';
-import Promises from 'bluebird';
 import fs from 'fs';
 import util from 'util';
 import glob from 'glob';
@@ -231,4 +229,39 @@ const utils = {
   },
 };
 
-export {utils};
+/**
+* @callback ArrayCallback
+* @param {any} item
+* @param {number} [index]
+* @param {array} [array]
+* @returns {Promise}
+*/
+
+/**
+ * "Promised `each()`" for iterating over an array of items, calling a function that returns a promise for each one. So, each one waits for the previous one to resolve before being called
+ * @function peach
+ * @param {array} arr Array to iterate over
+ * @param {ArrayCallback} fn Function that is called for each element in the array, each returning a promise
+ * @returns {Array.<Promise>} Array of promises
+ */
+const peach = (arr, fn) => {
+  const originalArray = [...arr];
+  const funcs = arr.map((item, i) => {
+    return () => fn(item, i, originalArray);
+  });
+
+  // @ts-ignore
+  return funcs.reduce((promise, func) => {
+    return promise
+    .then((result) => {
+      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))
+      .then([].concat.bind(result));
+    });
+
+  }, Promise.resolve([]));
+};
+
+export {utils, peach};

package/package.json

@@ -1,16 +1,14 @@
 {
   "name": "ump",
   "title": "ump",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Bump without the B",
   "scripts": {
     "test": "npm run test:clean && npm run test:pre && npm run test:run",
     "test:clean": "rm -rf ./test/testarea",
     "test:pre": "npm run lint && mkdir -p \"./test/testarea\"",
     "test:run": "node_modules/.bin/mocha --delay --reporter spec",
-    "lint": "eslint --config .eslintrc.cjs *.js bin lib test",
-    "snyk-protect": "snyk protect",
-    "prepare": "npm run snyk-protect"
+    "lint": "eslint --config .eslintrc.cjs *.js bin lib test"
   },
   "repository": {
     "type": "git",
@@ -30,24 +28,22 @@
     "node": ">=14"
   },
   "dependencies": {
-    "bluebird": "^3.7.2",
-    "chalk": "^5.0.0",
-    "fs-extra": "^10.0.0",
+    "chalk": "^5.1.2",
+    "fs-extra": "^10.1.0",
     "git-config": "^0.0.7",
-    "glob": "^7.2.0",
-    "inquirer": "^8.2.0",
+    "glob": "^8.0.3",
+    "inquirer": "^9.1.4",
     "rc": "^1.2.8",
-    "semver": "^7.3.5",
-    "snyk": "^1.812.0",
+    "semver": "^7.3.8",
     "update-notifier": "^6.0.2",
-    "yargs": "^17.3.1"
+    "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "chai": "^4.3.4",
-    "eslint": "^8.5.0",
-    "eslint-config-kswedberg": "^5.1.1",
+    "@types/mocha": "^10.0.0",
+    "chai": "^4.3.7",
+    "eslint": "^8.27.0",
+    "eslint-config-kswedberg": "^5.1.2",
     "mocha": "^9.1.3"
   },
-  "license": "MIT",
-  "snyk": true
+  "license": "MIT"
 }

package/test/test.js

@@ -1,8 +1,8 @@
 import path from 'path';
-import Promises from 'bluebird';
+
 import fs from 'fs-extra';
 import ump from '../ump.js';
-import {utils} from '../lib/utils.js';
+import {utils, peach} from '../lib/utils.js';
 import {commands} from '../lib/commands.js';
 
 import {expect} from 'chai';
@@ -114,7 +114,7 @@ const files = [
 
 const runTests = async() => {
   try {
-    await Promises.each(files, (file) => {
+    await peach(files, (file) => {
       return fs.writeFile(path.join(dirname, 'testarea/', file.file), file.content);
     });
 

package/ump.js

@@ -1,26 +1,25 @@
 'use strict';
 
-import Promises from 'bluebird';
 import inquirer from 'inquirer';
 
-import {utils} from './lib/utils.js';
+import {utils, peach} from './lib/utils.js';
 import {commands} from './lib/commands.js';
 import {log} from './lib/log.js';
 import {config} from './lib/config.js';
 
 const sequence = [];
 
-const runCommands =  function(sequence, options) {
-  return Promises.each(sequence, (command) => {
-    return command.cmd(options);
-  })
-  .then(() => {
+const runCommands =  async function(sequence, options) {
+  try {
+    await peach(sequence, (command) => {
+      return command.cmd(options);
+    });
+
     log.color('*** DONE! ***', 'green');
-  })
-  .catch((err) => {
+  } catch (err) {
     console.error(err);
     utils.resetVersion(options);
-  });
+  }
 };
 
 const ump = async function(options) {

package/.snyk

@@ -1,13 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.22.1
-# ignores vulnerabilities until expiry date; change duration by modifying expiry date
-ignore:
-  SNYK-JS-Y18N-1021887:
-    - snyk > snyk-config > nconf > yargs > y18n:
-        reason: None given
-        expires: '2020-12-31T17:48:39.548Z'
-# patches apply the minimum changes required to fix a vulnerability
-patch:
-  SNYK-JS-LODASH-567746:
-    - inquirer > lodash:
-        patched: '2020-05-01T14:59:08.279Z'