Merge branch 'main' of https://github.com/thenilsdev/semantic-version

Author: nidotls

src/main/java/gg/nils/semanticrelease/Version.java

@@ -17,7 +17,7 @@
 
 package gg.nils.semanticrelease;
 
-public interface Version {
+public interface Version extends Cloneable {
 
     Tag getTag();
 
@@ -38,4 +38,6 @@ public interface Version {
     void incMinor();
 
     void incPatch();
+
+    Version clone();
 }

src/main/java/gg/nils/semanticrelease/VersionImpl.java

@@ -103,4 +103,9 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(this.tag, this.major, this.minor, this.patch);
     }
+
+    @Override
+    public Version clone() {
+        return new VersionImpl(this.tag, this.major, this.minor, this.patch);
+    }
 }

src/main/java/gg/nils/semanticrelease/calculator/DefaultNextVersionCalculator.java

@@ -34,6 +34,8 @@ public DefaultNextVersionCalculator(SemanticReleaseConfig config) {
 
     @Override
     public Version calculate(Version latestVersion, List<Commit> commits) {
+        Version nextVersion = latestVersion.clone();
+
         int breakingChanges = 0;
         int features = 0;
         int patches = 0;
@@ -49,16 +51,16 @@ public Version calculate(Version latestVersion, List<Commit> commits) {
         }
 
         if (breakingChanges > 0) {
-            latestVersion.incMajor();
-            latestVersion.setMinor(0);
-            latestVersion.setPatch(0);
+            nextVersion.incMajor();
+            nextVersion.setMinor(0);
+            nextVersion.setPatch(0);
         } else if (features > 0) {
-            latestVersion.incMinor();
-            latestVersion.setPatch(0);
+            nextVersion.incMinor();
+            nextVersion.setPatch(0);
         } else if (patches > 0) {
-            latestVersion.incPatch();
+            nextVersion.incPatch();
         }
 
-        return latestVersion;
+        return nextVersion;
     }
 }

src/main/java/gg/nils/semanticrelease/versioncontrol/VersionControlProvider.java

@@ -27,6 +27,8 @@ public interface VersionControlProvider {
 
     List<RawCommit> getRawCommitsSince(Version version);
 
+    List<Commit> getCommits();
+
     List<Commit> getCommitsSince(Version version);
 
     List<Tag> getTags();
@@ -44,4 +46,6 @@ public interface VersionControlProvider {
     String getFullVersion();
 
     String getFullVersionWithoutDirty();
+
+    boolean canBeReleased();
 }

src/main/java/gg/nils/semanticrelease/versioncontrol/VersionControlProviderImpl.java

@@ -17,10 +17,7 @@
 
 package gg.nils.semanticrelease.versioncontrol;
 
-import gg.nils.semanticrelease.Branch;
-import gg.nils.semanticrelease.Commit;
-import gg.nils.semanticrelease.Tag;
-import gg.nils.semanticrelease.Version;
+import gg.nils.semanticrelease.*;
 import gg.nils.semanticrelease.calculator.NextVersionCalculator;
 import gg.nils.semanticrelease.calculator.DefaultNextVersionCalculator;
 import gg.nils.semanticrelease.config.SemanticReleaseConfig;
@@ -56,6 +53,11 @@ protected VersionControlProviderImpl(SemanticReleaseConfig config) {
         this.nextVersionCalculator = new DefaultNextVersionCalculator(config);
     }
 
+    @Override
+    public List<Commit> getCommits() {
+        return this.rawCommitsToCommitsConverter.convert(this.getRawCommits());
+    }
+
     @Override
     public List<Commit> getCommitsSince(Version version) {
         return this.rawCommitsToCommitsConverter.convert(this.getRawCommitsSince(version));
@@ -117,4 +119,22 @@ public String getFullVersionWithoutDirty() {
 
         return version;
     }
+
+    @Override
+    public boolean canBeReleased() {
+        Tag latestTag = this.getLatestTag();
+
+        // Already has a tag
+        if (latestTag != null)
+            return !this.getLatestVersion().equals(this.getNextVersion());
+
+        // New version, check for feat or fix
+        Version tempVersion = new VersionImpl(null, 0, 0 ,0);
+
+        List<Commit> commits = this.getCommits();
+
+        Version calculatedVersion = this.nextVersionCalculator.calculate(tempVersion, commits);
+
+        return !tempVersion.equals(calculatedVersion);
+    }
 }