v3.1.1-SNAPSHOT - Add pre-release checking

HyperaDev · May 18, 2021 · ad70be1 · ad70be1
1 parent 213ff4c
commit ad70be1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>dev.hypera</groupId>
     <artifactId>UpdateLib</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>UpdateLib</name>

diff --git a/src/main/java/dev/hypera/updatelib/UpdateLib.java b/src/main/java/dev/hypera/updatelib/UpdateLib.java
@@ -27,7 +27,7 @@
 
 public class UpdateLib {
 
-	private final static String VERSION = "3.1.0-SNAPSHOT"; // Current UpdateLib version.
+	private final static String VERSION = "3.1.1-SNAPSHOT"; // Current UpdateLib version.
 
 	private final long resourceId;
 	private final String currentVersion;

diff --git a/src/main/java/dev/hypera/updatelib/objects/VersionScheme.java b/src/main/java/dev/hypera/updatelib/objects/VersionScheme.java
@@ -20,7 +20,9 @@
 
 public enum VersionScheme {
 
-	BASIC("MAJOR.MINOR", "^(v?)(?<major>0|[1-9]\\d*)\\.(?<minor>0|[1-9]\\d*)(?:-(?<prerelease>(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?$"), SEMANTIC("MAJOR.MINOR.PATCH - https://semver.org/", "^(v?)(?<major>0|[1-9]\\d*)\\.(?<minor>0|[1-9]\\d*)\\.(?<patch>0|[1-9]\\d*)(?:-(?<prerelease>(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+(?<buildmetadata>[0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"), CALENDAR("YYYY-MM-DD - https://calver.org", "^(v?)(?<year>\\d{4})-(?<month>\\d{2})-(?<day>\\d{2})$");
+	BASIC("MAJOR.MINOR", "^(v?)(?<major>0|[1-9]\\d*)\\.(?<minor>0|[1-9]\\d*)(?:-(?<prerelease>(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?$"),
+	SEMANTIC("MAJOR.MINOR.PATCH - https://semver.org/", "^(v?)(?<major>0|[1-9]\\d*)\\.(?<minor>0|[1-9]\\d*)\\.(?<patch>0|[1-9]\\d*)(?:-(?<prerelease>(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+(?<buildmetadata>[0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"),
+	CALENDAR("YYYY-MM-DD - https://calver.org", "^(v?)(?<year>\\d{4})-(?<month>\\d{2})-(?<day>\\d{2})$");
 
 	private final String description;
 	private final Pattern pattern;

diff --git a/src/main/java/dev/hypera/updatelib/utils/VersionUtils.java b/src/main/java/dev/hypera/updatelib/utils/VersionUtils.java
@@ -54,8 +54,8 @@ public static VersionChange compare(VersionScheme versionScheme, String newVersi
 		Check.notNull("new version", newVersion);
 		Check.notNull("current version", currentVersion);
 
-		if(newVersion.equals(currentVersion))
-			return VersionChange.NONE;
+//		if(newVersion.equals(currentVersion))
+//			return VersionChange.NONE;
 
 		Matcher matcher = versionScheme.getPattern().matcher(newVersion);
 		Matcher currentMatcher = versionScheme.getPattern().matcher(currentVersion);
@@ -111,9 +111,12 @@ public static VersionChange compare(VersionScheme versionScheme, String newVersi
 	 * @since 3.0.0-SNAPSHOT
 	 */
 	private static boolean safeCheck(String currentGroup, String newGroup) {
-		if(null == currentGroup || currentGroup.equals("") || null == newGroup || newGroup.equals(""))
+		if(isEmpty(currentGroup) && isEmpty(newGroup))
 			return false;
 
+		if(isEmpty(currentGroup) || isEmpty(newGroup))
+			return true;
+
 		int currentInt;
 		int newInt;
 
@@ -127,6 +130,12 @@ private static boolean safeCheck(String currentGroup, String newGroup) {
 		return newInt > currentInt;
 	}
 
+	private static boolean isEmpty(String one) {
+		if(null == one) return true;
+		if(one.equals("")) return true;
+		return false;
+	}
+
 	@Internal
 	public enum VersionChange {
 		NONE, MAJOR, MINOR, PATCH, PRE_RELEASE, METADATA, YEAR, MONTH, DAY