add and push new patch tag with -incpatch

Author: linkdata

main.go

@@ -31,7 +31,7 @@ var (
 	flagGoPackage = flag.Bool("gopackage", false, "write Go source with PkgName and PkgVersion")
 	flagNoFetch   = flag.Bool("nofetch", false, "don't fetch remote tags")
 	flagNoNewline = flag.Bool("nonewline", false, "don't print a newline after the output")
-	flagIncPatch  = flag.Bool("incpatch", false, "increment the patch level of the version")
+	flagIncPatch  = flag.Bool("incpatch", false, "increment the patch level and create a new tag")
 )
 
 func mainfn() int {
@@ -42,6 +42,7 @@ func mainfn() int {
 
 	vs, err := gitsemver.New(*flagGit)
 	if err == nil {
+		var createTag string
 		if repoDir, err = vs.Git.CheckGitRepo(repoDir); err == nil {
 			if !*flagNoFetch {
 				err = vs.Git.FetchTags(repoDir)
@@ -50,7 +51,7 @@ func mainfn() int {
 				var vi gitsemver.VersionInfo
 				if vi, err = vs.GetVersion(repoDir); err == nil {
 					if *flagIncPatch {
-						vi.IncPatch()
+						createTag = vi.IncPatch()
 					}
 					content := vi.Version()
 					if *flagGoPackage {
@@ -65,12 +66,17 @@ func mainfn() int {
 							content += "\n"
 						}
 						if err = writeOutput(outpath, content); err == nil {
-							return 0
+							if err = vs.Git.CreateTag(repoDir, createTag); err == nil {
+								if err = vs.Git.PushTag(repoDir, createTag); err == nil {
+									return 0
+								}
+							}
 						}
 					}
 				}
 			}
 		}
+		_ = vs.Git.DeleteTag(repoDir, createTag)
 	}
 
 	retv := 125

main_test.go

@@ -11,7 +11,6 @@ func TestMainFn(t *testing.T) {
 	flag.Parse()
 	*flagGoPackage = true
 	*flagOut = "test.out"
-	*flagIncPatch = true
 	mainfn()
 	b, err := os.ReadFile("test.out")
 	if err == nil {
@@ -26,7 +25,6 @@ func TestMainFn(t *testing.T) {
 }
 
 func TestMainError(t *testing.T) {
-	flag.Parse()
 	exitFn = func(i int) {
 		if i == 0 {
 			t.Error(i)
@@ -35,6 +33,8 @@ func TestMainError(t *testing.T) {
 			t.Log("didn't get a syscall.Errno")
 		}
 	}
+	flag.Parse()
 	*flagOut = "/proc/.nonexistant"
+	*flagIncPatch = true
 	main()
 }

pkg/gitter.go

@@ -30,6 +30,12 @@ type Gitter interface {
 	GetBuild(repo string) string
 	// FetchTags calls "git fetch --tags"
 	FetchTags(repo string) error
+	// CreateTag creates a new lightweight tag. Does nothing if tag is empty.
+	CreateTag(repo, tag string) error
+	// DeleteTag deletes the given tag. Does nothing if tag is empty.
+	DeleteTag(repo, tag string) (err error)
+	// PushTag pushes the given tag to the origin. Does nothing if tag is empty.
+	PushTag(repo, tag string) (err error)
 }
 
 type DefaultGitter string
@@ -47,12 +53,6 @@ var ErrNotDirectory = errors.New("not a directory")
 // Returns nil if it is, else an error.
 func checkDir(dir string) (err error) {
 	_, err = os.ReadDir(dir)
-	/*var fi os.FileInfo
-	if fi, err = os.Stat(dir); err == nil {
-		if !fi.IsDir() {
-			err = ErrNotDirectory
-		}
-	}*/
 	return
 }
 
@@ -174,3 +174,24 @@ func (dg DefaultGitter) FetchTags(repo string) (err error) {
 	err = exec.Command(string(dg), "-C", repo, "fetch", "--tags").Run() /* #nosec G204 */
 	return
 }
+
+func (dg DefaultGitter) CreateTag(repo, tag string) (err error) {
+	if tag != "" {
+		err = exec.Command(string(dg), "-C", repo, "tag", tag).Run() /* #nosec G204 */
+	}
+	return
+}
+
+func (dg DefaultGitter) DeleteTag(repo, tag string) (err error) {
+	if tag != "" {
+		err = exec.Command(string(dg), "-C", repo, "tag", "-d", tag).Run() /* #nosec G204 */
+	}
+	return
+}
+
+func (dg DefaultGitter) PushTag(repo, tag string) (err error) {
+	if tag != "" {
+		err = exec.Command(string(dg), "-C", repo, "push", "origin", tag).Run() /* #nosec G204 */
+	}
+	return
+}

pkg/gitter_test.go

@@ -193,3 +193,29 @@ func Test_DefaultGitter_FetchTags(t *testing.T) {
 	}
 	dg.FetchTags(".")
 }
+
+func Test_DefaultGitter_CreateDeleteTag(t *testing.T) {
+	dg, err := gitsemver.NewDefaultGitter("git")
+	if err != nil {
+		t.Error(err)
+	}
+	err = dg.CreateTag(".", "test-tag")
+	if err != nil {
+		t.Error(err)
+	}
+	err = dg.DeleteTag(".", "test-tag")
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func Test_DefaultGitter_PushTag(t *testing.T) {
+	dg, err := gitsemver.NewDefaultGitter("git")
+	if err != nil {
+		t.Error(err)
+	}
+	err = dg.PushTag(".", "v1.0.0")
+	if err != nil {
+		t.Error(err)
+	}
+}

pkg/mockgitter_test.go

@@ -138,4 +138,16 @@ func (mg *MockGitter) FetchTags(repo string) error {
 	return nil
 }
 
+func (mg *MockGitter) CreateTag(repo, tag string) (err error) {
+	return
+}
+
+func (mg *MockGitter) DeleteTag(repo, tag string) (err error) {
+	return
+}
+
+func (mg *MockGitter) PushTag(repo, tag string) (err error) {
+	return
+}
+
 var _ gitsemver.Gitter = &MockGitter{}

pkg/versioninfo.go

@@ -66,15 +66,17 @@ func (vi *VersionInfo) GoPackage(repo, pkgName string) (retv string, err error)
 	return
 }
 
-// IncPatch increments the patch level of the version.
-func (vi *VersionInfo) IncPatch() {
+// IncPatch increments the patch level of the version, returning the new tag.
+func (vi *VersionInfo) IncPatch() string {
 	for strings.Count(vi.Tag, ".") < 2 {
 		vi.Tag += ".0"
 	}
 	patchindex := strings.LastIndexByte(vi.Tag, '.') + 1
 	if patchlevel, err := strconv.Atoi(vi.Tag[patchindex:]); err == nil {
 		vi.Tag = vi.Tag[:patchindex] + strconv.Itoa(patchlevel+1)
+		vi.SameTree = true
 	}
+	return vi.Tag
 }
 
 func CleanBranch(branch string) string {