@modernpoacher/deps 2.0.19 → 2.0.21

package/bin/deps.sh

@@ -79,21 +79,49 @@ HOME=$PWD
 echo
 echo -e "\033[0;32mStarting ...\033[0m" # "Starting ..."
 
-for i in "$@"
+for flag in "$@";
 do
-  case $i in
-    path=*|-p=*|--path=*)
-    path="${i#*=}"
-    ;;
-    from=*|-f=*|--from=*)
-    from="${i#*=}"
-    ;;
-    only=*|-o=*|--only=*)
-    only="${i#*=}"
-    ;;
+  shift
+  case "$flag" in
+    --path=*|-p=*)
+      set -- "$@" '-p' "${flag#*=}"
+      ;;
+    --path|-p)
+      set -- "$@" '-p' "${1}"
+      ;;
+    --from=*|-f=*)
+      set -- "$@" '-f' "${flag#*=}"
+      ;;
+    --from|-f)
+      set -- "$@" '-f' "${1}"
+      ;;
+    --only=*|-o=*)
+      set -- "$@" '-o' "${flag#*=}"
+      ;;
+    --only|-o)
+      set -- "$@" '-o' "${1}"
+      ;;
     *)
-    # unknown option
-    ;;
+      set -- "$@" "$flag"
+      ;;
+  esac
+done
+
+while getopts "p:f:o:" flag;
+do
+  case "${flag}" in
+    p)
+      path="$OPTARG"
+      ;;
+    f)
+      from="$OPTARG"
+      ;;
+    o)
+      only="$OPTARG"
+      ;;
+    *)
+      # Ignoring "$flag"
+      ;;
   esac
 done
 
@@ -105,7 +133,7 @@ then
     then
       cd "$d"
 
-      execute "$d"
+      execute "$PWD"
 
       cd ..
     fi
@@ -115,17 +143,22 @@ else
   then
     cd "$path"
 
-    for d in *
-    do
-      if [ -d "$d" ]
-      then
-        cd "$d"
+    if [ -d "$PWD/.git" ];
+    then
+      execute "$PWD"
+    else
+      for d in *
+      do
+        if [ -d "$d" ]
+        then
+          cd "$d"
 
-        execute "$d"
+          execute "$PWD"
 
-        cd ..
-      fi
-    done
+          cd ..
+        fi
+      done
+    fi
 
     cd "$HOME"
   else
@@ -141,7 +174,7 @@ else
           then
             cd "$d"
 
-            execute "$d"
+            execute "$PWD"
 
             cd ..
           fi
@@ -158,7 +191,7 @@ else
             then
               cd "$d"
 
-              execute "$d"
+              execute "$PWD"
 
               cd ..
             fi

package/bin/execute/app.mjs

