@sequencemedia/minimserver 1.2.1 → 1.2.5

package/.husky/post-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run post-commit

package/app.mjs

@@ -61,9 +61,6 @@ async function app () {
     pid,
     argv,
     env: {
-      ORIGIN,
-      DESTINATION,
-      SERVER,
       IGNORE,
       BOUNCE
     }
@@ -99,9 +96,9 @@ async function app () {
   }
 
   const {
-    origin = ORIGIN,
-    destination = DESTINATION,
-    server = SERVER,
+    origin,
+    destination,
+    server,
     ignore = IGNORE,
     bounce = BOUNCE
   } = commander.opts()

package/build/gulp/common.mjs

@@ -0,0 +1,141 @@
+import debug from 'debug'
+
+import {
+  exec
+} from 'child_process'
+
+import {
+  readFile
+} from 'fs/promises'
+
+const log = debug('@sequencemedia/minimserver:build:gulp:common')
+
+export const PACKAGE_VERSION_CHANGES = /\-+\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+\++\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+/ /* eslint-disable-line no-useless-escape */
+
+export const HAS_STAGED_CHANGES = /Changes to be committed/s
+
+export const NOT_STAGED_CHANGES = /Changes not staged for commit/s
+
+export const OPTIONS = {
+  maxBuffer: 1024 * 500
+}
+
+export const BRANCH = 'master'
+
+export const trim = (v) => v.split('\n').map((v) => v.trimEnd()).join('\n').trim()
+
+export function use (key) {
+  const log = debug(`@sequencemedia/minimserver:${key}`)
+
+  return function use (v) {
+    log(trim(v))
+  }
+}
+
+export function getGitRemoteShowOriginHeadBranch () {
+  log('getGitRemoteShowOriginHeadBranch')
+
+  return (
+    new Promise((resolve, reject) => {
+      const command = 'git remote show origin | awk \'/HEAD branch/ {print $NF}\''
+
+      const {
+        stdout,
+        stderr
+      } = exec(command, OPTIONS, (e, v = '') => (!e) ? resolve(trim(v)) : reject(e))
+
+      stdout.on('data', use('git-remote-show-origin-head-branch'))
+      stderr.on('data', use('git-remote-show-origin-head-branch'))
+    })
+  )
+}
+
+export function hasPackageVersionChanges (branch = BRANCH) {
+  log('hasPackageVersionChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec(`git diff HEAD origin/${branch} package.json`, OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v)) : reject(e))
+    })
+  )
+}
+
+export function notPackageVersionChanges (branch = BRANCH) {
+  log('notPackageVersionChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec(`git diff HEAD origin/${branch} package.json`, OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v) !== true) : reject(e))
+    })
+  )
+}
+
+export function addPackageVersionChanges () {
+  log('addPackageVersionChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git add package.json package-lock.json', OPTIONS, (e) => (!e) ? resolve() : reject(e))
+    })
+  )
+}
+
+export function hasStagedChanges () {
+  log('hasStagedChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git status', OPTIONS, (e, v) => (!e) ? resolve(HAS_STAGED_CHANGES.test(v)) : reject(e))
+    })
+  )
+}
+
+export function notStagedChanges () {
+  log('notStagedChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('git status', OPTIONS, (e, v) => (!e) ? resolve(NOT_STAGED_CHANGES.test(v)) : reject(e))
+    })
+  )
+}
+
+export function notPushedChanges (branch = BRANCH) {
+  log('notPushedChanges')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec(`git log origin/${branch}..HEAD`, OPTIONS, (e, v) => (!e) ? resolve(!!v) : reject(e))
+    })
+  )
+}
+
+export async function getPackageVersion () {
+  log('getPackageVersion')
+
+  const {
+    version = '0.0.0'
+  } = JSON.parse(await readFile('./package.json', 'utf8'))
+
+  return version
+}
+
+export function patchPackageVersion () {
+  log('patchPackageVersion')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec('npm version patch -m %s -n --no-git-tag-version --no-verify', OPTIONS, (e) => (!e) ? resolve() : reject(e))
+    })
+  )
+}
+
+export function gitTag (a = '0.0.0', m = `v${a}`) {
+  log('gitTag')
+
+  return (
+    new Promise((resolve, reject) => {
+      exec(`git tag -a v${a} -m "${m}"`, OPTIONS, (e, v) => (!e) ? resolve(v) : reject(e))
+    })
+  )
+}

package/build/gulp/post-commit.mjs

@@ -0,0 +1,21 @@
+import debug from 'debug'
+
+import {
+  getPackageVersion,
+  gitTag
+} from '#build/gulp/common'
+
+const log = debug('@sequencemedia/minimserver:build:gulp:post-commit')
+const error = debug('@sequencemedia/minimserver:build:gulp:post-commit:error')
+
+log('`@sequencemedia/minimserver` is awake')
+
+export default async function postCommit () {
+  log('post-commit')
+
+  try {
+    await gitTag(await getPackageVersion())
+  } catch ({ code = 'NONE', message = 'No error message defined' }) {
+    error({ code, message })
+  }
+}

