feat: commit check can read from a custom file

dhis2 · Dec 18, 2020 · 366be0c · 366be0c
1 parent 2c8688d
commit 366be0c
Show file tree

Hide file tree

Showing 3 changed files with 919 additions and 1,015 deletions.
diff --git a/src/commands/commit.js b/src/commands/commit.js
@@ -1,16 +1,23 @@
 const log = require('@dhis2/cli-helpers-engine').reporter
 const { namespace } = require('@dhis2/cli-helpers-engine')
 const { commitlint } = require('../tools/commitlint.js')
+const { CONSUMING_ROOT } = require('../utils/paths.js')
 
 const commitCmd = yargs => {
     return yargs.command(
         'check [file]',
-        'Checks commit messages according to standards.',
+        'Checks commit messages according to standard.',
         function builder(yargs) {
-            return yargs.option('commitlintConfig', {
-                describe: 'Commitlint config file to use',
-                type: 'string',
-            })
+            return yargs
+                .positional('file', {
+                    describe: 'File that contains the commit message',
+                    type: 'string',
+                    default: `${CONSUMING_ROOT}/.git/COMMIT_EDITMSG`,
+                })
+                .option('commitlintConfig', {
+                    describe: 'Commitlint config file to use',
+                    type: 'string',
+                })
         },
         function handler(argv) {
             log.info('d2-style > commit')

diff --git a/src/tools/commitlint.js b/src/tools/commitlint.js
@@ -1,11 +1,11 @@
 const { COMMITLINT_CONFIG } = require('../utils/paths.js')
 const { bin } = require('../utils/run.js')
 
-exports.commitlint = ({ config = COMMITLINT_CONFIG, file }) => {
+exports.commitlint = ({ config = COMMITLINT_CONFIG, file, argv }) => {
     const cmd = 'commitlint'
     const args = [
         'commitlint',
-        `--config=${config}`,
+        ...(config ? ['--config', config] : []),
         ...(file ? ['--edit', file] : []),
     ]