@sequencemedia/music-library 1.0.4 → 1.0.8

package/.husky/post-commit

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

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/music-library: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/music-library:${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/music-library:build:gulp:post-commit')
+const error = debug('@sequencemedia/music-library:build:gulp:post-commit:error')
+
+log('`@sequencemedia/music-library` 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,93 +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/music-library:build:gulp:pre-commit')
+const error = debug('@sequencemedia/music-library:build:gulp:pre-commit:error')
 
 log('`@sequencemedia/music-library` 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 function hasPackageVersionChanges () {
-  log('hasPackageVersionChanges')
-
-  return (
-    new Promise((resolve, reject) => {
-      exec('git diff HEAD origin/main package.json', OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v)) : reject(e))
-    })
-  )
-}
-
-export function notPackageVersionChanges () {
-  log('notPackageVersionChanges')
-
-  return (
-    new Promise((resolve, reject) => {
-      exec('git diff HEAD origin/main package.json', OPTIONS, (e, v) => (!e) ? resolve(PACKAGE_VERSION_CHANGES.test(v) !== true) : 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 () {
-  log('notPushedChanges')
-
-  return (
-    new Promise((resolve, reject) => {
-      exec('git log origin/main..HEAD', OPTIONS, (e, v) => (!e) ? resolve(!!v) : reject(e))
-    })
-  )
-}
-
-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 addPackageVersionChanges () {
-  log('addPackageVersionChanges')
-
-  return (
-    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')
 
@@ -103,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,13 @@
 import gulp from 'gulp'
 
 import preCommit from '#build/gulp/pre-commit'
+import postCommit from '#build/gulp/post-commit'
 
 gulp
   .task('pre-commit', preCommit)
 
+gulp
+  .task('post-commit', postCommit)
+
 gulp
   .task('default', gulp.series('pre-commit'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sequencemedia/music-library",
-  "version": "1.0.4",
+  "version": "1.0.8",
   "description": "Watch Apple Music Library XML and parse to JSON, JS, ES, or M3U",
   "keywords": [
     "music",
@@ -38,10 +38,11 @@
     "dev": "cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:*,@sequencemedia/music-library-parser,@sequencemedia/music-library-parser:* NODE_ENV=development node .",
     "gulp": "gulp --color",
     "pre-commit": "npm run lint && cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:* npm run gulp -- pre-commit",
+    "post-commit": "cross-env DEBUG=@sequencemedia/music-library,@sequencemedia/music-library:* npm run gulp -- post-commit",
     "prepare": "husky install"
   },
   "dependencies": {
-    "@sequencemedia/music-library-parser": "1.0.2",
+    "@sequencemedia/music-library-parser": "1.0.6",
     "chokidar": "^3.5.2",
     "commander": "^8.3.0",
     "cross-env": "^7.0.3",