package/build/gulp/pre-commit.mjs

@@ -1,65 +1,19 @@
 import debug from 'debug'
 
 import {
-  exec
-} from 'child_process'
+  notStagedChanges,
+  hasStagedChanges,
+  getGitRemoteShowOriginHeadBranch,
+  notPackageVersionChanges,
+  patchPackageVersion,
+  addPackageVersionChanges
+} from '#build/gulp/common'
 
 const log = debug('@sequencemedia/minimserver:build:gulp:pre-commit')
+const error = debug('@sequencemedia/minimserver:build:gulp:pre-commit:error')
 
 log('`@sequencemedia/minimserver` is awake')
 
-const PACKAGE_VERSION_CHANGES = /\-+\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+\++\s+"version":\s+"(\d+\.\d+\.\d+)",+\s+/ /* eslint-disable-line no-useless-escape */
-
-const HAS_STAGED_CHANGES = /Changes to be committed/s
-
-const NOT_STAGED_CHANGES = /Changes not staged for commit/s
-
-const OPTIONS = {
-  maxBuffer: 1024 * 500
-}
-
-export const hasPackageVersionChanges = () => (
-  new Promise((resolve, reject) => {
-    exec('git diff HEAD origin/master package.json', OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v)) : reject(e))
-  })
-)
-
-export const notPackageVersionChanges = () => (
-  new Promise((resolve, reject) => {
-    exec('git diff HEAD origin/master package.json', OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v) !== true) : reject(e))
-  })
-)
-
-export const hasStagedChanges = () => (
-  new Promise((resolve, reject) => {
-    exec('git status', OPTIONS, (e, v) => (!e) ? resolve(HAS_STAGED_CHANGES.test(v)) : reject(e))
-  })
-)
-
-export const notStagedChanges = () => (
-  new Promise((resolve, reject) => {
-    exec('git status', OPTIONS, (e, v) => (!e) ? resolve(NOT_STAGED_CHANGES.test(v)) : reject(e))
-  })
-)
-
-export const notPushedChanges = () => (
-  new Promise((resolve, reject) => {
-    exec('git log origin/master..HEAD', OPTIONS, (e, v) => (!e) ? resolve(!!v) : reject(e))
-  })
-)
-
-export const patchPackageVersion = () => (
-  new Promise((resolve, reject) => {
-    exec('npm version patch -m %s -n --no-git-tag-version --no-verify', OPTIONS, (e) => (!e) ? resolve() : reject(e))
-  })
-)
-
-export const addPackageVersionChanges = () => (
-  new Promise((resolve, reject) => {
-    exec('git add package.json package-lock.json', OPTIONS, (e) => (!e) ? resolve() : reject(e))
-  })
-)
-
 export default async function preCommit () {
   log('pre-commit')
 
@@ -75,12 +29,12 @@ export default async function preCommit () {
       /**
        *  Not package version changes, continue
        */
-      if (await notPackageVersionChanges()) {
+      if (await notPackageVersionChanges(await getGitRemoteShowOriginHeadBranch())) {
         await patchPackageVersion()
         await addPackageVersionChanges()
       }
     }
   } catch ({ code = 'NONE', message = 'No error message defined' }) {
-    log({ code, message })
+    error({ code, message })
   }
 }

package/gulpfile.mjs

@@ -1,9 +1,11 @@
 import gulp from 'gulp'
 
-import preCommit from '#build/gulp/pre-commit'
+import {
+  postCommit
+} from '@sequencemedia/hooks'
 
 gulp
-  .task('pre-commit', preCommit)
+  .task('post-commit', postCommit)
 
 gulp
-  .task('default', gulp.series('pre-commit'))
+  .task('default', gulp.series('post-commit'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/minimserver",
-  "version": "1.2.1",
+  "version": "1.2.5",
   "description": "Watch for changes to M3Us and rescan MinimServer",
   "keywords": [
     "minimserver",
@@ -34,7 +34,8 @@
     "start": "cross-env DEBUG=@sequencemedia/minimserver* NODE_ENV=production node .",
     "dev": "cross-env DEBUG=@sequencemedia/minimserver* NODE_ENV=development node .",
     "gulp": "gulp --color",
-    "pre-commit": "npm run lint && npm run gulp -- pre-commit",
+    "pre-commit": "npm run lint",
+    "post-commit": "cross-env DEBUG=@sequencemedia/hooks,@sequencemedia/hooks:* npm run gulp -- post-commit",
     "prepare": "husky install"
   },
   "dependencies": {
@@ -46,14 +47,14 @@
     "del": "^6.0.0",
     "dotenv": "^10.0.0",
     "fs-extra": "^10.0.0",
-    "ps-list": "^8.0.0",
-    "supports-color": "^9.2.1"
+    "ps-list": "^8.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
     "@babel/core": "^7.16.5",
     "@babel/eslint-parser": "^7.16.5",
     "@babel/preset-env": "^7.16.5",
+    "@sequencemedia/hooks": "^1.0.0",
     "core-js": "^3.20.1",
     "eslint": "7.32.0",
     "eslint-config-standard": "^16.0.3",