add verify of repository state

cmd/bump/flags.go

@@ -4,5 +4,7 @@ var (
 	DebugFlag *bool
 	QuietFlag *bool
 	DryRun    *bool
+	NoVerify  *bool
+	NoFetch   *bool
 	Prefix    *string
 )

cmd/bump/helper.go

@@ -1,6 +1,7 @@
 package bump
 
 import (
+	"errors"
 	"sort"
 )
 
@@ -37,3 +38,32 @@ func GetLatestVersion(repo *Repo) (*Version, error) {
 	}
 	return version, nil
 }
+
+func CheckRepositoryStatus(repo *Repo) error {
+	if *NoVerify {
+		return nil
+	}
+
+	hasChanages, err := repo.HasChanges()
+	if err != nil {
+		return err
+	}
+	if hasChanages {
+		return errors.New("uncommitted changes")
+	}
+
+	if !*NoFetch {
+		if err = repo.Fetch(); err != nil {
+			return err
+		}
+	}
+
+	synced, err := repo.IsSynced()
+	if err != nil {
+		return err
+	}
+	if !synced {
+		return errors.New("unpushed changes")
+	}
+	return nil
+}

cmd/bump/major.go

@@ -9,7 +9,7 @@ import (
 func MajorCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:     "major",
-		Aliases: []string{"a"},
+		Aliases: []string{"ma"},
 		Short:   "Bump the major version",
 		RunE:    major,
 	}
@@ -20,10 +20,17 @@ func major(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+
 	repo, err := NewRepo(cwd)
 	if err != nil {
 		return err
 	}
+
+	err = CheckRepositoryStatus(repo)
+	if err != nil {
+		return err
+	}
+
 	version, err := GetLatestVersion(repo)
 	if err != nil {
 		return err
@@ -41,5 +48,4 @@ func major(cmd *cobra.Command, args []string) error {
 	}
 
 	return repo.CreateAndPushTag(newVersion.String())
-
 }

cmd/bump/minor.go

@@ -9,7 +9,7 @@ import (
 func MinorCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:     "minor",
-		Aliases: []string{"m"},
+		Aliases: []string{"m", "mi"},
 		Short:   "Bump the minor version",
 		RunE:    minor,
 	}
@@ -20,10 +20,17 @@ func minor(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+
 	repo, err := NewRepo(cwd)
 	if err != nil {
 		return err
 	}
+
+	err = CheckRepositoryStatus(repo)
+	if err != nil {
+		return err
+	}
+
 	version, err := GetLatestVersion(repo)
 	if err != nil {
 		return err
@@ -41,5 +48,4 @@ func minor(cmd *cobra.Command, args []string) error {
 	}
 
 	return repo.CreateAndPushTag(newVersion.String())
-
 }

cmd/bump/patch.go

@@ -9,7 +9,7 @@ import (
 func PatchCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:     "patch",
-		Aliases: []string{"p"},
+		Aliases: []string{"p", "pa"},
 		Short:   "Bump the patch version",
 		RunE:    Patch,
 	}
@@ -20,10 +20,17 @@ func Patch(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+
 	repo, err := NewRepo(cwd)
 	if err != nil {
 		return err
 	}
+
+	err = CheckRepositoryStatus(repo)
+	if err != nil {
+		return err
+	}
+
 	version, err := GetLatestVersion(repo)
 	if err != nil {
 		return err
@@ -36,10 +43,9 @@ func Patch(cmd *cobra.Command, args []string) error {
 	Info("%s -> %s\n", version.String(), newVersion.String())
 
 	if *DryRun {
-		Info("dry run, not creating tags\n")
+		Info("dry run, will not create tag\n")
 		return nil
 	}
 
 	return repo.CreateAndPushTag(newVersion.String())
-
 }

cmd/bump/repo.go

@@ -2,6 +2,7 @@ package bump
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
@@ -57,3 +58,56 @@ func (r *Repo) CreateAndPushTag(tag string) error {
 	}
 	return r.PushTag(tag)
 }
+
+func (r *Repo) Fetch() error {
+	err := r.repo.Fetch(&git.FetchOptions{})
+	if err != nil && err != git.NoErrAlreadyUpToDate {
+		return err
+	}
+	return nil
+}
+
+func (r *Repo) HasChanges() (bool, error) {
+	w, err := r.repo.Worktree()
+	if err != nil {
+		return false, err
+	}
+	status, err := w.Status()
+	if err != nil {
+		return false, err
+	}
+	return !status.IsClean(), nil
+}
+
+func (r *Repo) IsSynced() (bool, error) {
+	head, err := r.repo.Head()
+	if err != nil {
+		return false, err
+	}
+	name := strings.TrimPrefix(head.Name().String(), "refs/heads/")
+
+	refs, err := r.repo.References()
+	if err != nil {
+		return false, err
+	}
+	// find remote branch
+	var remote *plumbing.Reference
+	err = refs.ForEach(func(ref *plumbing.Reference) error {
+		if !ref.Name().IsRemote() {
+			return nil
+		}
+		if strings.TrimPrefix(ref.Name().String(), "refs/remotes/origin/") == name {
+			remote = ref
+		}
+		return nil
+	})
+
+	if remote == nil {
+		return false, fmt.Errorf("remote branch for %s not found", name)
+	}
+	if remote.Hash() != head.Hash() {
+		return false, nil
+	}
+
+	return true, err
+}

cmd/main.go

@@ -19,7 +19,9 @@ func main() {
 
 	bump.DebugFlag = root.PersistentFlags().BoolP("debug", "d", false, "Debug mode")
 	bump.QuietFlag = root.PersistentFlags().BoolP("quiet", "q", false, "Quiet - only output errors")
-	bump.DryRun = root.PersistentFlags().BoolP("dry-run", "n", false, "Dry run mode")
+	bump.DryRun = root.PersistentFlags().BoolP("dry-run", "x", false, "Do not create tags, only print what would be done")
+	bump.NoVerify = root.PersistentFlags().BoolP("no-verify", "n", false, "Do not check repository status before creating tags")
+	bump.NoFetch = root.PersistentFlags().BoolP("no-fetch", "f", false, "Do not fetch before verifying repository status")
 	bump.Prefix = root.PersistentFlags().StringP("prefix", "p", "", "Prefix for the version tag")
 
 	root.AddCommand(bump.BumpVersionCmd())

readme.md

@@ -23,8 +23,10 @@ Available Commands:
 
 Flags:
   -d, --debug           Debug mode
-  -n, --dry-run         Dry run mode
+  -x, --dry-run         Do not create tags, only print what would be done
   -h, --help            help for bump
+  -f, --no-fetch        Do not fetch before verifying repository status
+  -n, --no-verify       Do not check repository status before creating tags
   -p, --prefix string   Prefix for the version tag
   -q, --quiet           Quiet - only output errors