Skip to content

Commit e428154

Browse files
timoknappchristophwitzko
authored andcommitted
feat: rename flag to force-bump-patch-version and adapt tests accordingly
1 parent d0c5ba3 commit e428154

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

pkg/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type Config struct {
3333
Dry bool
3434
AllowInitialDevelopmentVersions bool
3535
AllowNoChanges bool
36-
ForceBumpPatch bool
36+
ForceBumpPatchVersion bool
3737
MaintainedVersion string
3838
PrependChangelog bool
3939
DownloadPlugins bool
@@ -123,7 +123,7 @@ func NewConfig(cmd *cobra.Command) (*Config, error) {
123123
Dry: mustGetBool(cmd, "dry"),
124124
AllowInitialDevelopmentVersions: mustGetBool(cmd, "allow-initial-development-versions"),
125125
AllowNoChanges: mustGetBool(cmd, "allow-no-changes"),
126-
ForceBumpPatch: mustGetBool(cmd, "force-bump-patch"),
126+
ForceBumpPatchVersion: mustGetBool(cmd, "force-bump-patch-version"),
127127
MaintainedVersion: viper.GetString("maintainedVersion"),
128128
PrependChangelog: mustGetBool(cmd, "prepend-changelog"),
129129
DownloadPlugins: mustGetBool(cmd, "download-plugins"),

pkg/semrel/semrel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ func applyChange(rawVersion string, rawChange *Change, allowInitialDevelopmentVe
7171
}
7272

7373
func GetNewVersion(conf *config.Config, commits []*Commit, latestRelease *Release) string {
74-
return applyChange(latestRelease.Version, calculateChange(commits, latestRelease), conf.AllowInitialDevelopmentVersions, conf.ForceBumpPatch)
74+
return applyChange(latestRelease.Version, calculateChange(commits, latestRelease), conf.AllowInitialDevelopmentVersions, conf.ForceBumpPatchVersion)
7575
}

pkg/semrel/semrel_test.go

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,30 @@ func TestApplyChange(t *testing.T) {
3939
change *Change
4040
expectedVersion string
4141
allowInitialDevelopmentVersions bool
42+
forceBumpPatchVersion bool
4243
}{
4344
// No Previous releases
44-
{"0.0.0", NoChange, "1.0.0", false},
45-
{"0.0.0", PatchChange, "1.0.0", false},
46-
{"0.0.0", MinorChange, "1.0.0", false},
47-
{"0.0.0", MajorChange, "1.0.0", false},
45+
{"0.0.0", NoChange, "1.0.0", false, false},
46+
{"0.0.0", PatchChange, "1.0.0", false, false},
47+
{"0.0.0", MinorChange, "1.0.0", false, false},
48+
{"0.0.0", MajorChange, "1.0.0", false, false},
4849

49-
{"0.0.0", NoChange, "0.1.0", true},
50-
{"0.0.0", PatchChange, "0.1.0", true},
51-
{"0.0.0", MinorChange, "0.1.0", true},
52-
{"0.0.0", MajorChange, "1.0.0", true},
50+
{"0.0.0", NoChange, "0.1.0", true, false},
51+
{"0.0.0", PatchChange, "0.1.0", true, false},
52+
{"0.0.0", MinorChange, "0.1.0", true, false},
53+
{"0.0.0", MajorChange, "1.0.0", true, false},
5354

54-
{"1.0.0", NoChange, "", false},
55-
{"1.0.0", PatchChange, "1.0.1", false},
56-
{"1.0.0", MinorChange, "1.1.0", false},
57-
{"1.0.0", MajorChange, "2.0.0", false},
58-
{"0.1.0", NoChange, "1.0.0", false},
59-
{"0.1.0", NoChange, "", true},
55+
{"1.0.0", NoChange, "", false, false},
56+
{"1.0.0", PatchChange, "1.0.1", false, true},
57+
{"1.0.0", PatchChange, "1.0.1", false, false},
58+
{"1.0.0", MinorChange, "1.1.0", false, false},
59+
{"1.0.0", MajorChange, "2.0.0", false, false},
60+
{"0.1.0", NoChange, "1.0.0", false, false},
61+
{"0.1.0", NoChange, "", true, false},
6062

61-
{"2.0.0-beta", MajorChange, "2.0.0-beta.1", false},
62-
{"2.0.0-beta.2", MajorChange, "2.0.0-beta.3", false},
63-
{"2.0.0-beta.1.1", MajorChange, "2.0.0-beta.2", false},
63+
{"2.0.0-beta", MajorChange, "2.0.0-beta.1", false, false},
64+
{"2.0.0-beta.2", MajorChange, "2.0.0-beta.3", false, false},
65+
{"2.0.0-beta.1.1", MajorChange, "2.0.0-beta.2", false, false},
6466
}
6567

6668
for _, tc := range testCases {
@@ -71,7 +73,7 @@ func TestApplyChange(t *testing.T) {
7173
t.Errorf("failed to create version: %v", err)
7274
}
7375

74-
actual := applyChange(current.String(), tc.change, tc.allowInitialDevelopmentVersions)
76+
actual := applyChange(current.String(), tc.change, tc.allowInitialDevelopmentVersions, tc.forceBumpPatchVersion)
7577

7678
// Handle no new version case
7779
if actual != "" && tc.expectedVersion != "" {

0 commit comments

Comments
 (0)