feat(main): support not required enum

isuke · isuke · commit 9ab139df70fd · 2018-02-10T01:33:06.000+09:00
diff --git a/.git_consistent b/.git_consistent
@@ -2,7 +2,6 @@ type:
   type: enum
   required: true
   description: 'commit type'
-  suffix: ': '
   values:
     -
       name: feat
@@ -46,6 +45,16 @@ type:
     -
       name: revert
       description: 'when reverts a previous commit'
+scope:
+  type: enum
+  required: false
+  description: 'The scope could be specifying place of the commit change.'
+  prefix: '('
+  suffix: ')'
+  values:
+    -
+      name: "main"
+      description: 'git-consistent'
 subject:
   type: string
   required: true
diff --git a/.gitcommit_template b/.gitcommit_template
@@ -1,3 +1,3 @@
-<type><subject>
+<type><scope>: <subject>
 
 <body>
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,7 +13,9 @@
       "args": [
         "-i",
         "--type='feat'",
-        "--subject='add skip-options option'",
+        // "--scope='main'",
+        "--subject='this is test'",
+        "--body='This is test.'",
         "-d"
       ]
     }
diff --git a/git-consistent b/git-consistent
@@ -44,13 +44,17 @@ const createProgram = (program, definitions, terms) => {
 }
 
 const select = (term, definition) => {
+  const none = "(none)"
   const header = `Select ${term}: `
-  const values = _.map(definition.values, function (value) { return value.name }) // TODO: description
-  const command = `echo '${values.join("\n")}' | fzf --reverse --cycle --header="${header}"`
+  const choices = _.map(definition.values, function (value) { return `${value.name}\t${value.description}` })
+  if (!definition.required) choices.unshift(`\t${none}`)
+  const command = `echo '${_.replace(choices.join("\n"), "'", '"')}' | fzf --reverse --cycle --header="${header}"`
 
-  value = execSync(command, { stdio: ['inherit', 'pipe', 'inherit'], shell: true }).toString().trim()
+  const selectedValue = execSync(command, { stdio: ['inherit', 'pipe', 'inherit'], shell: true }).toString().trim()
+  const value = selectedValue.split("\t")[0]
+  const v = value === none ? '' : value
   console.log(`${header}${value}`)
-  return value
+  return v
 }
 
 const inputString = (term, _definition) => {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-<type><subject>`
	`1`	`+<type><scope>: <subject>`
`2`	`2`
`3`	`3`	`<body>`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@`
`13`	`13`	`"args": [`
`14`	`14`	`"-i",`
`15`	`15`	`"--type='feat'",`
`16`		`- "--subject='add skip-options option'",`
	`16`	`+ // "--scope='main'",`
	`17`	`+ "--subject='this is test'",`
	`18`	`+ "--body='This is test.'",`
`17`	`19`	`"-d"`
`18`	`20`	`]`
`19`	`21`	`}`