cybercinch/go-semantic-release
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

refactor(pkg/semanticrelease): clean up code

Browse Source
This commit is contained in:
Nightapes
2019-07-22 20:46:48 +02:00
parent 5986e2819a
commit 6267e1cc81
5 changed files with 129 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
pkg/semanticrelease/helper.go
View File

@@ -1,87 +0,0 @@
package semanticrelease
import (
"strconv"
"strings"
"github.com/Masterminds/semver"
"github.com/Nightapes/go-semantic-release/internal/cache"
"github.com/Nightapes/go-semantic-release/internal/shared"
log "github.com/sirupsen/logrus"
)
func (s *SemanticRelease) incPrerelease(preReleaseType string, version semver.Version) semver.Version {
defaultPrerelease := preReleaseType + ".0"
if version.Prerelease() == "" || !strings.HasPrefix(version.Prerelease(), preReleaseType) {
version, _ = version.SetPrerelease(defaultPrerelease)
} else {
parts := strings.Split(version.Prerelease(), ".")
if len(parts) == 2 {
i, err := strconv.Atoi(parts[1])
if err != nil {
version, _ = version.SetPrerelease(defaultPrerelease)
log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String())
} else {
version, _ = version.SetPrerelease(preReleaseType + "." + strconv.Itoa((i + 1)))
}
} else {
version, _ = version.SetPrerelease(defaultPrerelease)
log.Warnf("Could not parse release tag %s, use version %s", version.Prerelease(), version.String())
}
}
return version
}
func (s *SemanticRelease) saveToCache(releaseVersion shared.ReleaseVersion) error {
toCache := cache.ReleaseVersion{
Next: cache.ReleaseVersionEntry{
Commit: releaseVersion.Next.Commit,
Version: releaseVersion.Next.Version.String(),
},
Last: cache.ReleaseVersionEntry{
Commit: releaseVersion.Last.Commit,
Version: releaseVersion.Last.Version.String(),
},
Branch: releaseVersion.Branch,
}
log.Debugf("Save %s with hash %s to cache", releaseVersion.Next.Version.String(), releaseVersion.Next.Commit)
return cache.Write(s.repository, toCache)
}
func (s *SemanticRelease) readFromCache(currentHash string) (*shared.ReleaseVersion, error) {
content, err := cache.Read(s.repository)
if err == nil && content.Next.Commit == currentHash {
nextVersion, err := semver.NewVersion(content.Next.Version)
if err != nil {
return nil, err
}
lastVersion, err := semver.NewVersion(content.Last.Version)
if err != nil {
return nil, err
}
releaseVersion := &shared.ReleaseVersion{
Next: shared.ReleaseVersionEntry{
Commit: content.Next.Commit,
Version: nextVersion,
},
Last: shared.ReleaseVersionEntry{
Commit: content.Last.Commit,
Version: lastVersion,
},
Branch: content.Branch,
}
log.Infof("Found cache, will return cached version %s", content.Next.Version)
return releaseVersion, nil
}
log.Debugf("Mismatch git and version file %s - %s", content.Next.Commit, currentHash)
return nil, nil
}

38
pkg/semanticrelease/semantic-release.go
View File

@@ -8,6 +8,8 @@ import (
"github.com/Masterminds/semver"
"github.com/Nightapes/go-semantic-release/internal/analyzer"
"github.com/Nightapes/go-semantic-release/internal/cache"
"github.com/Nightapes/go-semantic-release/internal/calculator"
"github.com/Nightapes/go-semantic-release/internal/changelog"
"github.com/Nightapes/go-semantic-release/internal/ci"
"github.com/Nightapes/go-semantic-release/internal/gitutil"
@@ -23,6 +25,7 @@ type SemanticRelease struct {
config *config.ReleaseConfig
gitutil *gitutil.GitUtil
analyzer *analyzer.Analyzer
calculator *calculator.Calculator
releaser releaser.Releaser
repository string
}
@@ -50,6 +53,7 @@ func New(c *config.ReleaseConfig, repository string) (*SemanticRelease, error) {
releaser: releaser,
analyzer: analyzer,
repository: repository,
calculator: calculator.New(),
}, nil
}
@@ -70,12 +74,12 @@ func (s *SemanticRelease) GetNextVersion(force bool) (*shared.ReleaseVersion, er
log.Debugf("Ignore .version file if exits, %t", force)
if !force {
releaseVersion, err := s.readFromCache(provider.Commit)
releaseVersion, err := cache.Read(s.repository)
if err != nil {
return nil, err
}
if releaseVersion != nil {
if releaseVersion.Next.Commit == provider.Commit && releaseVersion != nil {
return releaseVersion, nil
}
}
@@ -85,16 +89,12 @@ func (s *SemanticRelease) GetNextVersion(force bool) (*shared.ReleaseVersion, er
return nil, err
}
var newVersion semver.Version
firstRelease := false
if lastVersion == nil {
defaultVersion, _ := semver.NewVersion("1.0.0")
newVersion = *defaultVersion
lastVersion = defaultVersion
firstRelease = true
} else {
newVersion = *lastVersion
}
commits, err := s.gitutil.GetCommits(lastVersionHash)
@@ -108,28 +108,14 @@ func (s *SemanticRelease) GetNextVersion(force bool) (*shared.ReleaseVersion, er
if err != nil {
return nil, err
}
result := a.Analyze(commits)
isDraft := false
var newVersion semver.Version
for branch, releaseType := range s.config.Branch {
if provider.Branch == branch || strings.HasPrefix(provider.Branch, branch) {
log.Debugf("Found branch config for branch %s with release type %s", provider.Branch, releaseType)
switch releaseType {
case "beta", "alpha":
isDraft = true
newVersion = s.incPrerelease(releaseType, newVersion)
case "rc":
newVersion = s.incPrerelease(releaseType, newVersion)
case "release":
if !firstRelease {
if len(result["major"]) > 0 {
newVersion = newVersion.IncMajor()
} else if len(result["minor"]) > 0 {
newVersion = newVersion.IncMinor()
} else if len(result["patch"]) > 0 {
newVersion = newVersion.IncPatch()
}
}
}
newVersion, isDraft = s.calculator.CalculateNewVersion(a.Analyze(commits), lastVersion, releaseType, firstRelease)
break
}
}
@@ -147,7 +133,7 @@ func (s *SemanticRelease) GetNextVersion(force bool) (*shared.ReleaseVersion, er
}
log.Infof("New version %s -> %s", lastVersion.String(), newVersion.String())
err = s.saveToCache(releaseVersion)
err = cache.Write(s.repository, releaseVersion)
if err != nil {
return nil, err
}
@@ -176,7 +162,7 @@ func (s *SemanticRelease) SetVersion(version string) error {
lastVersion, _ = semver.NewVersion("1.0.0")
}
return s.saveToCache(shared.ReleaseVersion{
return cache.Write(s.repository, shared.ReleaseVersion{
Next: shared.ReleaseVersionEntry{
Commit: provider.Commit,
Version: newVersion,