Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update for remote tags which have 'refs/tags/' in front of the tag name #12

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update for remote tags which have 'refs/tags/' in front of the tag name #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4135c0
Update for remote tags which have 'refs/tags/' in front of the tag name
joepjoosten Apr 12, 2018
5a131a8
Added 'refs/tags/' tests
joepjoosten Apr 12, 2018
bb30c12
Fix test duplicate
joepjoosten Apr 17, 2018
f4474be
Fix checkVersion should return version without "refs/tags/"
joepjoosten Apr 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/main/groovy/com/cinnober/gradle/semver_git/SemverGitPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,11 @@ class SemverGitPlugin implements Plugin<Project> {
}

def static String checkVersion(String version) {
parseVersion(version);
return version;
return formatVersion(parseVersion(version));
}

def static Object[] parseVersion(String version) {
def pattern = /^([0-9]+)\.([0-9]+)\.([0-9]+)(-([a-zA-Z0-9.-]+))?$/
def pattern = /^(?:refs\/tags\/)?([0-9]+)\.([0-9]+)\.([0-9]+)(-([a-zA-Z0-9.-]+))?$/
def matcher = version =~ pattern
def arr = matcher.collect { it }[0]
if (arr == null) {
Expand Down Expand Up @@ -124,4 +123,4 @@ class SemverGitPlugin implements Plugin<Project> {
println "Version: " + project.version
}
}
}
}
20 changes: 19 additions & 1 deletion src/test/groovy/com/cinnober/gradle/semver_git/SemverGitPluginTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,21 @@ class SemverGitPluginTest extends GroovyTestCase {
void testParseVersion12_34_56_rc78() {
testParseVersion("12.34.56-rc78", [12,34,56,"rc78"]);
}
void testParseVersionRefsTags100() {
testParseVersion("refs/tags/1.0.0", [1,0,0,null]);
}
void testParseVersionRefsTags123() {
testParseVersion("refs/tags/1.2.3", [1,2,3,null]);
}
void testParseVersionRefsTags123beta() {
testParseVersion("refs/tags/1.2.3-beta", [1,2,3,"beta"]);
}
void testParseVersionRefsTags123snapshot() {
testParseVersion("refs/tags/1.2.3-SNAPSHOT", [1,2,3,"SNAPSHOT"]);
}
void testParseVersionRefsTags12_34_56_rc78() {
testParseVersion("refs/tags/12.34.56-rc78", [12,34,56,"rc78"]);
}
void testFailParseVersion_abc() {
shouldFail({SemverGitPlugin.parseVersion("a.b.c")});
}
Expand Down Expand Up @@ -105,4 +120,7 @@ class SemverGitPluginTest extends GroovyTestCase {
testNextVersion("1.0.0-SNAPSHOT", "1.0.0-beta", "major", "SNAPSHOT");
}

}
void testCheckVersionShouldReturnWithoutRefsTags() {
assertEquals("1.0.0-beta", SemverGitPlugin.checkVersion("refs/tags/1.0.0-beta"))
}
}