feat(releaser): add init and pre-tag handlers

will add support for using the init flag and
pre-tag flags on the release command
also adds a sub feature for the path flag

Author: barelyhuman

.gitignore

@@ -3,3 +3,4 @@ CHANGELOG.md
 .DS_Store
 dist
 commitlog
+lab

commands/release.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"fmt"
 	"os"
+	"path"
 
 	"github.com/barelyhuman/commitlog/pkg"
 	"github.com/go-git/go-git/v5"
@@ -13,14 +14,29 @@ import (
 
 func Release(c *cli.Context) (err error) {
 
-	_, err = os.ReadFile(".commitlog.release")
+	fileDir := c.String("path")
+	filePath := path.Join(fileDir, ".commitlog.release")
+
+	if c.Bool("init") {
+		_, err = os.Stat(filePath)
+		if os.IsNotExist(err) {
+			err = nil
+			os.WriteFile(filePath, []byte("v0.0.0"), os.ModePerm)
+			fmt.Println("[commitlog] Initialized commitlog release")
+		} else {
+			err = fmt.Errorf(".commitlog.release already exists, cannot override")
+		}
+		return
+	}
+
+	_, err = os.Stat(filePath)
 
 	if os.IsNotExist(err) {
 		err = fmt.Errorf("couldn't find the release file, please run the `--init` flag first")
 		return
 	}
 
-	fileData, err := os.ReadFile(".commitlog.release")
+	fileData, err := os.ReadFile(filePath)
 
 	if err != nil {
 		err = fmt.Errorf("error reading the version file: %v", err)
@@ -29,7 +45,12 @@ func Release(c *cli.Context) (err error) {
 
 	versionString := string(fileData)
 
-	releaserOpts := []pkg.ReleaserMod{}
+	releaserOpts := []pkg.ReleaserMod{
+		// add in the pre-tag,
+		// will be used only if the pre flag
+		// is true
+		pkg.WithPreTag(c.String("pre-tag")),
+	}
 
 	if c.Bool("major") {
 		releaserOpts = append(releaserOpts, pkg.WithMajorIncrement(), pkg.WithMinorReset(), pkg.WithPatchReset())
@@ -53,43 +74,49 @@ func Release(c *cli.Context) (err error) {
 		return err
 	}
 
-	err = os.WriteFile(".commitlog.release", []byte(releaser.String()), os.ModePerm)
+	err = os.WriteFile(filePath, []byte(releaser.String()), os.ModePerm)
 	if err != nil {
 		return
 	}
 
-	openRepo, err := git.PlainOpen(c.String("path"))
-	if err != nil {
-		return err
-	}
+	var gitRepo *git.Repository
+	var toTagHash plumbing.Hash
+	var repoWt *git.Worktree
 
-	var commitHash plumbing.Hash
-	wt, err := openRepo.Worktree()
-	if err != nil {
-		return err
+	if c.Bool("commit") || c.Bool("push") {
+		gitRepo, err = git.PlainOpen(c.String("path"))
+		if err != nil {
+			return err
+		}
+
+		repoWt, err = gitRepo.Worktree()
+
+		if err != nil {
+			return err
+		}
 	}
 
 	if c.Bool("commit") {
-		wt.Add(".commitlog.release")
-		commitHash, err = wt.Commit("chore: version"+releaser.String(), &git.CommitOptions{})
+		repoWt.Add(filePath)
+		toTagHash, err = repoWt.Commit("chore: version"+releaser.String(), &git.CommitOptions{})
 		if err != nil {
 			return err
 		}
 
-		_, err = openRepo.CreateTag(releaser.String(), commitHash, &git.CreateTagOptions{})
+		_, err = gitRepo.CreateTag(releaser.String(), toTagHash, &git.CreateTagOptions{})
 		if err != nil {
 			err = fmt.Errorf("looks like there was error while creating a tag for the version commit, please try again or create a tag manually: %v", err)
 			return err
 		}
 	}
 
 	if c.Bool("push") {
-		_, err := wt.Status()
+		_, err := repoWt.Status()
 		if err != nil {
 			return err
 		}
 
-		openRepo.Push(&git.PushOptions{
+		gitRepo.Push(&git.PushOptions{
 			RemoteName: "origin",
 			Progress:   os.Stdout,
 			RefSpecs:   []config.RefSpec{config.RefSpec("refs/tags/*:refs/tags/*")},

pkg/releaser.go

@@ -16,9 +16,10 @@ type version struct {
 }
 
 type Releaser struct {
-	raw  string
-	v    version
-	next version
+	raw    string
+	v      version
+	next   version
+	preTag string
 }
 
 func (r *Releaser) HasPrerelease() bool {
@@ -37,6 +38,7 @@ func (r *Releaser) String() (s string) {
 	b.WriteString(strconv.Itoa(r.next.patch))
 
 	if len(r.next.preString) > 0 {
+		b.Write([]byte("-"))
 		b.Write([]byte(r.next.preString))
 	}
 
@@ -86,6 +88,8 @@ func CreateNewReleaser(vString string, mods ...ReleaserMod) (r *Releaser, err er
 
 	r.v.preString = semver.Prerelease(vString)
 
+	r.preTag = strings.Split(r.v.preString, ".")[0]
+
 	r.next.major = r.v.major
 	r.next.minor = r.v.minor
 	r.next.patch = r.v.patch
@@ -106,11 +110,24 @@ func WithPrerelease(pre string) ReleaserMod {
 
 func WithPrereleaseIncrement() ReleaserMod {
 	return func(r *Releaser) {
-		preParts := strings.Split(r.v.preString, ".")
-		prePointer, _ := strconv.Atoi(preParts[1])
-		prePointer += 1
-		preParts[1] = strconv.Itoa(prePointer)
-		r.next.preString = strings.Join(preParts[:], ".")
+
+		// if a pre string already exists
+		if len(r.v.preString) > 0 {
+			preParts := strings.Split(r.v.preString, ".")
+			prePointer, _ := strconv.Atoi(preParts[1])
+			prePointer += 1
+			preParts[1] = strconv.Itoa(prePointer)
+			preParts[0] = r.preTag
+			r.next.preString = strings.Join(preParts[:], ".")
+			return
+		}
+
+		preToCreate := []string{
+			r.preTag,
+			"0",
+		}
+
+		r.next.preString = strings.Join(preToCreate[:], ".")
 	}
 }
 
@@ -164,3 +181,9 @@ func WithClearPrerelease() ReleaserMod {
 		r.next.preString = ""
 	}
 }
+
+func WithPreTag(preTag string) ReleaserMod {
+	return func(r *Releaser) {
+		r.preTag = preTag
+	}
+}