feat(push): add git ps command

add git ps command

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

Author: mritd

cmd/ps.go

@@ -0,0 +1,39 @@
+// Copyright © 2018 mritd <[email protected]>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package cmd
+
+import (
+	"github.com/mritd/gitflow-toolkit/pkg/util"
+	"github.com/spf13/cobra"
+)
+
+func NewPs() *cobra.Command {
+	return &cobra.Command{
+		Use:   "ps",
+		Short: "推送本地分支",
+		Long: `
+将本地分支推送到远程`,
+		Aliases: []string{"git-ps"},
+		Run: func(cmd *cobra.Command, args []string) {
+			util.Push()
+		},
+	}
+}

cmd/root.go

@@ -62,6 +62,7 @@ func init() {
 	RootCmd.AddCommand(NewChore())
 	RootCmd.AddCommand(NewInstall())
 	RootCmd.AddCommand(NewUninstall())
+	RootCmd.AddCommand(NewPs())
 }
 
 func initConfig() {

main.go

@@ -41,7 +41,6 @@ func commandFor(basename string, rootCommand *cobra.Command) *cobra.Command {
 }
 
 func main() {
-
 	basename := filepath.Base(os.Args[0])
 	util.CheckAndExit(commandFor(basename, cmd.RootCmd).Execute())
 }

pkg/util/common.go

@@ -59,6 +59,7 @@ func BinPaths() *[]string {
 		InstallBaseDir + "/git-hotfix",
 		InstallBaseDir + "/git-xmr",
 		InstallBaseDir + "/git-xpr",
+		InstallBaseDir + "/git-ps",
 	}
 }
 
@@ -78,18 +79,17 @@ func CheckAndExit(err error) {
 
 func MustExec(name string, arg ...string) {
 	cmd := exec.Command(name, arg...)
-	b, err := cmd.CombinedOutput()
-	if err != nil {
-		fmt.Println(string(b))
-		os.Exit(1)
-	}
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	CheckAndExit(cmd.Run())
 }
 
 func MustExecRtOut(name string, arg ...string) string {
 	cmd := exec.Command(name, arg...)
-	b, err := cmd.CombinedOutput()
+	b, err := cmd.Output()
 	if err != nil {
-		fmt.Println(string(b))
+		fmt.Print(err)
 		os.Exit(1)
 	}
 	return string(b)
@@ -102,9 +102,6 @@ func MustExecNoOut(name string, arg ...string) {
 
 func TryExec(name string, arg ...string) error {
 	cmd := exec.Command(name, arg...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
 	return cmd.Run()
 }
 
@@ -144,11 +141,7 @@ func OSEditInput() string {
 	}
 
 	// 执行编辑文件
-	cmd := exec.Command(editor, f.Name())
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	CheckAndExit(cmd.Run())
+	MustExec(editor, f.Name())
 	raw, err := ioutil.ReadFile(f.Name())
 	CheckAndExit(err)
 	input := string(bytes.TrimPrefix(raw, bom))

pkg/util/git.go

@@ -45,3 +45,7 @@ func Rebase(sourceBranch string, targetBranch string) {
 func Checkout(prefix consts.CommitType, branch string) {
 	MustExec(consts.GitCmd, "checkout", "-b", string(prefix)+"/"+branch)
 }
+
+func Push() {
+	MustExec(consts.GitCmd, "push", "origin", strings.TrimSpace(GetCurrentBranch()))
+}