mirror of
https://github.com/lukaszraczylo/semver-generator.git
synced 2026-07-02 03:25:45 +00:00
Resolve issue with not parsing strict ( issue#13 )
This commit is contained in:
+9
-3
@@ -55,6 +55,7 @@ type Force struct {
|
|||||||
Major int
|
Major int
|
||||||
Commit string
|
Commit string
|
||||||
Existing bool
|
Existing bool
|
||||||
|
Strict bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type SemVer struct {
|
type SemVer struct {
|
||||||
@@ -115,9 +116,14 @@ func debugPrint(content string) {
|
|||||||
|
|
||||||
var extractNumber = regexp.MustCompile("[0-9]+")
|
var extractNumber = regexp.MustCompile("[0-9]+")
|
||||||
|
|
||||||
func parseExistingSemver(tagName string) (semanticVersion SemVer) {
|
func parseExistingSemver(tagName string, currentSemver SemVer) (semanticVersion SemVer) {
|
||||||
|
debugPrint(fmt.Sprintln("Parsing existing semver:", tagName))
|
||||||
var tagNameParts []string
|
var tagNameParts []string
|
||||||
tagNameParts = strings.Split(tagName, ".")
|
tagNameParts = strings.Split(tagName, ".")
|
||||||
|
if len(tagNameParts) < 3 {
|
||||||
|
debugPrint("Unable to parse incompatible semver ( non x.y.z )")
|
||||||
|
return currentSemver
|
||||||
|
}
|
||||||
semanticVersion.Major, _ = strconv.Atoi(extractNumber.FindAllString(tagNameParts[0], -1)[0])
|
semanticVersion.Major, _ = strconv.Atoi(extractNumber.FindAllString(tagNameParts[0], -1)[0])
|
||||||
semanticVersion.Minor, _ = strconv.Atoi(extractNumber.FindAllString(tagNameParts[1], -1)[0])
|
semanticVersion.Minor, _ = strconv.Atoi(extractNumber.FindAllString(tagNameParts[1], -1)[0])
|
||||||
semanticVersion.Patch, _ = strconv.Atoi(extractNumber.FindAllString(tagNameParts[2], -1)[0])
|
semanticVersion.Patch, _ = strconv.Atoi(extractNumber.FindAllString(tagNameParts[2], -1)[0])
|
||||||
@@ -134,7 +140,7 @@ func (s *Setup) CalculateSemver() SemVer {
|
|||||||
for _, tagHash := range s.Tags {
|
for _, tagHash := range s.Tags {
|
||||||
if commit.Hash == tagHash.Hash {
|
if commit.Hash == tagHash.Hash {
|
||||||
debugPrint(fmt.Sprintln("Found existing tag:", tagHash.Name, "related to", commit.Message))
|
debugPrint(fmt.Sprintln("Found existing tag:", tagHash.Name, "related to", commit.Message))
|
||||||
s.Semver = parseExistingSemver(tagHash.Name)
|
s.Semver = parseExistingSemver(tagHash.Name, s.Semver)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -330,7 +336,7 @@ func main() {
|
|||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
repo.ListCommits()
|
repo.ListCommits()
|
||||||
if params.varExisting {
|
if params.varExisting || repo.Force.Existing {
|
||||||
repo.ListExistingTags()
|
repo.ListExistingTags()
|
||||||
}
|
}
|
||||||
repo.ForcedVersioning()
|
repo.ForcedVersioning()
|
||||||
|
|||||||
+5
-1
@@ -569,7 +569,11 @@ func (suite *Tests) Test_parseExistingSemver() {
|
|||||||
}
|
}
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
suite.T().Run(tt.name, func(t *testing.T) {
|
suite.T().Run(tt.name, func(t *testing.T) {
|
||||||
got := parseExistingSemver(tt.args.tagName)
|
got := parseExistingSemver(tt.args.tagName, SemVer{
|
||||||
|
Major: 1,
|
||||||
|
Minor: 1,
|
||||||
|
Patch: 1,
|
||||||
|
})
|
||||||
assert.Equal(tt.wantSemanticVersion.Major, got.Major, "Unexpected MAJOR semver result in "+tt.name)
|
assert.Equal(tt.wantSemanticVersion.Major, got.Major, "Unexpected MAJOR semver result in "+tt.name)
|
||||||
assert.Equal(tt.wantSemanticVersion.Minor, got.Minor, "Unexpected MINOR semver result in "+tt.name)
|
assert.Equal(tt.wantSemanticVersion.Minor, got.Minor, "Unexpected MINOR semver result in "+tt.name)
|
||||||
assert.Equal(tt.wantSemanticVersion.Patch, got.Patch, "Unexpected PATCH semver result in "+tt.name)
|
assert.Equal(tt.wantSemanticVersion.Patch, got.Patch, "Unexpected PATCH semver result in "+tt.name)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ force:
|
|||||||
major: 1
|
major: 1
|
||||||
minor: 4
|
minor: 4
|
||||||
existing: true
|
existing: true
|
||||||
|
commit: 960207e4677476ad31a9f389f74eaf9f33d49613
|
||||||
wording:
|
wording:
|
||||||
patch:
|
patch:
|
||||||
- update
|
- update
|
||||||
|
|||||||
+2
-1
@@ -1,7 +1,8 @@
|
|||||||
version: 1
|
version: 1
|
||||||
force:
|
force:
|
||||||
major: 1
|
major: 1
|
||||||
existing: true
|
existing: false
|
||||||
|
strict: false
|
||||||
wording:
|
wording:
|
||||||
patch:
|
patch:
|
||||||
- update
|
- update
|
||||||
|
|||||||
Reference in New Issue
Block a user