Skip to content

Commit 110c9b2

Browse files
committed
feat: handling for pre increment
1 parent 0a946f6 commit 110c9b2

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

commands/release.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ func Release(c *cli.Context) (err error) {
4343
releaserOpts = append(releaserOpts, pkg.WithPatchIncrement())
4444
}
4545

46+
if c.Bool("pre") {
47+
releaserOpts = append(releaserOpts, pkg.WithPrereleaseIncrement())
48+
}
49+
4650
releaser, err := pkg.CreateNewReleaser(versionString, releaserOpts...)
4751

4852
if err != nil {

main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ func main() {
9191
Usage: "root with the '.git' folder `PATH`",
9292
},
9393
&cli.BoolFlag{
94-
Name: "pre-release",
94+
Name: "pre",
9595
Usage: "create a pre-release version. will default to patch increment unless" +
9696
"specified and not already a pre-release",
9797
},
9898
&cli.StringFlag{
99-
Name: "pre-release-tag",
99+
Name: "pre-tag",
100100
Value: "beta",
101101
Usage: "create a pre-release version",
102102
},

pkg/releaser.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ func (r *Releaser) String() (s string) {
3737
b.WriteString(strconv.Itoa(r.next.patch))
3838

3939
if len(r.next.preString) > 0 {
40-
b.Write([]byte("-"))
4140
b.Write([]byte(r.next.preString))
4241
}
4342

@@ -62,7 +61,14 @@ func CreateNewReleaser(vString string, mods ...ReleaserMod) (r *Releaser, err er
6261

6362
vParts := strings.Split(simplifiedV, ".")
6463

65-
r.v.patch, err = strconv.Atoi(vParts[2])
64+
preParts := strings.Split(vParts[2], "-")
65+
66+
if len(preParts) > 1 {
67+
r.v.patch, err = strconv.Atoi(preParts[0])
68+
} else {
69+
r.v.patch, err = strconv.Atoi(vParts[2])
70+
}
71+
6672
if err != nil {
6773
return
6874
}

0 commit comments

Comments
 (0)