@modernpoacher/deps 1.6.24 → 1.6.26

package/bin/deps.sh

@@ -4,7 +4,12 @@
 
 export PATH=/usr/local/bin:$PATH
 
-eval `ssh-agent`
+# eval `ssh-agent`
+
+if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ] ; then
+  eval $(ssh-agent -s)
+  trap "ssh-agent -k" exit
+fi
 
 EXP="[-0-9a-zA-Z]*$"
 

package/bin/execute/app.js

@@ -35,6 +35,7 @@ const {
 
 const {
   REGISTRY,
+  getIgnore,
   getAuthor
 } = require('@modernpoacher/deps/common')
 
@@ -77,6 +78,18 @@ function handleCommandError (e) {
   }
 }
 
+async function getIgnoreFromConfiguration (path) {
+  log('getIgnoreFromConfiguration')
+
+  const CONFIGURATION = await hasConfiguration(path)
+    ? await getConfiguration(path)
+    : {}
+
+  return (
+    getIgnore(CONFIGURATION)
+  )
+}
+
 async function getAuthorFromConfiguration (path) {
   log('getAuthorFromConfiguration')
 
@@ -142,7 +155,10 @@ async function iterate ([directory, ...directories] = [], registry, force, messa
       log({ path })
 
       if (path === await gitRevParse(path)) {
-        await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
+        const ignore = await getIgnoreFromConfiguration(path)
+        if (!ignore) {
+          await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
+        }
       }
     } catch (e) {
       handleCommandError(e)
@@ -183,9 +199,12 @@ async function executeFrom (directory, registry, force, message, author) {
     log({ path })
 
     if (path === await gitRevParse(path)) {
-      return (
-        await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
-      )
+      const ignore = await getIgnoreFromConfiguration(path)
+      if (!ignore) {
+        return (
+          await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
+        )
+      }
     }
   } catch (e) {
     handleCommandError(e)
@@ -201,9 +220,12 @@ async function executeOnly (directory, registry, force, message, author) {
     log({ path })
 
     if (path === await gitRevParse(path)) {
-      return (
-        await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
-      )
+      const ignore = await getIgnoreFromConfiguration(path)
+      if (!ignore) {
+        return (
+          await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
+        )
+      }
     }
   } catch (e) {
     handleCommandError(e)
@@ -219,9 +241,12 @@ async function executePath (directory, registry, force, message, author) {
     log({ path })
 
     if (path === await gitRevParse(path)) {
-      return (
-        await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
-      )
+      const ignore = await getIgnoreFromConfiguration(path)
+      if (!ignore) {
+        return (
+          await execute(path, registry, force, message, author || await getAuthorFromConfiguration(path))
+        )
+      }
     }
   } catch (e) {
     handleCommandError(e)

package/bin/get-default-branch.sh

@@ -2,7 +2,12 @@
 
 export PATH=/usr/local/bin:$PATH
 
-eval `ssh-agent`
+# eval `ssh-agent`
+
+if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ] ; then
+  eval $(ssh-agent -s)
+  trap "ssh-agent -k" exit
+fi
 
 EXP="[-0-9a-zA-Z]*$"
 

package/bin/head.sh

@@ -2,7 +2,12 @@
 
 export PATH=/usr/local/bin:$PATH
 
-eval `ssh-agent`
+# eval `ssh-agent`
+
+if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ] ; then
+  eval $(ssh-agent -s)
+  trap "ssh-agent -k" exit
+fi
 
 EXP="[-0-9a-zA-Z]*$"
 

package/bin/push.sh

@@ -2,7 +2,12 @@
 
 export PATH=/usr/local/bin:$PATH
 
-eval `ssh-agent`
+# eval `ssh-agent`
+
+if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ] ; then
+  eval $(ssh-agent -s)
+  trap "ssh-agent -k" exit
+fi
 
 EXP="[-0-9a-zA-Z]*$"
 

package/bin/wipe.sh

@@ -2,7 +2,12 @@
 
 export PATH=/usr/local/bin:$PATH
 
-eval `ssh-agent`
+# eval `ssh-agent`
+
+if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ] ; then
+  eval $(ssh-agent -s)
+  trap "ssh-agent -k" exit
+fi
 
 EXP="[-0-9a-zA-Z]*$"
 

package/lib/common/index.js

@@ -1,5 +1,5 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.getCommands=exports.getBundleDependencies=exports.getAuthor=exports.REGISTRY=exports.NVM=exports.DIRECTORY=exports.AUTHOR=void 0;exports.getDeps=getDeps;exports.getDepsExact=getDepsExact;exports.isPreRelease=exports.isExact=exports.getSaveProdParameter=exports.getSaveOptionalParameter=exports.getSaveExactParameter=exports.getSaveDevParameter=exports.getSaveBundleParameter=exports.getRegistryParameter=exports.getProdDependencies=exports.getPeerDependencies=exports.getOptionalDependencies=exports.getNoSaveParameter=exports.getForceParameter=exports.getDevDependencies=void 0;exports.normalizeCommands=normalizeCommands;exports.transform=transform;exports.transformDependency=void 0;var _debug=_interopRequireDefault(require("debug"));var _path=require("path");var _env=require("./env");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const{path:MODULE_PATH}=module;const DIRECTORY='.';exports.DIRECTORY=DIRECTORY;const REGISTRY='https://registry.npmjs.org';exports.REGISTRY=REGISTRY;const AUTHOR='Modern Poacher Limited <modernpoacher@modernpoacher.com>';exports.AUTHOR=AUTHOR;const NVM=(0,_path.resolve)(MODULE_PATH,'../../nvm.sh');exports.NVM=NVM;const log=(0,_debug.default)('@modernpoacher/deps');log(`\`common\` (${_env.PLATFORM}) is awake`);const tidy=v=>v.replace(/\n\n/gm,String.fromCharCode(10)).trim();const getSaveProdParameter=commands=>commands.concat(' --save-prod');exports.getSaveProdParameter=getSaveProdParameter;const getSaveDevParameter=commands=>commands.concat(' --save-dev');exports.getSaveDevParameter=getSaveDevParameter;const getSaveBundleParameter=commands=>commands.concat(' --save-bundle');exports.getSaveBundleParameter=getSaveBundleParameter;const getSaveOptionalParameter=commands=>commands.concat(' --save-optional');exports.getSaveOptionalParameter=getSaveOptionalParameter;const getRegistryParameter=(r,commands)=>r?commands.concat(` --registry ${r}`):commands;exports.getRegistryParameter=getRegistryParameter;const getForceParameter=(f,commands)=>f?commands.concat(' --force'):commands;exports.getForceParameter=getForceParameter;const getNoSaveParameter=(s,commands)=>s?commands:commands.concat(' --no-save');exports.getNoSaveParameter=getNoSaveParameter;const getSaveExactParameter=commands=>commands.concat(' --save-exact');exports.getSaveExactParameter=getSaveExactParameter;const getCommands=_env.PLATFORM==='win32'?(directory=DIRECTORY,commands='npm i')=>tidy(commands):(directory=DIRECTORY,commands='npm i')=>tidy(`
+"use strict";Object.defineProperty(exports,"__esModule",{value:true});exports.getCommands=exports.getBundleDependencies=exports.getAuthor=exports.REGISTRY=exports.NVM=exports.DIRECTORY=exports.AUTHOR=void 0;exports.getDeps=getDeps;exports.getDepsExact=getDepsExact;exports.isPreRelease=exports.isExact=exports.getSaveProdParameter=exports.getSaveOptionalParameter=exports.getSaveExactParameter=exports.getSaveDevParameter=exports.getSaveBundleParameter=exports.getRegistryParameter=exports.getProdDependencies=exports.getPeerDependencies=exports.getOptionalDependencies=exports.getNoSaveParameter=exports.getIgnore=exports.getForceParameter=exports.getDevDependencies=void 0;exports.normalizeCommands=normalizeCommands;exports.transform=transform;exports.transformDependency=void 0;var _debug=_interopRequireDefault(require("debug"));var _path=require("path");var _env=require("./env");function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}const{path:MODULE_PATH}=module;const DIRECTORY='.';exports.DIRECTORY=DIRECTORY;const REGISTRY='https://registry.npmjs.org';exports.REGISTRY=REGISTRY;const AUTHOR='Modern Poacher Limited <modernpoacher@modernpoacher.com>';exports.AUTHOR=AUTHOR;const NVM=(0,_path.resolve)(MODULE_PATH,'../../nvm.sh');exports.NVM=NVM;const log=(0,_debug.default)('@modernpoacher/deps');log(`\`common\` (${_env.PLATFORM}) is awake`);const tidy=v=>v.replace(/\n\n/gm,String.fromCharCode(10)).trim();const getSaveProdParameter=commands=>commands.concat(' --save-prod');exports.getSaveProdParameter=getSaveProdParameter;const getSaveDevParameter=commands=>commands.concat(' --save-dev');exports.getSaveDevParameter=getSaveDevParameter;const getSaveBundleParameter=commands=>commands.concat(' --save-bundle');exports.getSaveBundleParameter=getSaveBundleParameter;const getSaveOptionalParameter=commands=>commands.concat(' --save-optional');exports.getSaveOptionalParameter=getSaveOptionalParameter;const getRegistryParameter=(r,commands)=>r?commands.concat(` --registry ${r}`):commands;exports.getRegistryParameter=getRegistryParameter;const getForceParameter=(f,commands)=>f?commands.concat(' --force'):commands;exports.getForceParameter=getForceParameter;const getNoSaveParameter=(s,commands)=>s?commands:commands.concat(' --no-save');exports.getNoSaveParameter=getNoSaveParameter;const getSaveExactParameter=commands=>commands.concat(' --save-exact');exports.getSaveExactParameter=getSaveExactParameter;const getCommands=_env.PLATFORM==='win32'?(directory=DIRECTORY,commands='npm i')=>tidy(commands):(directory=DIRECTORY,commands='npm i')=>tidy(`
 export PATH=/usr/local/bin:$PATH &> /dev/null
 . "${NVM}" 2> /dev/null
 ${commands}
-`);exports.getCommands=getCommands;const getProdDependencies=({dependencies={}}={})=>dependencies;exports.getProdDependencies=getProdDependencies;const getDevDependencies=({devDependencies={}}={})=>devDependencies;exports.getDevDependencies=getDevDependencies;const getOptionalDependencies=({optionalDependencies={}}={})=>optionalDependencies;exports.getOptionalDependencies=getOptionalDependencies;const getBundleDependencies=({bundleDependencies=[]}={})=>bundleDependencies;exports.getBundleDependencies=getBundleDependencies;const getPeerDependencies=({peerDependencies}={})=>peerDependencies;exports.getPeerDependencies=getPeerDependencies;const getAuthor=({author}={})=>author;exports.getAuthor=getAuthor;const isPreRelease=v=>/-/.test(v);exports.isPreRelease=isPreRelease;const isExact=v=>/^\d/.test(v);exports.isExact=isExact;function getDepsExact(values,configuration){log('getDepsExact');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator.concat({name,version:Reflect.has(configuration,name)?Reflect.get(configuration,name):version}):accumulator,[]);}function getDeps(values){log('getDeps');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator:isPreRelease(version)?accumulator.concat({name,version}):accumulator.concat({name,version:'latest'}),[]);}function normalizeCommands(value){while(/\s\s|\n/.test(value)){value=value.replace(/\s\s/gm,String.fromCharCode(32)).replace(/\n/gm,String.fromCharCode(32));}return value.trim();}const transformDependency=({name='@modernpoacher/deps',version='latest'}={})=>`${name}@${version}`;exports.transformDependency=transformDependency;function transform(value){log('transform');return Array.isArray(value)?value.map(transformDependency).join(String.fromCharCode(32)).trim():transformDependency(value);}
+`);exports.getCommands=getCommands;const getProdDependencies=({dependencies={}}={})=>dependencies;exports.getProdDependencies=getProdDependencies;const getDevDependencies=({devDependencies={}}={})=>devDependencies;exports.getDevDependencies=getDevDependencies;const getOptionalDependencies=({optionalDependencies={}}={})=>optionalDependencies;exports.getOptionalDependencies=getOptionalDependencies;const getBundleDependencies=({bundleDependencies=[]}={})=>bundleDependencies;exports.getBundleDependencies=getBundleDependencies;const getPeerDependencies=({peerDependencies}={})=>peerDependencies;exports.getPeerDependencies=getPeerDependencies;const getIgnore=({ignore=false}={})=>ignore===true;exports.getIgnore=getIgnore;const getAuthor=({author}={})=>String(author);exports.getAuthor=getAuthor;const isPreRelease=v=>/-/.test(v);exports.isPreRelease=isPreRelease;const isExact=v=>/^\d/.test(v);exports.isExact=isExact;function getDepsExact(values,configuration){log('getDepsExact');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator.concat({name,version:Reflect.has(configuration,name)?Reflect.get(configuration,name):version}):accumulator,[]);}function getDeps(values){log('getDeps');return Object.entries(values).reduce((accumulator,[name,version])=>isExact(version)?accumulator:isPreRelease(version)?accumulator.concat({name,version}):accumulator.concat({name,version:'latest'}),[]);}function normalizeCommands(value){while(/\s\s|\n/.test(value)){value=value.replace(/\s\s/gm,String.fromCharCode(32)).replace(/\n/gm,String.fromCharCode(32));}return value.trim();}const transformDependency=({name='@modernpoacher/deps',version='latest'}={})=>`${name}@${version}`;exports.transformDependency=transformDependency;function transform(value){log('transform');return Array.isArray(value)?value.map(transformDependency).join(String.fromCharCode(32)).trim():transformDependency(value);}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "1.6.24",
+  "version": "1.6.26",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",
@@ -50,31 +50,31 @@
     "deps-head": "bin/head.sh"
   },
   "dependencies": {
-    "commander": "^9.2.0",
+    "commander": "^10.0.0",
     "debug": "^4.3.4",
-    "glob-all": "^3.3.0",
+    "glob-all": "^3.3.1",
     "module-alias": "^2.2.2",
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.18.0",
-    "@babel/eslint-parser": "^7.17.0",
-    "@babel/preset-env": "^7.18.0",
-    "@babel/register": "^7.17.7",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "chai": "^4.3.6",
-    "core-js": "^3.22.5",
+    "@babel/cli": "^7.20.7",
+    "@babel/core": "^7.20.12",
+    "@babel/eslint-parser": "^7.19.1",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/register": "^7.18.9",
+    "babel-plugin-module-resolver": "^5.0.0",
+    "chai": "^4.3.7",
+    "core-js": "^3.27.2",
     "cross-env": "^7.0.3",
-    "eslint": "^8.16.0",
+    "eslint": "^8.33.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-import-resolver-babel-module": "^5.3.1",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-import-resolver-babel-module": "^5.3.2",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.0.0",
-    "husky": "^8.0.1",
-    "mocha": "^10.0.0",
-    "rimraf": "^3.0.2"
+    "eslint-plugin-promise": "^6.1.1",
+    "husky": "^8.0.3",
+    "mocha": "^10.2.0",
+    "rimraf": "^4.1.2"
   },
   "_moduleAliases": {
     "@modernpoacher/deps": "./lib",

package/src/common/index.js

@@ -192,6 +192,17 @@ export const getBundleDependencies = ({ bundleDependencies = [] } = {}) => bundl
  */
 export const getPeerDependencies = ({ peerDependencies } = {}) => peerDependencies
 
+/**
+ *  @function getIgnore
+ *
+ *  Get the ignore flag by destructuring the package or configuration
+ *
+ *  @param {Object} package
+ *
+ *  @return {Boolean}
+ */
+export const getIgnore = ({ ignore = false } = {}) => ignore === true
+
 /**
  *  @function getAuthor
  *
@@ -199,9 +210,9 @@ export const getPeerDependencies = ({ peerDependencies } = {}) => peerDependenci
  *
  *  @param {Object} package
  *
- *  @return {Object}
+ *  @return {String}
  */
-export const getAuthor = ({ author } = {}) => author
+export const getAuthor = ({ author } = {}) => String(author)
 
 /**
  *  @function isPreRelease