Merge pull request #12 from relastle/develop

Make all command execution online 🎉

Author: relastle

.gitignore

@@ -1,2 +1,5 @@
 pmy
 tags
+
+# Mypy cache directory
+.mypy_cache/

README.md

@@ -14,9 +14,7 @@ I'm fully in love with fzf, and I think [zsh's completion system](http://zsh.sou
 
 -   [fzf](https://github.com/junegunn/fzf) (You can of course use other fuzzy finder such as [peco](https://github.com/peco/peco) and [fzy](https://github.com/jhawthorn/fzy) instead of fzf.)
 -   [go](https://github.com/golang/go)
-    -   [go-shellwords](https://github.com/mattn/go-shellwords)
-    -   [go-pipeline](https://github.com/mattn/go-pipeline)
-    -   [color](https://github.com/fatih/color) (Used in test)
+    -   [color](https://github.com/fatih/color)
 
 -   awk (available in almost all environment.)
 

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()
+}

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 {
+	}
+}

cmd/taggo/taggo

@@ -13,12 +13,9 @@ RUN go get -u github.com/junegunn/fzf
 
 # Install pmy
 WORKDIR /go/src/github.com/relastle/pmy
-RUN go get \
-        github.com/mattn/go-shellwords \
-        github.com/mattn/go-pipeline \
-        github.com/fatih/color
+RUN go get github.com/fatih/color
 COPY . .
-RUN go build
+RUN go install ./...
 RUN ln -s "/go/src/github.com/relastle/pmy/shell/zshrc.minimal" "${HOME}/.zshrc"
 
 

docker/Dockerfile

@@ -9,6 +9,7 @@ import (
 	"os/exec"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/fatih/color"
 )
@@ -19,7 +20,8 @@ type pmyTestCase struct {
 	Expected string `json:"expected"`
 }
 
-func (c *pmyTestCase) testSelf() (bool, error) {
+func (c *pmyTestCase) testSelf(t *testing.T) (bool, error) {
+	start := time.Now()
 	out, err := exec.Command(
 		"../shell/pmy_wrapper.zsh",
 		c.Lbuffer,
@@ -32,15 +34,17 @@ func (c *pmyTestCase) testSelf() (bool, error) {
 
 	res := strings.Replace(string(out), "\n", "", -1)
 	if res == c.Expected {
+		elapsed := time.Since(start)
 		fmt.Printf(
-			"[%v] pass; res: %v\n",
+			"[%v] pass; {res: %v, elapsed: %v}\n",
 			color.GreenString("●"),
 			res,
+			elapsed,
 		)
 		return true, nil
 	}
 	fmt.Printf(
-		"[%v] fail\nexpectd: %v\nactual: %v\n",
+		"[%v] fail\nexpected: %v\nactual  : %v\n",
 		color.RedString("✘"),
 		c.Expected,
 		res,
@@ -73,7 +77,7 @@ func TestIntegration(t *testing.T) {
 	byteValue, _ := ioutil.ReadAll(jsonFile)
 	json.Unmarshal(byteValue, &cases)
 	for _, c := range cases {
-		if ok, err := c.testSelf(); ok {
+		if ok, err := c.testSelf(t); ok {
 			continue
 		} else if err == nil {
 			t.Fail()

integration_test/integration_test.go

@@ -7,9 +7,12 @@ import (
 	pmy "github.com/relastle/pmy/src"
 )
 
+var (
+	bufferLeft  string
+	bufferRight string
+)
+
 func main() {
-	var bufferLeft string
-	var bufferRight string
 	flag.StringVar(&bufferLeft, "bufferLeft", "", "")
 	flag.StringVar(&bufferRight, "bufferRight", "", "")
 	flag.Parse()

main.go

@@ -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": "[]"
     }

rules/cf_pmy_rules.json

@@ -0,0 +1,15 @@
+[
+    {
+      "regexpLeft": "^fzf (?P<body>.*)(-|--)(?P<query>.*)$",
+      "cmdGroups": [
+        {
+          "tag": "",
+          "stmt": "%fzf/option",
+          "after": "awk '{print $1}' | sed -e 's/=.*/=/g'"
+        }
+      ],
+      "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"<query>\"",
+      "bufferLeft": "fzf <body>",
+      "bufferRight": "[]"
+    }
+]