feat(prompt): 切换 提示库

切换 提示库

Signed-off-by: mritd <[email protected]>

Author: mritd

glide.lock

@@ -30,11 +30,6 @@ import:
   version: d14193dfc626125c831501c1c42340b4248e1f5a
 - package: github.com/magiconair/properties
   version: 2c9e9502788518c97fe44e8955cd069417ee89df
-- package: github.com/manifoldco/promptui
-  version: 8debffa8c66b4342872ef0465eee2aa01481849d
-  subpackages:
-  - list
-  - screenbuf
 - package: github.com/mattn/go-colorable
   version: 7dc3415be66d7cc68bf0182f35c8d31f8d2ad8a7
 - package: github.com/mattn/go-isatty
@@ -43,8 +38,6 @@ import:
   version: b8bc1bf767474819792c23f32d8286a45736f1c6
 - package: github.com/mitchellh/mapstructure
   version: 00c29f56e2386353d58c599509e8dc3801b0d716
-- package: github.com/mritd/promptui
-  version: f94fc11da389d3982f37aedc33706ec7e265c9f4
 - package: github.com/pelletier/go-toml
   version: 05bcc0fb0d3e60da4b8dd5bd7e0ea563eb4ca943
 - package: github.com/russross/blackfriday

glide.yaml

@@ -8,9 +8,8 @@ import (
 	"text/template"
 
 	"github.com/mritd/gitflow-toolkit/pkg/consts"
-	gitprompt "github.com/mritd/gitflow-toolkit/pkg/prompt"
 	"github.com/mritd/gitflow-toolkit/pkg/util"
-	"github.com/mritd/promptui"
+	"github.com/mritd/promptx"
 	"github.com/pkg/errors"
 )
 
@@ -43,48 +42,37 @@ func SelectCommitType() consts.CommitType {
 		{Type: consts.PERF, ZHDescription: "性能优化", ENDescription: "Improving performance"},
 		{Type: consts.EXIT, ZHDescription: "退出", ENDescription: "Exit commit"},
 	}
