Merge main into sweep/add-sweep-config

app/helpers/git-helpers.go

@@ -1,13 +1,28 @@
-package githelpers
+package helpers
 
 import (
 	"bufio"
 	"bytes"
 	"fmt"
+	"os"
 	"os/exec"
 	"strings"
+
+	"github.com/permafrost-dev/git-ninja/app/utils"
 )
 
+func RunCommandOnStdout(command string, args ...string) error {
+	cmd := exec.Command(command, args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func GetLastCheckedoutBranchName() (string, error) {
 	var out bytes.Buffer
 
@@ -37,3 +52,42 @@ func GetLastCheckedoutBranchName() (string, error) {
 
 	return "", fmt.Errorf("no checkout entries found")
 }
+
+func GetCurrentBranchName() (string, error) {
+	result, err := utils.RunCommand("git", "branch", "--show-current")
+	result = strings.TrimSpace(result)
+
+	if strings.Contains(result, " ") {
+		return "", fmt.Errorf(result)
+	}
+
+	return result, err
+}
+
+func BranchExists(name string) (bool, error) {
+	var out bytes.Buffer
+
+	cmd := exec.Command("git", "branch", "--list")
+	cmd.Stdout = &out
+
+	if err := cmd.Run(); err != nil {
+		return false, err
+	}
+
+	// Scan through each line of output
+	scanner := bufio.NewScanner(strings.NewReader(out.String()))
+	for scanner.Scan() {
+		line := strings.TrimSpace(scanner.Text())
+		line = strings.TrimPrefix(line, "* ")
+
+		if strings.EqualFold(line, name) {
+			return true, nil
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return false, err
+	}
+
+	return false, nil
+}

app/utils/utils.go

@@ -0,0 +1,16 @@
+package utils
+
+import (
+	"os/exec"
+	"strings"
+)
+
+func RunCommand(command string, args ...string) (string, error) {
+	cmd := exec.Command(command, args...)
+	result, err := cmd.Output()
+	if err != nil {
+		return "", err
+	}
+
+	return strings.TrimSpace(string(result)), nil
+}

cmd/branchCurrent.go

@@ -0,0 +1,39 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/permafrost-dev/git-ninja/app/helpers"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	pushFlag := false
+	pullFlag := false
+
+	cmd := &cobra.Command{
+		Use:   "branch:current",
+		Short: "Work with the current branch or return the current branch name",
+		Args:  cobra.NoArgs,
+		Run: func(cmd *cobra.Command, args []string) {
+			branchName, _ := helpers.GetCurrentBranchName()
+
+			if pushFlag {
+				helpers.RunCommandOnStdout("git", "push", "origin", branchName)
+				return
+			}
+
+			if pullFlag {
+				helpers.RunCommandOnStdout("git", "pull", "origin", branchName, "--rebase")
+				return
+			}
+
+			fmt.Println(branchName)
+		},
+	}
+
+	cmd.Flags().BoolVarP(&pushFlag, "push", "p", false, "push the current branch to origin")
+	cmd.Flags().BoolVarP(&pullFlag, "pull", "u", false, "pull the current branch from origin and rebase")
+
+	rootCmd.AddCommand(cmd)
+}

cmd/branchExists.go

@@ -0,0 +1,28 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/permafrost-dev/git-ninja/app/helpers"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(&cobra.Command{
+		Use:   "branch:exists [name]",
+		Short: "Check if the given branch name exists",
+		Run: func(cmd *cobra.Command, args []string) {
+			if len(args) < 1 {
+				fmt.Println("error: branch name required")
+				return
+			}
+
+			if exists, _ := helpers.BranchExists(args[0]); !exists {
+				os.Exit(1)
+			}
+
+			os.Exit(0)
+		},
+	})
+}

cmd/branchLast.go

@@ -0,0 +1,19 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/permafrost-dev/git-ninja/app/helpers"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(&cobra.Command{
+		Use:   "branch:last",
+		Short: "Show the last checked out branch name",
+		Run: func(cmd *cobra.Command, args []string) {
+			branchName, _ := helpers.GetLastCheckedoutBranchName()
+			fmt.Println(branchName)
+		},
+	})
+}

cmd/pushCUrrentBranch.go

@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"fmt"
+	"os/exec"
+
+	"github.com/permafrost-dev/git-ninja/app/helpers"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	rootCmd.AddCommand(&cobra.Command{
+		Use:   "branch:current:push",
+		Short: "Push the current branch to origin",
+		Run: func(c *cobra.Command, args []string) {
+			branch, err := helpers.GetCurrentBranchName()
+
+			if err != nil {
+				fmt.Println(err)
+				return
+			}
+
+			exec.Command("git", "push", "origin", branch).Run()
+		},
+	})
+}

go.mod

@@ -1,11 +1,13 @@
-module github.com/vendor-name/git-ninja
+module github.com/permafrost-dev/git-ninja
 
 go 1.19
 
-require github.com/blang/semver v3.5.1+incompatible
+require (
+	github.com/blang/semver v3.5.1+incompatible
+	github.com/spf13/cobra v1.8.0
+)
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/cobra v1.8.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 )

main.go

@@ -1,10 +1,9 @@
 /*
 Copyright © 2023 NAME HERE <EMAIL ADDRESS>
-
 */
 package main
 
-import "github.com/vendor-name/git-ninja/cmd"
+import "github.com/permafrost-dev/git-ninja/cmd"
 
 func main() {
 	cmd.Execute()