test: fix

cmd/semantic-release/main.go

@@ -9,6 +9,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/Masterminds/semver"
 	"github.com/go-semantic-release/semantic-release/pkg/analyzer/commit"
 	"github.com/go-semantic-release/semantic-release/pkg/condition"
 	"github.com/go-semantic-release/semantic-release/pkg/config"
@@ -125,9 +126,9 @@ func cliHandler(c *cli.Context) error {
 	exitIfError(err)
 	release, err := releases.GetLatestRelease(conf.BetaRelease.MaintainedVersion)
 	exitIfError(err)
-	logger.Println("found version: " + release.Version.String())
+	logger.Println("found version: " + release.Version)
 
-	if strings.Contains(conf.BetaRelease.MaintainedVersion, "-") && release.Version.Prerelease() == "" {
+	if strings.Contains(conf.BetaRelease.MaintainedVersion, "-") && semver.MustParse(release.Version).Prerelease() == "" {
 		exitIfError(fmt.Errorf("no pre-release for this version possible"))
 	}
 

pkg/analyzer/commit/commit.go

@@ -17,7 +17,7 @@ var breakingPattern = regexp.MustCompile("BREAKING CHANGES?")
 type DefaultAnalyzer struct{}
 
 func (da *DefaultAnalyzer) analyzeSingleCommit(rawCommit *semrel.RawCommit) *semrel.Commit {
-	c := new(semrel.Commit)
+	c := &semrel.Commit{Change: &semrel.Change{}}
 	c.SHA = rawCommit.SHA
 	c.Raw = strings.Split(rawCommit.RawMessage, "\n")
 	found := commitPattern.FindAllStringSubmatch(c.Raw[0], -1)
@@ -27,7 +27,7 @@ func (da *DefaultAnalyzer) analyzeSingleCommit(rawCommit *semrel.RawCommit) *sem
 	c.Type = strings.ToLower(found[0][1])
 	c.Scope = found[0][2]
 	c.Message = found[0][3]
-	c.Change = semrel.Change{
+	c.Change = &semrel.Change{
 		Major: breakingPattern.MatchString(rawCommit.RawMessage),
 		Minor: c.Type == "feat",
 		Patch: c.Type == "fix",

pkg/analyzer/commit/commit_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func compareCommit(c *semrel.Commit, t, s string, change semrel.Change) bool {
+func compareCommit(c *semrel.Commit, t, s string, change *semrel.Change) bool {
 	if c.Type != t || c.Scope != s {
 		return false
 	}
@@ -32,31 +32,31 @@ func TestDefaultAnalyzer(t *testing.T) {
 		RawCommit *semrel.RawCommit
 		Type      string
 		Scope     string
-		Change    semrel.Change
+		Change    *semrel.Change
 	}{
 		{
 			createRawCommit("a", "feat: new feature"),
 			"feat",
 			"",
-			semrel.Change{Major: false, Minor: true, Patch: false},
+			&semrel.Change{Major: false, Minor: true, Patch: false},
 		},
 		{
 			createRawCommit("b", "feat(web): new feature"),
 			"feat",
 			"web",
-			semrel.Change{Major: false, Minor: true, Patch: false},
+			&semrel.Change{Major: false, Minor: true, Patch: false},
 		},
 		{
 			createRawCommit("c", "new feature"),
 			"",
 			"",
-			semrel.Change{Major: false, Minor: false, Patch: false},
+			&semrel.Change{Major: false, Minor: false, Patch: false},
 		},
 		{
 			createRawCommit("d", "chore: break\nBREAKING CHANGE: breaks everything"),
 			"chore",
 			"",
-			semrel.Change{Major: true, Minor: false, Patch: false},
+			&semrel.Change{Major: true, Minor: false, Patch: false},
 		},
 	}
 

pkg/generator/changelog/changelog.go

@@ -69,7 +69,7 @@ func (*DefaultGenerator) Generate(changelogConfig *Config) string {
 		if changelogConfig.LatestRelease.SHA == commit.SHA {
 			break
 		}
-		if commit.Change.Major {
+		if commit.Change != nil && commit.Change.Major {
 			typeScopeMap["%%bc%%"] += fmt.Sprintf("%s\n```%s\n```\n", formatCommit(commit), strings.Join(commit.Raw[1:], "\n"))
 			continue
 		}

pkg/provider/github/github.go

@@ -99,7 +99,7 @@ func (repo *GitHubRepository) GetReleases(re *regexp.Regexp) (semrel.Releases, e
 			if err != nil {
 				continue
 			}
-			allReleases = append(allReleases, &semrel.Release{SHA: r.Object.GetSHA(), Version: version})
+			allReleases = append(allReleases, &semrel.Release{SHA: r.Object.GetSHA(), Version: version.String()})
 		}
 		if resp.NextPage == 0 {
 			break

pkg/provider/github/github_test.go

@@ -172,7 +172,7 @@ func TestGithubGetReleases(t *testing.T) {
 			release, err := releases.GetLatestRelease(tc.vrange)
 			require.NoError(t, err)
 			require.Equal(t, tc.expectedSHA, release.SHA)
-			require.Equal(t, tc.expectedVersion, release.Version.String())
+			require.Equal(t, tc.expectedVersion, release.Version)
 		})
 	}
 }

pkg/provider/gitlab/gitlab.go

@@ -126,7 +126,7 @@ func (repo *GitLabRepository) GetReleases(re *regexp.Regexp) (semrel.Releases, e
 
 			allReleases = append(allReleases, &semrel.Release{
 				SHA:     tag.Commit.ID,
-				Version: version,
+				Version: version.String(),
 			})
 		}
 

pkg/provider/gitlab/gitlab_test.go

@@ -161,7 +161,7 @@ func TestGitlabGetReleases(t *testing.T) {
 			release, err := releases.GetLatestRelease(tc.vrange)
 			require.NoError(t, err)
 			require.Equal(t, tc.expectedSHA, release.SHA)
-			require.Equal(t, tc.expectedVersion, release.Version.String())
+			require.Equal(t, tc.expectedVersion, release.Version)
 		})
 	}
 }