@@ -33,7 +33,8 @@ import {
 import {
   REGISTRY,
   getIgnore,
-  getAuthor
+  getAuthor,
+  getMessage
 } from '#deps/src/common'
 
 import {
@@ -143,6 +144,28 @@ async function getAuthorFromPackage (directory) {
   )
 }
 
+/**
+ * @function getMessageFromConfiguration
+ *
+ * Interrogates `.depsrc` or `.depsrc.json` for a `message` value
+ *
+ * @param {string} directory
+ * @returns {Promise<string|null>}
+ */
+async function getMessageFromConfiguration (directory) {
+  log('getMessageFromConfiguration')
+
+  const CONFIGURATION = (
+    await hasConfiguration(directory)
+      ? await getConfiguration(directory)
+      : {}
+  )
+
+  return (
+    getMessage(CONFIGURATION)
+  )
+}
+
 /**
  * @function toAuthor
  *
@@ -159,6 +182,22 @@ async function toAuthor (author, directory) {
   return author || await getAuthorFromConfiguration(directory) || await getAuthorFromPackage(directory) || AUTHOR
 }
 
+/**
+ * @function toMessage
+ *
+ * Ensures that the `message` is set either from the command line,
+ * configuration, or a default
+ *
+ * Since it can be null `message` may not default in function arguments
+ *
+ * @param {string|null} message
+ * @param {string} directory
+ * @returns {Promise<string>}
+ */
+async function toMessage (message, directory) {
+  return message || await getMessageFromConfiguration(directory) || MESSAGE
+}
+
 const filterDeps = (v) => !!v // de-falsy
 
 const reduceDeps = (a, v) => a.includes(v) ? a : a.concat(v) // de-dupe
@@ -216,7 +255,7 @@ async function iterate ([directory, ...directories] = [], registry, force, messa
       if (D === await gitRevParse(D)) {
         const ignore = await getIgnoreFromConfiguration(D)
         if (!ignore) {
-          await execute(D, registry, force, message, await toAuthor(author, D))
+          await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
         }
       }
     } catch (e) {
@@ -259,7 +298,7 @@ async function executeFrom (directory, registry, force, message, author) {
       const ignore = await getIgnoreFromConfiguration(D)
       if (!ignore) {
         return (
-          await execute(D, registry, force, message, await toAuthor(author, D))
+          await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
         )
       }
     }
@@ -278,7 +317,7 @@ async function executeOnly (directory, registry, force, message, author) {
       const ignore = await getIgnoreFromConfiguration(D)
       if (!ignore) {
         return (
-          await execute(D, registry, force, message, await toAuthor(author, D))
+          await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
         )
       }
     }
@@ -297,7 +336,7 @@ async function executePath (directory, registry, force, message, author) {
       const ignore = await getIgnoreFromConfiguration(D)
       if (!ignore) {
         return (
-          await execute(D, registry, force, message, await toAuthor(author, D))
+          await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
         )
       }
     }

package/bin/head.sh

@@ -76,7 +76,7 @@ function git_remote_set_head {
 }
 
 function execute {
-  report "$1"
+  report "${1##*/}"
 
   has_git "$1"
 
@@ -123,15 +123,31 @@ HOME=$PWD
 echo
 echo -e "\033[0;32mStarting ...\033[0m" # "Starting ..."
 
-for i in "$@"
+for flag in "$@";
 do
-  case $i in
-    path=*|-p=*|--path=*)
-    path="${i#*=}"
-    ;;
+  shift
+  case "$flag" in
+    --path=*|-p=*)
+      set -- "$@" '-p' "${flag#*=}"
+      ;;
+    --path|-p)
+      set -- "$@" '-p' "${1}"
+      ;;
     *)
-    # unknown option
-    ;;
+      set -- "$@" "$flag"
+      ;;
+  esac
+done
+
+while getopts "p:" flag;
+do
+  case "${flag}" in
+    p)
+      path="$OPTARG"
+      ;;
+    *)
+      # Ignoring "$flag"
+      ;;
   esac
 done
 
@@ -143,7 +159,7 @@ then
     then
       cd "$d"
 
-      execute "$d"
+      execute "$PWD"
 
       cd ..
     fi
@@ -153,17 +169,22 @@ else
   then
     cd "$path"
 
-    for d in *
-    do
-      if [ -d "$d" ]
-      then
-        cd "$d"
+    if [ -d "$PWD/.git" ];
+    then
+      execute "$PWD"
+    else
+      for d in *
+      do
+        if [ -d "$d" ]
+        then
+          cd "$d"
 
-        execute "$d"
+          execute "$PWD"
 
-        cd ..
-      fi
-    done
+          cd ..
+        fi
+      done
+    fi
 
     cd "$HOME"
   fi

package/bin/push.sh

@@ -45,7 +45,7 @@ function update {
 }
 
 function execute {
-  report "$1"
+  report "${1##*/}"
 
   checkout_default_branch "$1"
 
@@ -62,15 +62,31 @@ HOME=$PWD
 echo
 echo -e "\033[0;32mStarting ...\033[0m" # "Starting ..."
 
-for i in "$@"
+for flag in "$@";
 do
-  case $i in
-    path=*|-p=*|--path=*)
-    path="${i#*=}"
-    ;;
+  shift
+  case "$flag" in
+    --path=*|-p=*)
+      set -- "$@" '-p' "${flag#*=}"
+      ;;
+    --path|-p)
+      set -- "$@" '-p' "${1}"
+      ;;
     *)
-    # unknown option
-    ;;
+      set -- "$@" "$flag"
+      ;;
+  esac
+done
+
+while getopts "p:" flag;
+do
+  case "${flag}" in
+    p)
+      path="$OPTARG"
+      ;;
+    *)
+      # Ignoring "$flag"
+      ;;
   esac
 done
 
