fix: pre release string resets

Author: barelyhuman

.commitlog.release

@@ -1 +1 @@
-v2.0.0-beta.0
+v2.0.1

commands/release.go

@@ -18,6 +18,11 @@ func Release(c *cli.Context) (err error) {
 	fileDir := c.String("path")
 	filePath := path.Join(fileDir, ".commitlog.release")
 
+	if !(c.Bool("init") || c.Bool("major") || c.Bool("minor") || c.Bool("patch") || c.Bool("pre")) {
+		err = fmt.Errorf("[commitlog] need at least one increment flag to move ahead")
+		return
+	}
+
 	if c.Bool("init") {
 		_, err = os.Stat(filePath)
 		if os.IsNotExist(err) {
@@ -54,15 +59,15 @@ func Release(c *cli.Context) (err error) {
 	}
 
 	if c.Bool("major") {
-		releaserOpts = append(releaserOpts, pkg.WithMajorIncrement(), pkg.WithMinorReset(), pkg.WithPatchReset())
+		releaserOpts = append(releaserOpts, pkg.WithClearPrerelease(), pkg.WithMajorIncrement(), pkg.WithMinorReset(), pkg.WithPatchReset())
 	}
 
 	if c.Bool("minor") {
-		releaserOpts = append(releaserOpts, pkg.WithMinorIncrement(), pkg.WithPatchReset())
+		releaserOpts = append(releaserOpts, pkg.WithClearPrerelease(), pkg.WithMinorIncrement(), pkg.WithPatchReset())
 	}
 
 	if c.Bool("patch") {
-		releaserOpts = append(releaserOpts, pkg.WithPatchIncrement())
+		releaserOpts = append(releaserOpts, pkg.WithClearPrerelease(), pkg.WithPatchIncrement())
 	}
 
 	if c.Bool("pre") {

main.go

@@ -81,6 +81,7 @@ func main() {
 				Flags: []cli.Flag{
 					&cli.BoolFlag{
 						Name:  "init",
+						Value: false,
 						Usage: "initialise commitlog release",
 					},
 					&cli.StringFlag{
@@ -91,7 +92,8 @@ func main() {
 							"(note: do not use `--commit` or `--push` if the file isn't in the root)",
 					},
 					&cli.BoolFlag{
-						Name: "pre",
+						Name:  "pre",
+						Value: false,
 						Usage: "create a pre-release version. will default to patch increment unless" +
 							"specified and not already a pre-release",
 					},
@@ -102,14 +104,17 @@ func main() {
 					},
 					&cli.BoolFlag{
 						Name:  "major",
+						Value: false,
 						Usage: "create a major version",
 					},
 					&cli.BoolFlag{
 						Name:  "minor",
+						Value: false,
 						Usage: "create a minor version",
 					},
 					&cli.BoolFlag{
 						Name:  "patch",
+						Value: false,
 						Usage: "create a patch version",
 					},
 					&cli.BoolFlag{

pkg/releaser.go

@@ -172,7 +172,9 @@ func WithPrereleaseReset() ReleaserMod {
 		preParts := strings.Split(r.v.preString, ".")
 		// reset something like `beta.1` to `beta.0`
 		preParts[1] = strconv.Itoa(0)
-		r.next.preString = strings.Join(preParts[:], ".")
+		nextPreString := strings.Join(preParts[:], ".")
+		nextPreString = strings.TrimPrefix(nextPreString, "-")
+		r.next.preString = nextPreString
 	}
 }