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

fix comparing pre-release contains digits issue #39

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix comparing pre-release contains digits issue #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.vdurmont</groupId>
<artifactId>semver4j</artifactId>
<version>3.1.0</version>
<version>3.1.1-SNAPSHOT</version>
<packaging>jar</packaging>

<name>semver4j</name>
Expand Down
24 changes: 22 additions & 2 deletions src/main/java/com/vdurmont/semver4j/Semver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,28 @@ public boolean isGreaterThan(Semver version) {
int t2 = Integer.valueOf(tokens2[i]);
cmp = t1 - t2;
} catch (NumberFormatException e) {
// Else, do a string comparison
cmp = tokens1[i].compareToIgnoreCase(tokens2[i]);
// when tokens1 & tokens2 contains digits and share the same prefix words, compare the digits
// Exp - 1.0.0-rc11 > 1.0.0-rc3
if (tokens1[i].matches(".*\\d.*") && tokens2[i].matches(".*\\d.*")) {

String[] tokenArr1 = tokens1[i].split("(?<=\\D)(?=\\d)");
String[] tokenArr2 = tokens2[i].split("(?<=\\D)(?=\\d)");

if (tokenArr1[0].equals(tokenArr2[0])) {
// compare only digits part
int digit1 = Integer.valueOf(tokenArr1[1]);
int digit2 = Integer.valueOf(tokenArr2[1]);
cmp = digit1 - digit2;

} else {
// Else, do a string comparison
cmp = tokens1[i].compareToIgnoreCase(tokens2[i]);
}

} else {
// Else, do a string comparison
cmp = tokens1[i].compareToIgnoreCase(tokens2[i]);
}
}
if (cmp < 0) return false;
else if (cmp > 0) return true;
Expand Down
8 changes: 7 additions & 1 deletion src/test/java/com/vdurmont/semver4j/SemverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ private static void assertIsSemver(Semver semver, String value, Integer major, I
assertTrue(new Semver("1.0.0-beta.11").isGreaterThan("1.0.0-beta.2"));
assertTrue(new Semver("1.0.0-rc.1").isGreaterThan("1.0.0-beta.11"));
assertTrue(new Semver("1.0.0").isGreaterThan("1.0.0-rc.1"));

assertTrue(new Semver("1.0.0-rc11").isGreaterThan("1.0.0-rc3"));
assertTrue(new Semver("1.0.0-beta11").isGreaterThan("1.0.0-beta3"));
assertTrue(new Semver("1.0.0-rc.3.x-13").isGreaterThan("1.0.0-rc.3.x-3"));

assertFalse(new Semver("1.0.0-alpha").isGreaterThan("1.0.0-alpha.1"));
assertFalse(new Semver("1.0.0-alpha.1").isGreaterThan("1.0.0-alpha.beta"));
Expand All @@ -148,6 +150,7 @@ private static void assertIsSemver(Semver semver, String value, Integer major, I
assertFalse(new Semver("1.0.0-beta.2").isGreaterThan("1.0.0-beta.11"));
assertFalse(new Semver("1.0.0-beta.11").isGreaterThan("1.0.0-rc.1"));
assertFalse(new Semver("1.0.0-rc.1").isGreaterThan("1.0.0"));
assertFalse(new Semver("1.0.0-beta11").isGreaterThan("1.0.0-rc3"));

assertFalse(new Semver("1.0.0").isGreaterThan("1.0.0"));
assertFalse(new Semver("1.0.0-alpha.12").isGreaterThan("1.0.0-alpha.12"));
Expand All @@ -174,7 +177,10 @@ private static void assertIsSemver(Semver semver, String value, Integer major, I
assertTrue(new Semver("1.0.0-beta.2").isLowerThan("1.0.0-beta.11"));
assertTrue(new Semver("1.0.0-beta.11").isLowerThan("1.0.0-rc.1"));
assertTrue(new Semver("1.0.0-rc.1").isLowerThan("1.0.0"));
assertTrue(new Semver("1.0.0-rc3").isLowerThan("1.0.0-rc11"));
assertTrue(new Semver("1.0.0-rc.3.x-3").isLowerThan("1.0.0-rc.3.x-13"));

assertFalse(new Semver("1.0.0-rc3").isLowerThan("1.0.0-beta11"));
assertFalse(new Semver("1.0.0").isLowerThan("1.0.0"));
assertFalse(new Semver("1.0.0-alpha.12").isLowerThan("1.0.0-alpha.12"));
assertFalse(new Semver("1.0.0-alpha.12.x-yz").isLowerThan("1.0.0-alpha.12.x-yz"));
Expand Down