refactor(all): refactor code

refactor code

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

Author: mritd

apps.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"fmt"
+	tea "github.com/charmbracelet/bubbletea"
+	"time"
 
 	"github.com/urfave/cli/v2"
 )
@@ -11,7 +13,7 @@ var mainApp = &cli.App{
 	Usage:                "Git Flow ToolKit",
 	Version:              fmt.Sprintf("%s %s %s", version, buildDate, commitID),
 	Authors:              []*cli.Author{{Name: "mritd", Email: "[email protected]"}},
-	Copyright:            "Copyright (c) 2020 mritd, All rights reserved.",
+	Copyright:            "Copyright (c) " + time.Now().Format("2006") + " mritd, All rights reserved.",
 	EnableBashCompletion: true,
 	Action: func(c *cli.Context) error {
 		return cli.ShowAppHelp(c)
@@ -44,7 +46,7 @@ func newBranchApp(ct string) *cli.App {
 		UsageText:            fmt.Sprintf("git %s BRANCH", ct),
 		Version:              fmt.Sprintf("%s %s %s", version, buildDate, commitID),
 		Authors:              []*cli.Author{{Name: "mritd", Email: "[email protected]"}},
-		Copyright:            "Copyright (c) 2020 mritd, All rights reserved.",
+		Copyright:            "Copyright (c) " + time.Now().Format("2006") + " mritd, All rights reserved.",
 		EnableBashCompletion: true,
 		Action: func(c *cli.Context) error {
 			if c.NArg() != 1 {
@@ -66,13 +68,23 @@ func commitApp() *cli.App {
 		UsageText:            "git ci",
 		Version:              fmt.Sprintf("%s %s %s", version, buildDate, commitID),
 		Authors:              []*cli.Author{{Name: "mritd", Email: "[email protected]"}},
-		Copyright:            "Copyright (c) 2020 mritd, All rights reserved.",
+		Copyright:            "Copyright (c) " + time.Now().Format("2006") + " mritd, All rights reserved.",
 		EnableBashCompletion: true,
 		Action: func(c *cli.Context) error {
 			if c.NArg() != 0 {
 				return cli.ShowAppHelp(c)
 			}
-			return runCommit()
+
+			m := model{
+				views: []tea.Model{
+					newSelectorModel(),
+					newInputsModel(),
+					newSpinnerModel(),
+					newResultModel(),
+				},
+			}
+
+			return tea.NewProgram(&m).Start()
 		},
 	}
 }
@@ -84,7 +96,7 @@ func checkMessageApp() *cli.App {
 		UsageText:            "commit-msg FILE",
 		Version:              fmt.Sprintf("%s %s %s", version, buildDate, commitID),
 		Authors:              []*cli.Author{{Name: "mritd", Email: "[email protected]"}},
-		Copyright:            "Copyright (c) 2020 mritd, All rights reserved.",
+		Copyright:            "Copyright (c) " + time.Now().Format("2006") + " mritd, All rights reserved.",
 		EnableBashCompletion: true,
 		Action: func(c *cli.Context) error {
 			if c.NArg() != 1 {
@@ -102,7 +114,7 @@ func pushApp() *cli.App {
 		UsageText:            "git ps",
 		Version:              fmt.Sprintf("%s %s %s", version, buildDate, commitID),
 		Authors:              []*cli.Author{{Name: "mritd", Email: "[email protected]"}},
-		Copyright:            "Copyright (c) 2020 mritd, All rights reserved.",
+		Copyright:            "Copyright (c) " + time.Now().Format("2006") + " mritd, All rights reserved.",
 		EnableBashCompletion: true,
 		Action: func(c *cli.Context) error {
 			if c.NArg() != 0 {

common.go

@@ -4,10 +4,12 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	tea "github.com/charmbracelet/bubbletea"
+	"io"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"regexp"
+	"runtime"
 	"strings"
 )
 
@@ -16,12 +18,12 @@ func createBranch(name string) error {
 	if err != nil {
 		return fmt.Errorf("the current directory is not a git repository")
 	}
-	return gitCommand(os.Stdout, []string{"checkout", "-b", name})
+	return gitCommand(os.Stdout, "checkout", "-b", name)
 }
 
 func hasStagedFiles() error {
 	var buf bytes.Buffer
-	err := gitCommand(&buf, []string{"diff", "--cached", "--name-only"})
+	err := gitCommand(&buf, "diff", "--cached", "--name-only")
 	if err != nil {
 		return err
 	}
@@ -33,7 +35,7 @@ func hasStagedFiles() error {
 
 func currentBranch() (string, error) {
 	var buf bytes.Buffer
-	err := gitCommand(&buf, []string{"symbolic-ref", "--short", "HEAD"})
+	err := gitCommand(&buf, "symbolic-ref", "--short", "HEAD")
 	if err != nil {
 		return "", err
 	}
@@ -50,7 +52,7 @@ func push() error {
 	if err != nil {
 		return err
 	}
-	return gitCommand(os.Stdout, []string{"push", "origin", branch})
+	return gitCommand(os.Stdout, "push", "origin", branch)
 }
 
 func commitMessageCheck(f string) error {
@@ -68,25 +70,7 @@ func commitMessageCheck(f string) error {
 	return nil
 }
 
-func runCommit() error {
-	err := repoCheck()
-	if err != nil {
-		return fmt.Errorf("the current directory is not a git repository")
-	}
-
-	m := model{
-		views: []tea.Model{
-			newSelectorModel(),
-			newInputsModel(),
-			newSpinnerModel(),
-			newResultModel(),
-		},
-	}
-
-	return tea.NewProgram(&m).Start()
-}
-
-func execCommit(msg commitMsg) error {
+func commit(msg commitMsg) error {
 	if err := hasStagedFiles(); err != nil {
 		return err
 	}
@@ -110,28 +94,28 @@ func execCommit(msg commitMsg) error {
 	}
 
 	var errBuf bytes.Buffer
-	err = gitCommand(&errBuf, []string{"commit", "-F", f.Name()})
+	err = gitCommand(&errBuf, "commit", "-F", f.Name())
 	if err != nil {
 		return errors.New(strings.TrimSpace(errBuf.String()))
 	}
 
 	return nil
 }
 
-func createSOB() string {
+func createSOB() (string, error) {
 	name, email, err := gitAuthor()
 	if err != nil {
-		panic(err)
+		return "", err
 	}
-	return fmt.Sprintf("Signed-off-by: %s %s", name, email)
+	return fmt.Sprintf("Signed-off-by: %s %s", name, email), nil
 }
 
 func gitAuthor() (string, string, error) {
 	name := "Undefined"
 	email := "Undefined"
 
 	var buf bytes.Buffer
-	err := gitCommand(&buf, []string{"var", "GIT_AUTHOR_IDENT"})
+	err := gitCommand(&buf, "var", "GIT_AUTHOR_IDENT")
 	if err != nil {
 		return "", "", err
 	}
@@ -147,5 +131,30 @@ func gitAuthor() (string, string, error) {
 }
 
 func repoCheck() error {
-	return gitCommand(ioutil.Discard, []string{"rev-parse", "--show-toplevel"})
+	var buf bytes.Buffer
+	err := gitCommand(&buf, "rev-parse", "--show-toplevel")
+	if err != nil {
+		return errors.New(strings.TrimSpace(buf.String()))
+	}
+	return nil
+}
+
+func gitCommand(out io.Writer, cmds ...string) error {
+	var cmd *exec.Cmd
+	switch runtime.GOOS {
+	case "windows":
+		cmd = exec.Command("git.exe", cmds...)
+	case "linux", "darwin":
+		cmd = exec.Command("git", cmds...)
+	default:
+		return fmt.Errorf("unsupported platform")
+	}
+
+	cmd.Stdin = os.Stdin
+	if out != nil {
+		cmd.Stdout = out
+		cmd.Stderr = out
+	}
+
+	return cmd.Run()
 }

git_wapper.go

@@ -50,7 +50,7 @@ func install(dir string) error {
 			},
 			func() (string, error) {
 				// ignore unset failed error
-				_ = gitCommand(ioutil.Discard, []string{"config", "--global", "--unset", "core.hooksPath"})
+				_ = gitCommand(ioutil.Discard, "config", "--global", "--unset", "core.hooksPath")
 				return "✔ Unset commit hooks...", nil
 			},
 			func() (string, error) {
@@ -109,7 +109,7 @@ func install(dir string) error {
 			//	return "✔ Set commit hooks...", nil
 			//},
 			func() (string, error) {
-				err := gitCommand(ioutil.Discard, []string{"test"})
+				err := gitCommand(ioutil.Discard, "test")
 				if err != nil {
 					return "", fmt.Errorf("💔 install failed: %s", err)
 				}
@@ -163,11 +163,11 @@ func uninstall(dir string) error {
 			},
 			func() (string, error) {
 				// ignore unset failed error
-				_ = gitCommand(ioutil.Discard, []string{"config", "--global", "--unset", "core.hooksPath"})
+				_ = gitCommand(ioutil.Discard, "config", "--global", "--unset", "core.hooksPath")
 				return "✔ Unset commit hooks...", nil
 			},
 			func() (string, error) {
-				err := gitCommand(ioutil.Discard, []string{"test"})
+				err := gitCommand(ioutil.Discard, "test")
 				if err == nil {
 					return "", fmt.Errorf("💔 uninstall failed: %s", err)
 				}

install.go

@@ -54,13 +54,13 @@ func (m model) Init() tea.Cmd {
 func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg.(type) {
 	case done: // If the view returns a done message, it means that the stage has been processed
-		// Copy error
 		m.err = msg.(done).err
-		if m.err == nil {
+		// If there is error in msg, immediately display an error message and exit
+		if m.err != nil {
+			m.viewIndex = RESULT
+		} else {
 			// Call the next view
 			m.viewIndex++
-		} else {
-			m.viewIndex = RESULT
 		}
 
 		// some special views need to determine the state of the data to update
@@ -84,13 +84,18 @@ func (m model) View() string {
 }
 
 func (m model) commit() tea.Msg {
+	sob, err := createSOB()
+	if err != nil {
+		return done{err: err}
+	}
+
 	return commitMsg{
 		Type:    m.views[SELECTOR].(selectorModel).choice,
 		Scope:   m.views[INPUTS].(inputsModel).inputs[0].Value(),
 		Subject: m.views[INPUTS].(inputsModel).inputs[1].Value(),
 		Body:    m.views[INPUTS].(inputsModel).inputs[2].Value(),
 		Footer:  m.views[INPUTS].(inputsModel).inputs[3].Value(),
-		SOB:     createSOB(),
+		SOB:     sob,
 	}
 }
 

ui.go

@@ -50,7 +50,7 @@ func (m spinnerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.spinner, cmd = m.spinner.Update(spinner.Tick())
 		return m, tea.Batch(cmd, func() tea.Msg {
 			time.Sleep(500 * time.Millisecond)
-			return done{err: execCommit(msg)}
+			return done{err: commit(msg)}
 		})
 	default:
 		var cmd tea.Cmd

ui_spinner.go

@@ -1 +1 @@
-v2.0.1
+v2.1.0