@modernpoacher/deps 2.0.25 → 2.0.27

package/bin/execute/app.mjs

@@ -21,8 +21,9 @@ import {
   MESSAGE,
   AUTHOR,
   catGitRefsRemotesOriginHead,
-  gitRevParse,
-  gitCheckout,
+  awkGitRemoteShowOriginHead,
+  gitRevParseShowTopLevel,
+  gitRevParseAbbrevRefHead,
   gitPull,
   gitPush,
   gitPushTags,
@@ -78,6 +79,28 @@ function handleCommandError (e) {
   }
 }
 
+async function getDefaultBranch (directory) {
+  const branch = await catGitRefsRemotesOriginHead(directory)
+  if (branch) return branch
+  return (
+    await awkGitRemoteShowOriginHead(directory)
+  )
+}
+
+async function getCurrentBranch (directory) {
+  return (
+    await gitRevParseAbbrevRefHead(directory)
+  )
+}
+
+async function isHeadDefaultBranch (directory) {
+  const defaultBranch = await getDefaultBranch(directory)
+  const currentBranch = await getCurrentBranch(directory)
+  return (
+    defaultBranch === currentBranch
+  )
+}
+
 /**
  * @function getIgnoreFromConfiguration
  *
@@ -220,7 +243,7 @@ async function getDepsList (directories) {
   log('getDepsList')
 
   try {
-    const array = await Promise.all(directories.map(mapRevParse))
+    const array = await Promise.all(directories.map(mapRevParseShowTopLevel))
 
     return (
       array
@@ -233,12 +256,12 @@ async function getDepsList (directories) {
   }
 }
 
-async function mapRevParse (directory) {
-  log('mapRevParse')
+async function mapRevParseShowTopLevel (directory) {
+  log('mapRevParseShowTopLevel')
 
   try {
     return (
-      await gitRevParse(directory)
+      await gitRevParseShowTopLevel(directory)
     )
   } catch (e) {
     handleCommandError(e)
@@ -252,10 +275,13 @@ async function iterate ([directory, ...directories] = [], registry, force, messa
     const D = resolve(directory)
 
     try {
-      if (D === await gitRevParse(D)) {
-        const ignore = await getIgnoreFromConfiguration(D)
-        if (!ignore) {
-          await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
+      if (D === await gitRevParseShowTopLevel(D)) {
+        const B = await isHeadDefaultBranch(D)
+        if (B) {
+          const ignore = await getIgnoreFromConfiguration(D)
+          if (!ignore) {
+            await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
+          }
         }
       }
     } catch (e) {
@@ -274,7 +300,6 @@ async function execute (directory = DIRECTORY, registry = REGISTRY, force = fals
   try {
     log({ directory, registry, force, message, author })
 
-    await gitCheckout(directory, await catGitRefsRemotesOriginHead(directory))
     await gitPull(directory)
     await rmrf(directory)
     await npmi(directory, registry, force)
@@ -291,68 +316,77 @@ async function execute (directory = DIRECTORY, registry = REGISTRY, force = fals
 async function executeFrom (directory, registry, force, message, author) {
   log('executeFrom')
 
-  const D = resolve(directory)
+  if (directory) {
+    const D = resolve(directory)
 
-  try {
-    if (D === await gitRevParse(D)) {
-      const ignore = await getIgnoreFromConfiguration(D)
-      if (!ignore) {
-        return (
-          await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
-        )
+    try {
+      if (D === await gitRevParseShowTopLevel(D)) {
+        const B = await isHeadDefaultBranch(D)
+        if (B) {
+          const ignore = await getIgnoreFromConfiguration(D)
+          if (!ignore) {
+            await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
+          }
+        }
       }
+    } catch (e) {
+      handleCommandError(e)
     }
-  } catch (e) {
-    handleCommandError(e)
   }
 }
 
 async function executeOnly (directory, registry, force, message, author) {
   log('executeOnly')
 
-  const D = resolve(directory)
+  if (directory) {
+    const D = resolve(directory)
 
-  try {
-    if (D === await gitRevParse(D)) {
-      const ignore = await getIgnoreFromConfiguration(D)
-      if (!ignore) {
-        return (
-          await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
-        )
+    try {
+      if (D === await gitRevParseShowTopLevel(D)) {
+        const B = await isHeadDefaultBranch(D)
+        if (B) {
+          const ignore = await getIgnoreFromConfiguration(D)
+          if (!ignore) {
+            await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
+          }
+        }
       }
+    } catch (e) {
+      handleCommandError(e)
     }
-  } catch (e) {
-    handleCommandError(e)
   }
 }
 
 async function executePath (directory, registry, force, message, author) {
   log('executePath')
 
-  const D = resolve(directory)
+  if (directory) {
+    const D = resolve(directory)
 
-  try {
-    if (D === await gitRevParse(D)) {
-      const ignore = await getIgnoreFromConfiguration(D)
-      if (!ignore) {
-        return (
-          await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
-        )
+    try {
+      if (D === await gitRevParseShowTopLevel(D)) {
+        const B = await isHeadDefaultBranch(D)
+        if (B) {
+          const ignore = await getIgnoreFromConfiguration(D)
+          if (!ignore) {
+            await execute(D, registry, force, await toMessage(message, D), await toAuthor(author, D))
+          }
+        }
       }
+    } catch (e) {
+      handleCommandError(e)
     }
-  } catch (e) {
-    handleCommandError(e)
-  }
 
-  const pathList = await getPathList(D)
+    const pathList = await getPathList(D)
 
-  if (pathList.length) {
-    const depsList = await getDepsList(pathList)
+    if (pathList.length) {
+      const depsList = await getDepsList(pathList)
 
-    if (depsList.length) {
-      return (
-        await iterate(depsList, registry, force, message, author)
-      )
+      if (depsList.length) {
+        return (
+          await iterate(depsList, registry, force, message, author)
+        )
+      }
     }
   }
 }

package/nvm.sh

@@ -32,7 +32,7 @@ else
 
   nvm use 2> /dev/null
 
-  if [[ $WUT != 0 ]];
+  if [[ $? != 0 ]];
   then
     echo Environment does not have NVM configured
   else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "2.0.25",
+  "version": "2.0.27",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",

package/src/common/git/index.mjs

@@ -179,7 +179,38 @@ export function catGitRefsRemotesOriginHead (directory = DIRECTORY) {
 }
 
 /**
- *  @function gitRevParse
+ *  @function awkGitRemoteShowOriginHead
+ *
+ *  Get the remote default branch
+ *
+ *  @param {string} directory - A directory configured for Git
+ *
+ *  @return {Promise<string>}
+ */
+export function awkGitRemoteShowOriginHead (directory = DIRECTORY) {
+  log('awkGitRemoteShowOriginHead')
+
+  return (
+    new Promise((resolve, reject) => {
+      const command = 'git remote show origin | awk \'/HEAD branch/ {print $NF}\''
+
+      const {
+        stdout,
+        stderr
+      } = exec(command, { ...OPTIONS, cwd: normalize(directory) }, (e, v = '') => {
+        (!e)
+          ? resolve(trim(v))
+          : reject(e)
+      })
+
+      stdout.on('data', out('git-remote-show-origin-head', directory.trim()))
+      stderr.on('data', err('git-remote-show-origin-head', directory.trim()))
+    })
+  )
+}
+
+/**
+ *  @function gitRevParseShowTopLevel
  *
  *  Determine whether a directory is configured for Git
  *
@@ -187,8 +218,8 @@ export function catGitRefsRemotesOriginHead (directory = DIRECTORY) {
  *
  *  @return {Promise<string>}
  */
