refactor: replace BumpNextFunc/BumpByLabelFunc globals with VersionBumper interface (#221)

Author: indaco

internal/commands/bump/auto.go

@@ -20,6 +20,12 @@ import (
 var (
 	tryInferBumpTypeFromCommitParserPluginFn    = tryInferBumpTypeFromCommitParserPlugin
 	tryInferBumpTypeFromChangelogParserPluginFn = tryInferBumpTypeFromChangelogParserPlugin
+
+	// newVersionBumper creates the VersionBumper used for auto bump operations.
+	// Tests can override this to inject mock bumpers.
+	newVersionBumper = func() semver.VersionBumper {
+		return semver.NewDefaultBumper()
+	}
 )
 
 // autoCmd returns the "auto" subcommand.
@@ -155,7 +161,8 @@ func runSingleModuleAuto(ctx context.Context, cmd *cli.Command, cfg *config.Conf
 		return fmt.Errorf("failed to read version: %w", err)
 	}
 
-	next, err := getNextVersion(registry, current, label, disableInfer, since, until, isPreserveMeta)
+	bumper := newVersionBumper()
+	next, err := getNextVersion(bumper, registry, current, label, disableInfer, since, until, isPreserveMeta)
 	if err != nil {
 		return err
 	}
@@ -213,6 +220,7 @@ func runSingleModuleAuto(ctx context.Context, cmd *cli.Command, cfg *config.Conf
 // commit inference, or default bump logic. It returns an error if bumping fails
 // or if an invalid label is specified.
 func getNextVersion(
+	bumper semver.VersionBumper,
 	registry *plugins.PluginRegistry,
 	current semver.SemVersion,
 	label string,
@@ -225,7 +233,7 @@ func getNextVersion(
 
 	switch label {
 	case "patch", "minor", "major":
-		next, err = semver.BumpByLabelFunc(current, label)
+		next, err = bumper.BumpByLabel(current, label)
 		if err != nil {
 			return semver.SemVersion{}, fmt.Errorf("failed to bump version with label: %w", err)
 		}
@@ -244,15 +252,15 @@ func getNextVersion(
 				if current.PreRelease != "" {
 					return promotePreRelease(current, preserveMeta), nil
 				}
-				next, err = semver.BumpByLabelFunc(current, inferred)
+				next, err = bumper.BumpByLabel(current, inferred)
 				if err != nil {
 					return semver.SemVersion{}, fmt.Errorf("failed to bump inferred version: %w", err)
 				}
 				return next, nil
 			}
 		}
 
-		next, err = semver.BumpNextFunc(current)
+		next, err = bumper.BumpNext(current)
 		if err != nil {
 			return semver.SemVersion{}, fmt.Errorf("failed to determine next version: %w", err)
 		}

internal/commands/bump/bump_auto_test.go

@@ -248,16 +248,36 @@ func TestCLI_BumpAutoCmd_PromotePreReleaseWithPreserveMeta(t *testing.T) {
 	}
 }
 
+// mockBumper is a VersionBumper for testing that returns configurable results.
+type mockBumper struct {
+	bumpNextErr    error
+	bumpByLabelErr error
+}
+
+func (m mockBumper) BumpNext(v semver.SemVersion) (semver.SemVersion, error) {
+	if m.bumpNextErr != nil {
+		return semver.SemVersion{}, m.bumpNextErr
+	}
+	return semver.BumpNext(v)
+}
+
+func (m mockBumper) BumpByLabel(v semver.SemVersion, label string) (semver.SemVersion, error) {
+	if m.bumpByLabelErr != nil {
+		return semver.SemVersion{}, m.bumpByLabelErr
+	}
+	return semver.BumpByLabel(v, label)
+}
+
 func TestCLI_BumpAutoCmd_InferredBumpFails(t *testing.T) {
 	tmp := t.TempDir()
 	versionPath := testutils.WriteTempVersionFile(t, tmp, "1.2.3")
 
-	originalBumpByLabel := semver.BumpByLabelFunc
+	originalBumperFactory := newVersionBumper
 	originalInferFunc := tryInferBumpTypeFromCommitParserPluginFn
 
-	// Force BumpByLabelFunc to fail
-	semver.BumpByLabelFunc = func(v semver.SemVersion, label string) (semver.SemVersion, error) {
-		return semver.SemVersion{}, fmt.Errorf("forced inferred bump failure")
+	// Force BumpByLabel to fail via mock bumper
+	newVersionBumper = func() semver.VersionBumper {
+		return mockBumper{bumpByLabelErr: fmt.Errorf("forced inferred bump failure")}
 	}
 
 	// Force inference to return something
@@ -266,7 +286,7 @@ func TestCLI_BumpAutoCmd_InferredBumpFails(t *testing.T) {
 	}
 
 	t.Cleanup(func() {
-		semver.BumpByLabelFunc = originalBumpByLabel
+		newVersionBumper = originalBumperFactory
 		tryInferBumpTypeFromCommitParserPluginFn = originalInferFunc
 	})
 
@@ -435,12 +455,12 @@ func TestCLI_BumpAutoCmd_BumpNextFails(t *testing.T) {
 	tmp := t.TempDir()
 	versionPath := testutils.WriteTempVersionFile(t, tmp, "1.2.3")
 
-	original := semver.BumpNextFunc
-	semver.BumpNextFunc = func(v semver.SemVersion) (semver.SemVersion, error) {
-		return semver.SemVersion{}, fmt.Errorf("forced BumpNext failure")
+	originalBumperFactory := newVersionBumper
+	newVersionBumper = func() semver.VersionBumper {
+		return mockBumper{bumpNextErr: fmt.Errorf("forced BumpNext failure")}
 	}
 	t.Cleanup(func() {
-		semver.BumpNextFunc = original
+		newVersionBumper = originalBumperFactory
 	})
 
 	// Prepare and run the CLI command
@@ -524,12 +544,12 @@ func TestCLI_BumpAutoCmd_BumpByLabelFails(t *testing.T) {
 	tmp := t.TempDir()
 	versionPath := testutils.WriteTempVersionFile(t, tmp, "1.2.3")
 
-	original := semver.BumpByLabelFunc
-	semver.BumpByLabelFunc = func(v semver.SemVersion, label string) (semver.SemVersion, error) {
-		return semver.SemVersion{}, fmt.Errorf("boom")
+	originalBumperFactory := newVersionBumper
+	newVersionBumper = func() semver.VersionBumper {
+		return mockBumper{bumpByLabelErr: fmt.Errorf("boom")}
 	}
 	t.Cleanup(func() {
-		semver.BumpByLabelFunc = original
+		newVersionBumper = originalBumperFactory
 	})
 
 	// Prepare and run the CLI command
@@ -652,7 +672,8 @@ func TestGetNextVersion(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			registry := plugins.NewPluginRegistry()
-			result, err := getNextVersion(registry, tt.current, tt.label, tt.disableInfer, "", "", false)
+			bumper := semver.NewDefaultBumper()
+			result, err := getNextVersion(bumper, registry, tt.current, tt.label, tt.disableInfer, "", "", false)
 			if tt.expectError {
 				if err == nil {
 					t.Error("expected error, got nil")

internal/commands/bump/multimodule.go

@@ -26,7 +26,8 @@ func runMultiModuleBump(
 	preserveMetadata bool,
 ) error {
 	fs := core.NewOSFileSystem()
-	operation := operations.NewBumpOperation(fs, bumpType, preRelease, metadata, preserveMetadata)
+	bumper := newVersionBumper()
+	operation := operations.NewBumpOperation(fs, bumper, bumpType, preRelease, metadata, preserveMetadata)
 
 	// Create executor with options from flags
 	parallel := cmd.Bool("parallel")

internal/operations/bump.go

@@ -25,16 +25,18 @@ const (
 // BumpOperation performs a version bump on a module.
 type BumpOperation struct {
 	fs               core.FileSystem
+	bumper           semver.VersionBumper
 	bumpType         BumpType
 	preRelease       string
 	metadata         string
 	preserveMetadata bool
 }
 
 // NewBumpOperation creates a new bump operation.
-func NewBumpOperation(fs core.FileSystem, bumpType BumpType, preRelease, metadata string, preserveMetadata bool) *BumpOperation {
+func NewBumpOperation(fs core.FileSystem, bumper semver.VersionBumper, bumpType BumpType, preRelease, metadata string, preserveMetadata bool) *BumpOperation {
 	return &BumpOperation{
 		fs:               fs,
+		bumper:           bumper,
 		bumpType:         bumpType,
 		preRelease:       preRelease,
 		metadata:         metadata,
@@ -135,7 +137,7 @@ func (op *BumpOperation) bumpRelease(current semver.SemVersion) semver.SemVersio
 }
 
 func (op *BumpOperation) bumpAuto(current semver.SemVersion) (semver.SemVersion, error) {
-	newVer, err := semver.BumpNextFunc(current)
+	newVer, err := op.bumper.BumpNext(current)
 	if err != nil {
 		return semver.SemVersion{}, fmt.Errorf("auto bump failed: %w", err)
 	}