Merge branch 'develop' of https://github.com/relastle/pmy into develop

relastle · relastle · commit 5e2fba80c761 · 2019-06-28T23:01:07.000+09:00
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Frelastle%2Fpmy.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Frelastle%2Fpmy?ref=badge_shield)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/b4d31630d2f64ef1892d74dcc2e3105e)](https://www.codacy.com/app/relastle/pmy?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=relastle/pmy&amp;utm_campaign=Badge_Grade)
 [![CircleCI](https://circleci.com/gh/relastle/pmy.svg?style=shield)](https://circleci.com/gh/relastle/pmy)
+[![Go Report Card](https://goreportcard.com/badge/github.com/relastle/pmy)](https://goreportcard.com/report/github.com/relastle/pmy)
 
 pmy is a highly customizable context-aware shell(zsh)-completion scheme utilizing fuzzy finder such as
 [fzf](https://github.com/junegunn/fzf).
@@ -13,17 +14,16 @@ 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.)
 
 ## :hammer: Installation
 
-First, please get pmy(backend system written in Go) using go get.
+First, please get pmy(backend system written in Go)
+and its dependency tool `taggo` using go get.
 ```sh
-go get -u github.com/relastle/pmy
+go get -u github.com/relastle/pmy github.com/relastle/taggo
 ```
 
 Then, source a zsh script which simply configure brief settings.
@@ -72,7 +72,7 @@ Rule unit is described as follows
 | ***cmdGroups.tag***   | tag string which will be inserted ahead of each line of outputs of the corresponding command.                |
 | ***cmdGroups.stmt***  | command that will be executed to make sources for fuzzy-finder.                                              |
 | ***cmdGroups.after*** | command that will be executed against line after fuzzy-finder selection (using pipe).                        |
-| ***fuzzyFinderCmd***  | Fuzzy finder command that will be excecuted (piped) against obtained command                                 |
+| ***fuzzyFinderCmd***  | Fuzzy finder command that will be executed (piped) against obtained command                                 |
 | ***bufferLeft***      | Buffer left values after completion. [] denotes the original left buffer.                                    |
 | ***bufferRight***     | Buffer right values after completion. [] denotes the original right buffer.                                  |
 
@@ -144,7 +144,7 @@ You can define such completion (with sub command description) in an very readabl
 | PMY_TRIGGER_KEY              | Trigger key that invokes pmy completion                                                              | '^ '                                                                     |
 | PMY_SNIPPET_ROOT             | The root directory in which pmy's snippets for magic command is located                              | "${GOPATH:-${HOME}/go}/src/github.com/relastle/pmy/snippets"             |
 
-If you want to change these values, you should export them in .zshrc before you excecute
+If you want to change these values, you should export them in .zshrc before you execute
 
 ```zsh
 source "${GOPATH:-${HOME}/go}/src/github.com/relastle/pmy/shell/pmy.zsh"
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -9,16 +9,14 @@ ENV SHELL /bin/zsh
 
 # Install fzf
 RUN go get -u github.com/junegunn/fzf
+RUN go get -u github.com/relastle/taggo
 
 
 # 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"
 
 
diff --git a/integration_test/integration_test.go b/integration_test/integration_test.go
@@ -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()
diff --git a/main.go b/main.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()
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
@@ -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": "[]"
+    }
+]
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": "[]"
     },
@@ -30,16 +28,21 @@
       "cmdGroups": [
         {
           "tag": "🌱:branch",
-          "stmt": "git branch --format=\"%(refname:short)\"",
+          "stmt": "git branch --format=\"%(refname:short)\" 2>/dev/null",
+          "after": "awk '{print $0}'"
+        },
+        {
+          "tag": "🔖:tag",
+          "stmt": "git tag 2>/dev/null",
           "after": "awk '{print $0}'"
         },
         {
           "tag": "🍺:commit",
-          "stmt": "git log --oneline -30",
+          "stmt": "git log --oneline -30 --color 2>/dev/null",
           "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,24 @@
       "regexpLeft": "^(?P<body>.*?)(?P<path>~{0,1}([A-Za-z_\\-.]*/)+)(?P<query>[A-Za-z_\\-.]*)$",
       "cmdGroups": [
         {
-          "tag": "",
-          "stmt":  "command ls -aF -1 <path>",
+          "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>.*?) $",
+      "regexpLeft": "^(?P<body>.*?) (?P<query>[A-Za-z_\\-.]*)$",
       "cmdGroups": [
         {
-          "tag": "",
-          "stmt":  "bfind .",
+          "stmt":  "command ls -AF -1",
           "after": "awk '{print $0}'"
         }
       ],
-      "bufferLeft": "[]",
+      "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/snippets/fzf/option.txt b/snippets/fzf/option.txt
@@ -0,0 +1,47 @@
+-x  --extended        Extended-search mode (enabled by default; +x or --no-extended to disable)
+-e  --exact           Enable Exact-match
+--algo=TYPE           Fuzzy matching algorithm: [v1|v2] (default: v2)
+-i                    Case-insensitive match (default: smart-case match)
++i                    Case-sensitive match
+--literal             Do not normalize latin script letters before matching
+-n  --nth=N[,..]      Comma-separated list of field index expressions for limiting search scope. Each can be a non-zero integer or a range expression ([BEGIN]..[END]).
+--with-nth=N[,..]     Transform the presentation of each line using field index expressions
+-d  --delimiter=STR   Field delimiter regex (default: AWK-style)
++s  --no-sort         Do not sort the result
+--tac                 Reverse the order of the input
+--tiebreak=CRI[,..]   Comma-separated list of sort criteria to apply when the scores are tied [length|begin|end|index] (default: length)
+-m  --multi           Enable multi-select with tab/shift-tab
+--no-mouse            Disable mouse
+--bind=KEYBINDS       Custom key bindings. Refer to the man page.
+--cycle               Enable cyclic scroll
+--no-hscroll          Disable horizontal scroll
+--hscroll-off=COL     Number of screen columns to keep to the right of the highlighted substring (default: 10)
+--filepath-word       Make word-wise movements respect path separators
+--jump-labels=CHARS   Label characters for jump and jump-accept
+--height=HEIGHT[%]    Display fzf window below the cursor with the given height instead of using fullscreen
+--min-height=HEIGHT   Minimum height when --height is given in percent (default: 10)
+--layout=LAYOUT       Choose layout: [default|reverse|reverse-list]
+--border              Draw border above and below the finder
+--margin=MARGIN       Screen margin (TRBL / TB,RL / T,RL,B / T,R,B,L)
+--inline-info         Display finder info inline with the query
+--prompt=STR          Input prompt (default: '> ')
+--header=STR          String to print as header
+--header-lines=N      The first N lines of the input are treated as header
+--ansi                Enable processing of ANSI color codes
+--tabstop=SPACES      Number of spaces for a tab character (default: 8)
+--color=COLSPEC       Base scheme (dark|light|16|bw) and/or custom colors
+--no-bold             Do not use bold text
+--history=FILE        History file
+--history-size=N      Maximum number of history entries (default: 1000)
+--preview=COMMAND     Command to preview highlighted line ({})
+--preview-window=OPT  Preview window layout (default: right:50%) [up|down|left|right][:SIZE[%]][:wrap][:hidden]
+-q  --query=STR       Start the finder with the given query
+-1  --select-1        Automatically select the only match
+-0  --exit-0          Exit immediately when there's no match
+-f  --filter=STR      Filter mode. Do not start interactive finder.
+--print-query         Print query as the first line
+--expect=KEYS         Comma-separated list of keys to complete fzf
+--read0               Read input delimited by ASCII NUL characters
+--print0              Print output delimited by ASCII NUL characters
+--sync                Synchronous search for multi-staged filtering
+--version             Display version information and exit
diff --git a/src/cmd.go b/src/cmd.go
diff --git a/src/core.go b/src/core.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
`@@ -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,24 @@`
`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`		`- "stmt": "command ls -aF -1 <path>",`
	`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`		`- "regexpLeft": "^(?P<body>.*?) $",`
	`48`	`+ "regexpLeft": "^(?P<body>.?) (?P<query>[A-Za-z_\\-.])$",`
`53`	`49`	`"cmdGroups": [`
`54`	`50`	`{`
`55`		`- "tag": "",`
`56`		`- "stmt": "bfind .",`
	`51`	`+ "stmt": "command ls -AF -1",`
`57`	`52`	`"after": "awk '{print $0}'"`
`58`	`53`	`}`
`59`	`54`	`],`
`60`		`- "bufferLeft": "[]",`
	`55`	`+ "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"^<query> \"",`
	`56`	`+ "bufferLeft": "<body> ",`
`61`	`57`	`"bufferRight": "[]"`
`62`	`58`	`}`
`63`	`59`	`]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"after": "awk '{print $0}'"`
`9`	`9`	`}`
`10`	`10`	`],`
`11`		`- "fuzzyFinderCmd": "fzf -0 -1 -q \"<query>\"",`
	`11`	`+ "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"<query>\"",`
`12`	`12`	`"bufferLeft": "<body> ",`
`13`	`13`	`"bufferRight": "[]"`
`14`	`14`	`},`
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`	`},`