@@ -82,7 +98,7 @@ then
     then
       cd "$d"
 
-      execute "$d"
+      execute "$PWD"
 
       cd ..
     fi
@@ -92,17 +108,22 @@ else
   then
     cd "$path"
 
-    for d in *
-    do
-      if [ -d "$d" ]
-      then
-        cd "$d"
-
-        execute "$d"
-
-        cd ..
-      fi
-    done
+    if [ -d "$PWD/.git" ];
+    then
+      execute "$PWD"
+    else
+      for d in *
+      do
+        if [ -d "$d" ]
+        then
+          cd "$d"
+
+          execute "$PWD"
+
+          cd ..
+        fi
+      done
+    fi
 
     cd "$HOME"
   fi

package/bin/wipe.sh

@@ -46,7 +46,7 @@ function update {
 }
 
 function execute {
-  report "$1"
+  report "${1##*/}"
 
   checkout_default_branch "$1"
 
@@ -63,15 +63,31 @@ HOME=$PWD
 echo
 echo -e "\033[0;32mStarting ...\033[0m" # "Starting ..."
 
-for i in "$@"
+for flag in "$@";
 do
-  case $i in
-    path=*|-p=*|--path=*)
-    path="${i#*=}"
-    ;;
+  shift
+  case "$flag" in
+    --path=*|-p=*)
+      set -- "$@" '-p' "${flag#*=}"
+      ;;
+    --path|-p)
+      set -- "$@" '-p' "${1}"
+      ;;
     *)
-    # unknown option
-    ;;
+      set -- "$@" "$flag"
+      ;;
+  esac
+done
+
+while getopts "p:" flag;
+do
+  case "${flag}" in
+    p)
+      path="$OPTARG"
+      ;;
+    *)
+      # Ignoring "$flag"
+      ;;
   esac
 done
 
@@ -83,7 +99,7 @@ then
     then
       cd "$d"
 
-      execute "$d"
+      execute "$PWD"
 
       cd ..
     fi
@@ -93,17 +109,22 @@ else
   then
     cd "$path"
 
-    for d in *
-    do
-      if [ -d "$d" ]
-      then
-        cd "$d"
-
-        execute "$d"
-
-        cd ..
-      fi
-    done
+    if [ -d "$PWD/.git" ];
+    then
+      execute "$PWD"
+    else
+      for d in *
+      do
+        if [ -d "$d" ]
+        then
+          cd "$d"
+
+          execute "$PWD"
+
+          cd ..
+        fi
+      done
+    fi
 
     cd "$HOME"
   fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "2.0.19",
+  "version": "2.0.21",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",
@@ -51,21 +51,21 @@
     "deps-head": "bin/head.sh"
   },
   "dependencies": {
-    "commander": "^10.0.0",
+    "commander": "^10.0.1",
     "debug": "^4.3.4",
     "glob-all": "^3.3.1",
     "supports-color": "8.1.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.0",
-    "@babel/core": "^7.21.3",
+    "@babel/cli": "^7.21.5",
+    "@babel/core": "^7.21.5",
     "@babel/eslint-parser": "^7.21.3",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-env": "^7.21.5",
     "@babel/register": "^7.21.0",
     "chai": "^4.3.7",
-    "core-js": "^3.29.1",
+    "core-js": "^3.30.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.36.0",
+    "eslint": "^8.39.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",

package/src/common/index.mjs

@@ -250,9 +250,9 @@ export const getPeerDependencies = ({ peerDependencies } = {}) => peerDependenci
 /**
  *  @function getIgnore
  *
- *  Get the ignore flag by destructuring the package or configuration
+ *  Get the ignore flag by destructuring the configuration
  *
- *  @param {Package|Configuration}
+ *  @param {Configuration}
  *
  *  @return {boolean}
  */
@@ -287,6 +287,17 @@ export const getAuthor = ({ author = '' } = {}) => {
   return author || null
 }
 
+/**
+ *  @function getMessage
+ *
+ *  Get the message by destructuring the configuration
+ *
+ *  @param {Configuration}
+ *
+ *  @return {string|null}
+ */
+export const getMessage = ({ message = '' } = {}) => message || null
+
 /**
  *  @function isPreRelease
  *