-	templates := &promptui.SelectTemplates{
-		Label:    "{{ . }}",
-		Active:   "❯ {{ .Type | cyan }} ({{ .ENDescription | cyan }})",
-		Inactive: "  {{ .Type | white }} ({{ .ENDescription | white }})",
-		Selected: "{{ \"❯ Type:\" | green }} {{ .Type }}",
-		Details: `
+	cfg := &promptx.SelectConfig{
+		ActiveTpl:    "»  {{ .Type | cyan }} ({{ .ENDescription | cyan }})",
+		InactiveTpl:  "  {{ .Type | white }} ({{ .ENDescription | white }})",
+		SelectPrompt: "Commit Type",
+		SelectedTpl:  "{{ \"» Type:\" | green }} {{ .Type }}",
+		DisPlaySize:  9,
+		DetailsTpl: `
 --------- Commit Type ----------
 {{ "Type:" | faint }}	{{ .Type }}
 {{ "Description:" | faint }}	{{ .ZHDescription }}({{ .ENDescription }})`,
 	}
 
-	searcher := func(input string, index int) bool {
-		commitType := commitTypes[index]
-		cmType := strings.Replace(strings.ToLower(string(commitType.Type)), " ", "", -1)
-		input = strings.Replace(strings.ToLower(input), " ", "", -1)
-
-		return strings.Contains(cmType, input)
-	}
-
-	prompt := promptui.Select{
-		Label:     "Select Commit Type:",
-		Items:     commitTypes,
-		Templates: templates,
-		Size:      9,
-		Searcher:  searcher,
+	s := &promptx.Select{
+		Items:  commitTypes,
+		Config: cfg,
 	}
 
-	i, _, err := prompt.Run()
-	util.CheckAndExit(err)
+	idx := s.Run()
 
-	if commitTypes[i].Type == consts.EXIT {
+	if commitTypes[idx].Type == consts.EXIT {
 		fmt.Println("Talk is cheap. Show me the code.")
 		os.Exit(0)
 	}
 
-	return commitTypes[i].Type
+	return commitTypes[idx].Type
 }
 
 // 输入影响范围
 func InputScope() string {
 
-	p := gitprompt.NewDefaultPrompt(func(line []rune) error {
+	p := promptx.NewDefaultPrompt(func(line []rune) error {
 		if strings.TrimSpace(string(line)) == "" {
 			return errors.New("Input is empty!")
 		} else {
@@ -99,7 +87,7 @@ func InputScope() string {
 // 输入提交主题
 func InputSubject() string {
 
-	p := gitprompt.NewDefaultPrompt(func(line []rune) error {
+	p := promptx.NewDefaultPrompt(func(line []rune) error {
 		if strings.TrimSpace(string(line)) == "" {
 			return errors.New("Input is empty!")
 		} else if len(line) > 25 {
@@ -115,7 +103,7 @@ func InputSubject() string {
 // 输入完整提交信息
 func InputBody() string {
 
-	p := gitprompt.NewDefaultPrompt(func(line []rune) error {
+	p := promptx.NewDefaultPrompt(func(line []rune) error {
 		return nil
 	}, "Body:")
 
@@ -130,7 +118,7 @@ func InputBody() string {
 // 输入提交关联信息
 func InputFooter() string {
 
-	p := gitprompt.NewDefaultPrompt(func(line []rune) error {
+	p := promptx.NewDefaultPrompt(func(line []rune) error {
 		return nil
 	}, "Footer:")
 

pkg/commit/ci.go

@@ -11,11 +11,13 @@ import (
 	"github.com/mitchellh/go-homedir"
 	"github.com/mritd/gitflow-toolkit/pkg/consts"
 	"github.com/mritd/gitflow-toolkit/pkg/util"
-	"github.com/mritd/promptui"
+	"github.com/mritd/promptx"
 	"github.com/spf13/viper"
 	"github.com/xanzy/go-gitlab"
 )
 
+const EmptyErrorMassage = "Input is empty!"
+
 type Repository struct {
 	Contributor string
 	Token       string
@@ -30,58 +32,52 @@ func ConfigRepository() *Repository {
 
 	repo := Repository{}
 
-	validate := func(input string) error {
-		if strings.TrimSpace(input) == "" {
-			return errors.New("subject is blank")
+	// namespace/project
+	p := promptx.NewDefaultPrompt(func(line []rune) error {
+		if strings.TrimSpace(string(line)) == "" {
+			return errors.New(EmptyErrorMassage)
+		} else {
+			return nil
 		}
-		return nil
-	}
+	}, "Project(eg: namespace/project):")
 
-	templates := &promptui.PromptTemplates{
-		Prompt:  "{{ . }} ",
-		Valid:   "{{ . | green }} ",
-		Invalid: "{{ . | red }} ",
-		Success: "{{ . | bold }} ",
-	}
-
-	prompt := promptui.Prompt{
-		Label:     "❯ Project(eg: namespace/project):",
-		Templates: templates,
-		Validate:  validate,
-	}
-
-	project, err := prompt.Run()
-	util.CheckAndExit(err)
+	project := p.Run()
 	repo.Project = strings.ToLower(project)
 
-	prompt = promptui.Prompt{
-		Label:     "❯ Contributor(eg: mritd):",
-		Templates: templates,
-		Validate:  validate,
-	}
+	// Contributor
+	p = promptx.NewDefaultPrompt(func(line []rune) error {
+		if strings.TrimSpace(string(line)) == "" {
+			return errors.New(EmptyErrorMassage)
+		} else {
+			return nil
+		}
+	}, "Contributor(eg: mritd):")
 
-	contributor, err := prompt.Run()
-	util.CheckAndExit(err)
+	contributor := p.Run()
 	repo.Contributor = contributor
 
-	prompt = promptui.Prompt{
-		Label:     "❯ Token(eg: q6C49FK47WhU68ofb):",
-		Templates: templates,
-		Validate:  validate,
-	}
+	// Token
+	p = promptx.NewDefaultPrompt(func(line []rune) error {
+		if strings.TrimSpace(string(line)) == "" {
+			return errors.New(EmptyErrorMassage)
+		} else {
+			return nil
+		}
+	}, "Token(eg: q6C49FK47WhU68ofb):")
 
-	token, err := prompt.Run()
-	util.CheckAndExit(err)
+	token := p.Run()
 	repo.Token = token
 
-	prompt = promptui.Prompt{
-		Label:     "❯ Address(eg: https://github.com):",
-		Templates: templates,
-		Validate:  validate,
-	}
+	// Address
+	p = promptx.NewDefaultPrompt(func(line []rune) error {
+		if strings.TrimSpace(string(line)) == "" {
+			return errors.New(EmptyErrorMassage)
+		} else {
+			return nil
+		}
+	}, "Address(eg: https://github.com):")
 
-	address, err := prompt.Run()
-	util.CheckAndExit(err)
+	address := p.Run()
 	repo.Address = strings.ToLower(address)
 
 	if strings.Contains(repo.Address, "github.com") {
@@ -90,25 +86,18 @@ func ConfigRepository() *Repository {
 		repo.Type = consts.GitLabRepo
 	}
 
-	validate = func(input string) error {
-		if strings.TrimSpace(input) == "" {
+	// Automatic rebase
+	p = promptx.NewDefaultPrompt(func(line []rune) error {
+		if strings.TrimSpace(string(line)) == "" {
 			return errors.New("subject is blank")
 		}
-		if strings.ToLower(strings.TrimSpace(input)) != "y" && strings.ToLower(strings.TrimSpace(input)) != "n" {
+		if strings.ToLower(strings.TrimSpace(string(line))) != "y" && strings.ToLower(strings.TrimSpace(string(line))) != "n" {
 			return errors.New("only enter y or n")
 		}
 		return nil
-	}
+	}, "Automatic rebase before merge request?(y/n)")
 
-	prompt = promptui.Prompt{
-		Label:     "❯ Automatic rebase before merge request?(y/n)",
-		Templates: templates,
-		Validate:  validate,
-		IsVimMode: true,
-	}
-
-	autoRebase, err := prompt.Run()
-	util.CheckAndExit(err)
+	autoRebase := p.Run()
 
 	if strings.ToLower(strings.TrimSpace(autoRebase)) == "y" {
 		repo.AutoRebase = true
@@ -161,38 +150,25 @@ func (repo *Repository) XMr() {
 
 	lastCommitInfo := *util.GetLastCommitInfo()
 
-	validate := func(input string) error {
-		if strings.TrimSpace(input) == "" {
-			return errors.New("target branch is blank")
+	// Title
+	prompt := promptx.NewDefaultPrompt(func(line []rune) error {
+		if strings.TrimSpace(string(line)) == "" {
+			return errors.New("Title is blank!")
 		}
 		return nil
-	}
-
-	templates := &promptui.PromptTemplates{
-		Prompt:  "{{ . }} ",
-		Valid:   "{{ . | green }} ",
-		Invalid: "{{ . | red }} ",
-		Success: "{{ . | bold }} ",
-	}
-
-	prompt := promptui.Prompt{
-		Label:     "❯ Title(eg: fix(v0.0.1):fix a bug):",
-		Templates: templates,
-	}
+	}, "Title(eg: fix(v0.0.1):fix a bug):")
 
-	title, err := prompt.Run()
-	util.CheckAndExit(err)
+	title := prompt.Run()
 	if strings.TrimSpace(title) == "" {
 		title = lastCommitInfo[0]
 	}
 
-	prompt = promptui.Prompt{
-		Label:     "❯ Description(eg: Rollback etcd server version to 3.1.11):",
-		Templates: templates,
-	}
+	// Description
+	prompt = promptx.NewDefaultPrompt(func(line []rune) error {
+		return nil
+	}, "Description(eg: Rollback etcd server version to 3.1.11):")
 
-	desc, err := prompt.Run()
-	util.CheckAndExit(err)
+	desc := prompt.Run()
 
 	if strings.TrimSpace(desc) == "big" {
 		desc = util.OSEditInput()
@@ -202,15 +178,15 @@ func (repo *Repository) XMr() {
 		desc = lastCommitInfo[1]
 	}
 
-	prompt = promptui.Prompt{
-		Label:     "❯ Target Branch(eg: develop):",
-		Templates: templates,
-		Validate:  validate,
-	}
-
-	targetBranch, err := prompt.Run()
-	util.CheckAndExit(err)
+	// Target Branch
+	prompt = promptx.NewDefaultPrompt(func(line []rune) error {
+		if strings.TrimSpace(string(line)) == "" {
+			return errors.New("Target branch is blank!")
+		}
+		return nil
+	}, "Target Branch(eg: develop)")
 
+	targetBranch := prompt.Run()
 	sourceBranch := util.GetCurrentBranch()
 
 	if repo.AutoRebase {