Merge branch 'main' into 687-json-schema

.changes/unreleased/fixed-20250207-225527.yaml

@@ -0,0 +1,5 @@
+kind: fixed
+body: Merging when configured to use projects but the changelog path does not yet exist
+time: 2025-02-07T22:55:27.570690973-08:00
+custom:
+    Issue: "743"

.changes/unreleased/fixed-20250207-231718.yaml

@@ -0,0 +1,5 @@
+kind: fixed
+body: next version with projects without any releases returns v1.0.0 instead of an error
+time: 2025-02-07T23:17:18.461699249-08:00
+custom:
+    Issue: "743"

.golangci.yml

@@ -4,8 +4,6 @@ linters-settings:
   goconst:
     min-len: 5
     min-occurrences: 5
-  gocyclo:
-    min-complexity: 16
   goimports:
     local-prefixes: github.com/miniscruff/changie
   golint:
@@ -26,7 +24,6 @@ linters:
     - errcheck
     - exhaustive
     - goconst
-    - gocyclo
     - gofmt
     - goimports
     - goprintffuncname

cmd/merge.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -84,9 +85,14 @@ func (m *Merge) mergeProject(
 	if m.DryRun {
 		writer = m.Command.OutOrStdout()
 	} else {
+		dirErr := os.MkdirAll(filepath.Dir(changelogPath), core.CreateDirMode)
+		if dirErr != nil {
+			return fmt.Errorf("creating changelog file directory: %w", dirErr)
+		}
+
 		changeFile, changeErr := os.Create(changelogPath)
 		if changeErr != nil {
-			return changeErr
+			return fmt.Errorf("creating changelog file: %w", changeErr)
 		}
 
 		defer changeFile.Close()
@@ -95,7 +101,7 @@ func (m *Merge) mergeProject(
 
 	allVersions, err := core.GetAllVersions(cfg, false, project)
 	if err != nil {
-		return err
+		return fmt.Errorf("finding release notes: %w", err)
 	}
 
 	if cfg.HeaderPath != "" {

cmd/merge_test.go

@@ -84,7 +84,6 @@ func TestMergeVersionsSuccessfullyWithProject(t *testing.T) {
 	then.WriteFile(t, []byte("first version\n"), cfg.ChangesDir, "a", "v0.1.0.md")
 	then.WriteFile(t, []byte("second version\n"), cfg.ChangesDir, "a", "v0.2.0.md")
 	then.WriteFile(t, []byte("version\n"), "a", "VERSION")
-	then.Nil(t, os.MkdirAll(filepath.Join("a", "thing"), core.CreateDirMode))
 
 	cmd := NewMerge(core.NewTemplateCache())
 
@@ -98,7 +97,7 @@ first version
 	then.FileContents(t, "v0.2.0\n", "a", "VERSION")
 }
 
-func TestMergeVersionsErrorMissingProjectDir(t *testing.T) {
+func TestMergeVersionsSuccessfullyWithProjectAndNoChanges(t *testing.T) {
 	cfg := mergeTestConfig()
 	cfg.HeaderPath = ""
 	cfg.Replacements = nil
@@ -114,7 +113,10 @@ func TestMergeVersionsErrorMissingProjectDir(t *testing.T) {
 	cmd := NewMerge(core.NewTemplateCache())
 
 	err := cmd.Run(cmd.Command, nil)
-	then.NotNil(t, err)
+	then.Nil(t, err)
+
+	changeContents := ``
+	then.FileContents(t, changeContents, "a", "thing", "CHANGELOG.md")
 }
 
 func TestMergeVersionsWithUnreleasedChanges(t *testing.T) {

cmd/next_test.go

@@ -151,6 +151,20 @@ func TestNextVersionWithPrereleaseAndMeta(t *testing.T) {
 	then.Equals(t, "v0.1.1-b1+hash", builder.String())
 }
 
+func TestNextVersionWithoutAnyChangesIsV1(t *testing.T) {
+	cfg := nextTestConfig()
+	then.WithTempDirConfig(t, cfg)
+
+	builder := strings.Builder{}
+
+	next := NewNext()
+	next.SetOut(&builder)
+
+	err := next.Run(next.Command, []string{"major"})
+	then.Nil(t, err)
+	then.Equals(t, "v1.0.0", builder.String())
+}
+
 func TestErrorNextVersionBadConfig(t *testing.T) {
 	then.WithTempDir(t)
 
@@ -192,16 +206,3 @@ func TestErrorNextUnableToGetChanges(t *testing.T) {
 	err := next.Run(next.Command, []string{"auto"})
 	then.NotNil(t, err)
 }
-
-func TestErrorNextUnableToGetVersions(t *testing.T) {
-	then.WithTempDirConfig(t, nextTestConfig())
-
-	next := NewNext()
-	builder := strings.Builder{}
-
-	next.SetOut(&builder)
-
-	// no files, means bad read for get versions
-	err := next.Run(next.Command, []string{"major"})
-	then.NotNil(t, err)
-}

core/utils.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -60,6 +61,10 @@ func GetAllVersions(
 	}
 
 	fileInfos, err := os.ReadDir(versionsPath)
+	if err != nil && errors.Is(err, fs.ErrNotExist) {
+		return allVersions, nil
+	}
+
 	if err != nil {
 		return allVersions, fmt.Errorf("reading files from '%s': %w", versionsPath, err)
 	}

core/utils_test.go

@@ -155,24 +155,14 @@ func TestGetLatestReturnsZerosIfNoVersionsExist(t *testing.T) {
 	then.Equals(t, "v0.0.0", ver.Original())
 }
 
-func TestErrorLatestVersionBadReadDir(t *testing.T) {
-	then.WithTempDir(t)
-
-	config := &Config{ChangesDir: "\\."}
-
-	ver, err := GetLatestVersion(config, false, "")
-	then.Equals(t, nil, ver)
-	then.NotNil(t, err)
-}
-
 func TestErrorNextVersionBadReadDir(t *testing.T) {
 	then.WithTempDir(t)
 
 	config := &Config{ChangesDir: "\\."}
 
 	ver, err := GetNextVersion(config, "major", nil, nil, nil, "")
-	then.Equals(t, nil, ver)
-	then.NotNil(t, err)
+	then.Equals(t, "v1.0.0", ver.Original())
+	then.Nil(t, err)
 }
 
 func TestErrorNextVersionBadVersion(t *testing.T) {