Add Husky and simplify prompt (#17)

sorenlouv · Nov 5, 2017 · d033f5c · d033f5c
1 parent 2612f78
commit d033f5c
Show file tree

Hide file tree

Showing 6 changed files with 331 additions and 69 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,14 @@
   "license": "MIT",
   "scripts": {
     "test": "jest",
-    "lint": "eslint ./src"
+    "testWithCoverage": "jest --coverage",
+    "format": "prettier \"./src/**/*.js\" --write",
+    "lint": "eslint ./src",
+    "prepush": "npm run lint",
+    "precommit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.js": ["prettier --write", "git add"]
   },
   "repository": {
     "type": "git",
@@ -30,7 +37,9 @@
     "eslint-config-prettier": "^2.4.0",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-prettier": "^2.2.0",
+    "husky": "^0.14.3",
     "jest": "^21.2.1",
+    "lint-staged": "^4.3.0",
     "prettier": "^1.7.4"
   }
 }
diff --git a/src/prompts.js b/src/prompts.js
@@ -1,76 +1,56 @@
 const inquirer = require('inquirer');
 
-function listFullRepoName(repoNames) {
+function prompt(options) {
   return inquirer
-    .prompt([
-      {
-        type: 'list',
-        name: 'fullRepoName',
-        message: 'Select repository',
-        choices: repoNames
-      }
-    ])
-    .then(({ fullRepoName }) => fullRepoName);
+    .prompt([Object.assign({}, options, { name: 'promptResult' })])
+    .then(({ promptResult }) => promptResult);
+}
+
+function listFullRepoName(repoNames) {
+  return prompt({
+    type: 'list',
+    message: 'Select repository',
+    choices: repoNames
+  });
 }
 
 function listCommits(commits) {
   const pageSize = Math.min(10, commits.length);
-
-  return inquirer
-    .prompt([
-      {
-        pageSize,
-        type: 'list',
-        name: 'commit',
-        message: 'Select commit to backport',
-        choices: commits
-          .map(commit => ({
-            name: commit.message,
-            value: commit,
-            short: commit.message
-          }))
-          .concat(commits.length > pageSize ? new inquirer.Separator() : [])
-      }
-    ])
-    .then(({ commit }) => commit);
+  return prompt({
+    pageSize,
+    type: 'list',
+    message: 'Select commit to backport',
+    choices: commits
+      .map(commit => ({
+        name: commit.message,
+        value: commit,
+        short: commit.message
+      }))
+      .concat(commits.length > pageSize ? new inquirer.Separator() : [])
+  });
 }
 
 function listVersions(versions) {
-  return inquirer
-    .prompt([
-      {
-        type: 'list',
-        name: 'version',
-        message: 'Select version to backport to',
-        choices: versions
-      }
-    ])
-    .then(({ version }) => [version]);
+  return prompt({
+    type: 'list',
+    message: 'Select version to backport to',
+    choices: versions
+  }).then(version => [version]);
 }
 
 function checkboxVersions(versions) {
-  return inquirer
-    .prompt([
-      {
-        type: 'checkbox',
-        name: 'versions',
-        message: 'Select version to backport to',
-        choices: versions
-      }
-    ])
-    .then(({ versions }) => versions);
+  return prompt({
+    type: 'checkbox',
+    message: 'Select version to backport to',
+    choices: versions
+  });
 }
 
 function confirmConflictResolved() {
-  return inquirer
-    .prompt([
-      {
-        type: 'confirm',
-        name: 'isConflictResolved',
-        message: 'Have you solved the merge conflict?'
-      }
-    ])
-    .then(({ isConflictResolved }) => isConflictResolved);
+  return prompt({
+    type: 'confirm',
+    message: 'Have you solved the merge conflict?'
+  });
 }
 
 module.exports = {

diff --git a/test/__snapshots__/cli.test.js.snap b/test/__snapshots__/cli.test.js.snap
@@ -50,7 +50,7 @@ Array [
           "elastic/backport-cli-test",
         ],
         "message": "Select repository",
-        "name": "fullRepoName",
+        "name": "promptResult",
         "type": "list",
       },
     ],
@@ -88,7 +88,7 @@ Array [
           },
         ],
         "message": "Select commit to backport",
-        "name": "commit",
+        "name": "promptResult",
         "pageSize": 3,
         "type": "list",
       },
@@ -105,7 +105,7 @@ Array [
           "5.4",
         ],
         "message": "Select version to backport to",
-        "name": "version",
+        "name": "promptResult",
         "type": "list",
       },
     ],

diff --git a/test/cli.test.js b/test/cli.test.js
@@ -23,18 +23,18 @@ function setup() {
 
   inquirer.prompt = jest
     .fn()
-    .mockReturnValueOnce(Promise.resolve({ fullRepoName }))
+    .mockReturnValueOnce(Promise.resolve({ promptResult: fullRepoName }))
     .mockReturnValueOnce(
       Promise.resolve({
-        commit: {
+        promptResult: {
           message: 'myCommitMessage',
           sha: 'mySha'
         }
       })
     )
     .mockReturnValueOnce(
       Promise.resolve({
-        version: '6.2'
+        promptResult: '6.2'
       })
     );
 

diff --git a/test/cliService.test.js b/test/cliService.test.js
@@ -117,7 +117,7 @@ describe('promptRepoInfo', () => {
   function mockPrompt() {
     inquirer.prompt = jest
       .fn()
-      .mockReturnValueOnce(Promise.resolve({ fullRepoName: 'elastic/kibana' }));
+      .mockReturnValueOnce(Promise.resolve({ promptResult: 'elastic/kibana' }));
   }
 
   describe('without matching cwd', () => {