-export function gitRevParse (directory = DIRECTORY) {
-  log('gitRevParse')
+export function gitRevParseShowTopLevel (directory = DIRECTORY) {
+  log('gitRevParseShowTopLevel')
 
   return (
     new Promise((resolve, reject) => {
@@ -203,8 +234,39 @@ export function gitRevParse (directory = DIRECTORY) {
           : reject(e)
       })
 
-      stdout.on('data', out('git-rev-parse', directory.trim()))
-      stderr.on('data', err('git-rev-parse', directory.trim()))
+      stdout.on('data', out('git-rev-parse-show-toplevel', directory.trim()))
+      stderr.on('data', err('git-rev-parse-show-toplevel', directory.trim()))
+    })
+  )
+}
+
+/**
+ *  @function gitRevParseAbbrevRefHead
+ *
+ *  Determine which branch is HEAD
+ *
+ *  @param {string} directory - A directory
+ *
+ *  @return {Promise<string>}
+ */
+export function gitRevParseAbbrevRefHead (directory = DIRECTORY) {
+  log('gitRevParseAbbrevRefHead')
+
+  return (
+    new Promise((resolve, reject) => {
+      const command = 'git rev-parse --abbrev-ref HEAD'
+
+      const {
+        stdout,
+        stderr
+      } = exec(command, { ...OPTIONS, cwd: normalize(directory) }, (e, v = '') => {
+        (!e)
+          ? resolve(trim(v))
+          : reject(e)
+      })
+
+      stdout.on('data', out('git-rev-parse-abbrev-ref-head', directory.trim()))
+      stderr.on('data', err('git-rev-parse-abbrev-ref-head', directory.trim()))
     })
   )
 }