clean up NextSemverCalculator

Author: SimonCropp

GitVersionCore/GitHubFlow/BuildNumberCalculator.cs

@@ -19,8 +19,7 @@ public BuildNumberCalculator(NextSemverCalculator nextSemverCalculator, LastTagg
 
         public SemanticVersion GetBuildNumber(GitVersionContext context)
         {
-            var commit = lastTaggedReleaseFinder.GetVersion().Commit;
-            var commitsSinceLastRelease = NumberOfCommitsOnBranchSinceCommit(context, commit);
+            var commitsSinceLastRelease = GetCommitsSinceLastRelease(context);
             var semanticVersion = nextSemverCalculator.NextVersion();
 
             // TODO Need a way of setting this in a cross cutting way
@@ -36,6 +35,21 @@ public SemanticVersion GetBuildNumber(GitVersionContext context)
             return semanticVersion;
         }
 
+        int GetCommitsSinceLastRelease(GitVersionContext context)
+        {
+            int commitsSinceLastRelease;
+            VersionTaggedCommit versionTaggedCommit;
+            if (lastTaggedReleaseFinder.GetVersion(out versionTaggedCommit))
+            {
+                commitsSinceLastRelease = NumberOfCommitsOnBranchSinceCommit(context, versionTaggedCommit.Commit);
+            }
+            else
+            {
+                commitsSinceLastRelease = NumberOfCommitsOnBranchSinceCommit(context, context.CurrentBranch.Commits.Last());
+            }
+            return commitsSinceLastRelease;
+        }
+
         int NumberOfCommitsOnBranchSinceCommit(GitVersionContext context, Commit commit)
         {
             var qf = new CommitFilter

GitVersionCore/GitHubFlow/LastTaggedReleaseFinder.cs

@@ -1,24 +1,18 @@
 namespace GitVersion
 {
-    using System;
     using System.Linq;
     using LibGit2Sharp;
 
     public class LastTaggedReleaseFinder
     {
-        Lazy<VersionTaggedCommit> lastTaggedRelease;
+        GitVersionContext context;
 
         public LastTaggedReleaseFinder(GitVersionContext context)
         {
-            lastTaggedRelease = new Lazy<VersionTaggedCommit>(() => GetVersion(context));
+            this.context = context;
         }
 
-        public VersionTaggedCommit GetVersion()
-        {
-            return lastTaggedRelease.Value;
-        }
-
-        VersionTaggedCommit GetVersion(GitVersionContext context)
+        public bool GetVersion(out VersionTaggedCommit versionTaggedCommit)
         {
             var tags = context.Repository.Tags.Select(t =>
             {
@@ -36,10 +30,13 @@ VersionTaggedCommit GetVersion(GitVersionContext context)
                 context.CurrentBranch.Commits.FirstOrDefault(c => c.When() <= olderThan && tags.Any(a => a.Commit == c));
 
             if (lastTaggedCommit != null)
-                return tags.Last(a => a.Commit.Sha == lastTaggedCommit.Sha);
+            {
+                versionTaggedCommit = tags.Last(a => a.Commit.Sha == lastTaggedCommit.Sha);
+                return true;
+            }
 
-            var commit = context.CurrentBranch.Commits.Last();
-            return new VersionTaggedCommit(commit, new SemanticVersion());
+            versionTaggedCommit = null;
+            return false;
         }
     }
 }

GitVersionCore/GitHubFlow/NextSemverCalculator.cs

@@ -25,49 +25,55 @@ public NextSemverCalculator(
 
         public SemanticVersion NextVersion()
         {
-            var versionZero = new SemanticVersion();
-            var lastRelease = lastTaggedReleaseFinder.GetVersion();
-            var versions = new List<SemanticVersion>();
-            SemanticVersion fileVersion;
-            if(nextVersionTxtFileFinder.TryGetNextVersion(out fileVersion))
+            var versions = GetPossibleVersions().ToList();
+
+            if (versions.Any())
             {
-                versions.Add(fileVersion);
+                return versions.Max();
             }
-            SemanticVersion tryGetVersion;
-            if (mergedBranchesWithVersionFinder.TryGetVersion(out tryGetVersion))
+            return new SemanticVersion
             {
-                versions.Add(tryGetVersion);
-            }
-
-            var otherBranchVersion = unknownBranchFinder.FindVersion(context);
-            versions.Add(otherBranchVersion);
+                Minor = 1
+            };
+        }
 
-            var maxCalculated = versions.Max();
+        public IEnumerable<SemanticVersion> GetPossibleVersions()
+        {
 
-            if (lastRelease.SemVer == versionZero && maxCalculated == versionZero)
+            VersionTaggedCommit lastTaggedRelease;
+            if (lastTaggedReleaseFinder.GetVersion(out lastTaggedRelease))
             {
-                return new SemanticVersion
+                //If the exact commit is tagged then just return that commit
+                if (context.CurrentCommit.Sha == lastTaggedRelease.Commit.Sha)
                 {
-                    Minor = 1
-                };
+                    yield return lastTaggedRelease.SemVer;
+                    yield break;
+                }
+                yield return new SemanticVersion
+                    {
+                        Major = lastTaggedRelease.SemVer.Major,
+                        Minor = lastTaggedRelease.SemVer.Minor,
+                        Patch = lastTaggedRelease.SemVer.Patch + 1
+                    };
             }
 
-            if (context.CurrentCommit.Sha ==  lastRelease.Commit.Sha)
+            SemanticVersion fileVersion;
+            if (nextVersionTxtFileFinder.TryGetNextVersion(out fileVersion))
             {
-                return lastRelease.SemVer;
+                yield return fileVersion;
+            }
+            SemanticVersion tryGetVersion;
+            if (mergedBranchesWithVersionFinder.TryGetVersion(out tryGetVersion))
+            {
+                yield return tryGetVersion;
             }
 
-            if (maxCalculated <= lastRelease.SemVer)
+            SemanticVersion otherBranchVersion;
+            if (unknownBranchFinder.FindVersion(context, out otherBranchVersion))
             {
-                return new SemanticVersion
-                {
-                    Major = lastRelease.SemVer.Major,
-                    Minor = lastRelease.SemVer.Minor,
-                    Patch = lastRelease.SemVer.Patch + 1
-                };
+                yield return otherBranchVersion;
             }
 
-            return maxCalculated;
         }
     }
 }

GitVersionCore/GitHubFlow/OtherBranchVersionFinder.cs

@@ -5,12 +5,13 @@
 
     class OtherBranchVersionFinder 
     {
-        public SemanticVersion FindVersion(GitVersionContext context)
+        public bool FindVersion(GitVersionContext context, out SemanticVersion semanticVersion)
         {
             var versionString = GetUnknownBranchSuffix(context.CurrentBranch);
             if (!versionString.Contains("."))
             {
-                return new SemanticVersion();
+                semanticVersion = null;
+                return false;
             }
             var shortVersion = ShortVersionParser.Parse(versionString);
 
@@ -29,14 +30,15 @@ public SemanticVersion FindVersion(GitVersionContext context)
                 semanticVersionPreReleaseTag.Name = "beta";
             }
 
-            return new SemanticVersion
+            semanticVersion = new SemanticVersion
             {
                 Major = shortVersion.Major,
                 Minor = shortVersion.Minor,
                 Patch = shortVersion.Patch,
                 PreReleaseTag = semanticVersionPreReleaseTag,
                 BuildMetaData = new SemanticVersionBuildMetaData(nbHotfixCommits, context.CurrentBranch.Name, context.CurrentCommit.Sha, context.CurrentCommit.When())
             };
+            return true;
         }
 
         static string GetUnknownBranchSuffix(Branch branch)