Update: merge (conflict resolved)

Hiroki Konishi · Hiroki Konishi · commit 85ef9823e625 · 2019-06-26T17:18:15.000+09:00
diff --git a/cmd/taggo/flag.go b/cmd/taggo/flag.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+	"flag"
+	"log"
+)
+
+var (
+	tag       string
+	colorStr  string
+	delimiter string
+	index     int
+)
+
+func checkColor() bool {
+	ks := []string{}
+	for k := range colorFuncMap {
+		if colorStr == k {
+			return true
+		}
+		ks = append(ks, k)
+	}
+	log.Fatalf("color must be any of %v\n", ks)
+	return false
+}
+
+func parse() {
+	flag.StringVar(&tag, "tag", "", "")
+	flag.StringVar(&colorStr, "color", "black", "")
+	flag.StringVar(&delimiter, "delimiter", "\t", "")
+	flag.IntVar(&index, "index", -1, "")
+	flag.Parse()
+	// Validation
+	checkColor()
+}
diff --git a/cmd/taggo/main.go b/cmd/taggo/main.go
@@ -0,0 +1,54 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/fatih/color"
+)
+
+func asItIs(format string, a ...interface{}) string {
+	return format
+}
+
+var colorFuncMap = map[string](func(format string, a ...interface{}) string){
+	"":        asItIs,
+	"balck":   color.BlackString,
+	"red":     color.RedString,
+	"green":   color.BlueString,
+	"yellow":  color.YellowString,
+	"blue":    color.CyanString,
+	"magenda": color.MagentaString,
+	"cyan":    color.CyanString,
+	"white":   color.WhiteString,
+}
+
+func main() {
+	parse()
+	color.NoColor = false
+	scanner := bufio.NewScanner(os.Stdin)
+	for scanner.Scan() {
+		text := scanner.Text()
+		if index >= 0 {
+			elms := strings.Split(text, delimiter)
+			fmt.Printf(
+				"%v%v%v\n",
+				colorFuncMap[colorStr](elms[0]),
+				delimiter,
+				strings.Join(elms[1:len(elms)], delimiter),
+			)
+		} else {
+			fmt.Printf(
+				"%v%v%v\n",
+				colorFuncMap[colorStr](tag),
+				delimiter,
+				text,
+			)
+		}
+	}
+
+	if scanner.Err() != nil {
+	}
+}
diff --git a/cmd/taggo/taggo b/cmd/taggo/taggo
diff --git a/integration_test/integration_test.go b/integration_test/integration_test.go
@@ -44,7 +44,7 @@ func (c *pmyTestCase) testSelf(t *testing.T) (bool, error) {
 		return true, nil
 	}
 	fmt.Printf(
-		"[%v] fail\nexpectd: %v\nactual: %v\n",
+		"[%v] fail\nexpected: %v\nactual  : %v\n",
 		color.RedString("✘"),
 		c.Expected,
 		res,
diff --git a/rules/cf_pmy_rules.json b/rules/cf_pmy_rules.json
@@ -8,7 +8,7 @@
           "after": "awk '{print $1}'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0 -q \"<query>\"",
+      "fuzzyFinderCmd": "fzf -0 --ansi -q \"<query>\"",
       "bufferLeft": "<body> ",
       "bufferRight": "[]"
     },
@@ -21,7 +21,7 @@
           "after": "awk '{print $1}'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0",
+      "fuzzyFinderCmd": "fzf -0 --ansi",
       "bufferLeft": "[]",
       "bufferRight": "[]"
     },
@@ -34,7 +34,7 @@
           "after": "awk '{print $1}'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0 -1 -q \"<query>\"",
+      "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"<query>\"",
       "bufferLeft": "cf ",
       "bufferRight": "[]"
     }
diff --git a/rules/fzf_pmy_rules.json b/rules/fzf_pmy_rules.json
@@ -8,7 +8,7 @@
           "after": "awk '{print $1}' | sed -e 's/=.*/=/g'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0 -1 -q \"<query>\"",
+      "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"<query>\"",
       "bufferLeft": "fzf <body>",
       "bufferRight": "[]"
     }
diff --git a/rules/git_pmy_rules.json b/rules/git_pmy_rules.json
@@ -8,7 +8,6 @@
           "after": "awk '{print $1}'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0 -1 ",
       "bufferLeft": "git ",
       "bufferRight": "[]"
     },
@@ -21,7 +20,6 @@
           "after": "awk '{print $1}'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0 -1 ",
       "bufferLeft": "git <sub_cmd><body>",
       "bufferRight": "[]"
     },
@@ -33,13 +31,18 @@
           "stmt": "git branch --format=\"%(refname:short)\"",
           "after": "awk '{print $0}'"
         },
+        {
+          "tag": "🔖:tag",
+          "stmt": "git tag",
+          "after": "awk '{print $0}'"
+        },
         {
           "tag": "🍺:commit",
-          "stmt": "git log --oneline -30",
+          "stmt": "git log --oneline -30 --color",
           "after": "awk '{print $1}'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0 -1 -q \"<query>\"",
+      "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"<query>\"",
       "bufferLeft": "<body> ",
       "bufferRight": "[]"
     },
diff --git a/rules/pmy_rules.json b/rules/pmy_rules.json
@@ -3,7 +3,6 @@
       "regexpLeft": "(?P<body>.*?)(?P<path>~{0,1}([A-Za-z_\\-.]*/)*)\\*\\*$",
       "cmdGroups": [
         {
-          "tag": "",
           "stmt":  "bfind <path>",
           "after": "awk '{print $0}'"
         }
@@ -15,7 +14,6 @@
       "regexpLeft": "^(?P<num>[1-9][0-9]*).for$",
       "cmdGroups": [
         {
-          "tag": "",
           "stmt":  "echo ''",
           "after": "awk '{print $0}'"
         }
@@ -27,7 +25,6 @@
       "regexpLeft": "(?P<cmd>.+)\\.for$",
       "cmdGroups": [
         {
-          "tag": "",
           "stmt":  "echo ''",
           "after": "awk '{print $0}'"
         }
@@ -39,25 +36,23 @@
       "regexpLeft": "^(?P<body>.*?)(?P<path>~{0,1}([A-Za-z_\\-.]*/)+)(?P<query>[A-Za-z_\\-.]*)$",
       "cmdGroups": [
         {
-          "tag": "",
           "stmt":  "command ls -AF -1 <path>",
           "after": "awk '{print $0}'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0 -1 -q \"^<query> \"",
+      "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"^<query> \"",
       "bufferLeft": "<body><path>",
       "bufferRight": "[]"
     },
     {
       "regexpLeft": "^(?P<body>.*?) (?P<query>[A-Za-z_\\-.]*)$",
       "cmdGroups": [
         {
-          "tag": "",
           "stmt":  "command ls -AF -1",
           "after": "awk '{print $0}'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0 -1 -q \"^<query> \"",
+      "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"^<query> \"",
       "bufferLeft": "<body> ",
       "bufferRight": "[]"
     }
diff --git a/rules/test/git_pmy_rules_test.json b/rules/test/git_pmy_rules_test.json
@@ -8,7 +8,7 @@
           "after": "awk '{print $0}'"
         }
       ],
-      "fuzzyFinderCmd": "fzf -0 -1 -q \"<query>\"",
+      "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"<query>\"",
       "bufferLeft": "<body> ",
       "bufferRight": "[]"
     },
diff --git a/rules/test/pmy_testcases.json b/rules/test/pmy_testcases.json
@@ -1,6 +1,6 @@
 [
   {
-    "lbuffer": "git checkout ",
+    "lbuffer": "git checkout mas",
     "rbuffer": "",
     "expected": "git checkout master"
   },
diff --git a/shell/pmy.zsh b/shell/pmy.zsh
@@ -6,7 +6,7 @@ export PATH="${GOPATH:-${HOME}/go}/src/github.com/relastle/pmy:${PATH}"
 # Export pmy configuration environment variable
 export PMY_RULE_PATH="${PMY_RULE_PATH:-${GOPATH:-${HOME}/go}/src/github.com/relastle/pmy/rules/pmy_rules.json}"
 export PMY_TAG_DELIMITER=${PMY_TAG_DELIMITER:-"\t"}
-export PMY_FUZZY_FINDER_DEFAULT_CMD=${PMY_FUZZY_FINDER_DEFAULT_CMD:-"fzf -0 -1"}
+export PMY_FUZZY_FINDER_DEFAULT_CMD=${PMY_FUZZY_FINDER_DEFAULT_CMD:-"fzf -0 -1 --ansi"}
 export PMY_TRIGGER_KEY=${PMY_TRIGGER_KEY:-'^ '}
 export PMY_SNIPPET_ROOT="${PMY_SNIPPET_ROOT:-${GOPATH:-${HOME}/go}/src/github.com/relastle/pmy/snippets}"
 
@@ -27,39 +27,32 @@ _pmy_main() {
     # local out="$(pmy --bufferLeft=${buffer_left} --bufferRight=${buffer_right} 2>/dev/null)"
     local out="$(pmy --bufferLeft=${buffer_left} --bufferRight=${buffer_right})"
 
-    if [[ -z $out  ]] then
+    if [[ -z $out  ]] ; then
         echo "No rule was matched"
         __pmy_res_lbuffer=${buffer_left}
         __pmy_res_rbuffer=${buffer_right}
     else
         eval ${out}
 
         local fuzzy_finder_cmd=${__pmy_out_fuzzy_finder_cmd:-${PMY_FUZZY_FINDER_DEFAULT_CMD}}
-
-        if [[ -z ${__pmy_out_imm_cmd} && -z ${__pmy_out_magic_out}  ]] then
-            # get result from fzf
-            local fzf_res=$(echo -n "${__pmy_out_sources}" | eval ${fuzzy_finder_cmd})
-            # get tag
-            local tag="$(echo -n ${fzf_res} | awk -F ${PMY_TAG_DELIMITER} 'BEGIN{ORS = ""}{print $1}' | base64)"
+        local fzf_res_tag_included=$(eval ${__pmy_out_command} | eval ${fuzzy_finder_cmd})
+        # get result from fzf
+        # get tag
+        if [[ -z ${__pmy_out_tag_all_empty} ]] ; then
+            local tag="$(echo -n ${fzf_res_tag_included} | awk -F ${PMY_TAG_DELIMITER} 'BEGIN{ORS = ""}{print $1}' | base64)"
             tag=${tag//\//a_a} # original escape of base64 `/`
             tag=${tag//+/b_b} # original escape of base64 `+`
             tag=${tag//=/c_c} # original escape of base64 `+`
             # get rest statement
-            local fzf_res_rest=$(echo ${fzf_res} | awk -F ${PMY_TAG_DELIMITER} '{for(i=2;i<NF;i++){printf("%s%s",$i,OFS=" ")}print $NF}')
-            # get after command
-            local after_cmd_variable="__pmy_out_${tag}_after"
-            local after_cmd=$(eval echo \$$after_cmd_variable)
-            local res=$(echo ${fzf_res_rest} | eval ${after_cmd})
-        elif [[ -z ${__pmy_out_magic_out} ]] then
-            # get result from fzf
-            local fzf_res=$(eval "${__pmy_out_imm_cmd}" | eval ${fuzzy_finder_cmd})
-            local after_cmd=${__pmy_out_imm_after_cmd}
-            local res=$(echo ${fzf_res} | eval ${after_cmd})
+            local fzf_res=$(echo ${fzf_res_tag_included} | awk -F ${PMY_TAG_DELIMITER} '{for(i=2;i<NF;i++){printf("%s%s",$i,OFS=" ")}print $NF}')
         else
-            local fzf_res=$(echo "${__pmy_out_magic_out}" | eval ${fuzzy_finder_cmd})
-            local after_cmd=${__pmy_out_magic_after_cmd}
-            local res=$(echo ${fzf_res} | eval ${after_cmd})
+            local fzf_res=${fzf_res_tag_included}
+            local tag=""
         fi
+        # get after command
+        local after_cmd_variable="__pmy_out_${tag}_after"
+        local after_cmd=$(eval echo \$$after_cmd_variable)
+        local res=$(echo ${fzf_res} | eval ${after_cmd})
         __pmy_res_lbuffer="${__pmy_out_buffer_left}${res}"
         __pmy_res_rbuffer="${__pmy_out_buffer_right}"
     fi
diff --git a/src/cmd.go b/src/cmd.go
diff --git a/src/magic.go b/src/magic.go
diff --git a/src/out.go b/src/out.go
diff --git a/src/utils/string.go b/src/utils/string.go

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (c pmyTestCase) testSelf(t testing.T) (bool, error) {`
`44`	`44`	`return true, nil`
`45`	`45`	`}`
`46`	`46`	`fmt.Printf(`
`47`		`- "[%v] fail\nexpectd: %v\nactual: %v\n",`
	`47`	`+ "[%v] fail\nexpected: %v\nactual : %v\n",`
`48`	`48`	`color.RedString("✘"),`
`49`	`49`	`c.Expected,`
`50`	`50`	`res,`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"after": "awk '{print $1}' \| sed -e 's/=.*/=/g'"`
`9`	`9`	`}`
`10`	`10`	`],`
`11`		`- "fuzzyFinderCmd": "fzf -0 -1 -q \"<query>\"",`
	`11`	`+ "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"<query>\"",`
`12`	`12`	`"bufferLeft": "fzf <body>",`
`13`	`13`	`"bufferRight": "[]"`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`"regexpLeft": "(?P<body>.?)(?P<path>~{0,1}([A-Za-z_\\-.]/))\\\\*$",`
`4`	`4`	`"cmdGroups": [`
`5`	`5`	`{`
`6`		`- "tag": "",`
`7`	`6`	`"stmt": "bfind <path>",`
`8`	`7`	`"after": "awk '{print $0}'"`
`9`	`8`	`}`
`@@ -15,7 +14,6 @@`
`15`	`14`	`"regexpLeft": "^(?P<num>[1-9][0-9]*).for$",`
`16`	`15`	`"cmdGroups": [`
`17`	`16`	`{`
`18`		`- "tag": "",`
`19`	`17`	`"stmt": "echo ''",`
`20`	`18`	`"after": "awk '{print $0}'"`
`21`	`19`	`}`
`@@ -27,7 +25,6 @@`
`27`	`25`	`"regexpLeft": "(?P<cmd>.+)\\.for$",`
`28`	`26`	`"cmdGroups": [`
`29`	`27`	`{`
`30`		`- "tag": "",`
`31`	`28`	`"stmt": "echo ''",`
`32`	`29`	`"after": "awk '{print $0}'"`
`33`	`30`	`}`
`@@ -39,25 +36,23 @@`
`39`	`36`	`"regexpLeft": "^(?P<body>.?)(?P<path>~{0,1}([A-Za-z_\\-.]/)+)(?P<query>[A-Za-z_\\-.]*)$",`
`40`	`37`	`"cmdGroups": [`
`41`	`38`	`{`
`42`		`- "tag": "",`
`43`	`39`	`"stmt": "command ls -AF -1 <path>",`
`44`	`40`	`"after": "awk '{print $0}'"`
`45`	`41`	`}`
`46`	`42`	`],`
`47`		`- "fuzzyFinderCmd": "fzf -0 -1 -q \"^<query> \"",`
	`43`	`+ "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"^<query> \"",`
`48`	`44`	`"bufferLeft": "<body><path>",`
`49`	`45`	`"bufferRight": "[]"`
`50`	`46`	`},`
`51`	`47`	`{`
`52`	`48`	`"regexpLeft": "^(?P<body>.?) (?P<query>[A-Za-z_\\-.])$",`
`53`	`49`	`"cmdGroups": [`
`54`	`50`	`{`
`55`		`- "tag": "",`
`56`	`51`	`"stmt": "command ls -AF -1",`
`57`	`52`	`"after": "awk '{print $0}'"`
`58`	`53`	`}`
`59`	`54`	`],`
`60`		`- "fuzzyFinderCmd": "fzf -0 -1 -q \"^<query> \"",`
	`55`	`+ "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"^<query> \"",`
`61`	`56`	`"bufferLeft": "<body> ",`
`62`	`57`	`"bufferRight": "[]"`
`63`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "lbuffer": "git checkout ",`
	`3`	`+ "lbuffer": "git checkout mas",`
`4`	`4`	`"rbuffer": "",`
`5`	`5`	`"expected": "git checkout master"`
`6`	`6`	`},`