remove need for empty

SimonCropp · SimonCropp · commit f5ebe415e2b9 · 2014-10-04T22:16:30.000+10:00
diff --git a/GitVersionCore.Tests/SemanticVersionTests.cs b/GitVersionCore.Tests/SemanticVersionTests.cs
@@ -67,14 +67,6 @@ public void VersionSorting()
         SemanticVersion.Parse("1.0.0").ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta"));
     }
 
-    [Test]
-    public void EmptyVersion()
-    {
-        Assert.IsTrue(SemanticVersion.Empty.IsEmpty());
-
-        var emptyVersion = new SemanticVersion();
-        Assert.IsTrue(emptyVersion.IsEmpty());
-    }
     [Test]
     public void ToStringJTests()
     {
diff --git a/GitVersionCore/GitFlow/BranchFinders/MasterVersionFinder.cs b/GitVersionCore/GitFlow/BranchFinders/MasterVersionFinder.cs
@@ -15,20 +15,12 @@ public SemanticVersion FindVersion(IRepository repository, Commit tip)
                 }
             }
 
-            var semanticVersion = new SemanticVersion();
-
             ShortVersion versionFromTip;
             if (MergeMessageParser.TryParse(tip, out versionFromTip))
             {
-                semanticVersion = BuildVersion(tip, versionFromTip);
+                return BuildVersion(tip, versionFromTip);
             }
-
-            if (semanticVersion == null || semanticVersion.IsEmpty())
-            {
-                throw new WarningException("The head of master should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");
-            }
-
-            return semanticVersion;
+            throw new WarningException("The head of master should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");
         }
 
         SemanticVersion BuildVersion(Commit tip, ShortVersion shortVersion)
diff --git a/GitVersionCore/GitFlow/BranchFinders/SupportVersionFinder.cs b/GitVersionCore/GitFlow/BranchFinders/SupportVersionFinder.cs
@@ -8,29 +8,21 @@ public SemanticVersion FindVersion(IRepository repository, Commit tip)
         {
             foreach (var tag in repository.TagsByDate(tip))
             {
-            ShortVersion shortVersion;
-            if (ShortVersionParser.TryParse(tag.Name, out shortVersion))
+                ShortVersion shortVersion;
+                if (ShortVersionParser.TryParse(tag.Name, out shortVersion))
                 {
                     return BuildVersion(tip, shortVersion);
                 }
             }
 
-            var semanticVersion = new SemanticVersion();
-
             ShortVersion versionFromTip;
             if (MergeMessageParser.TryParse(tip, out versionFromTip))
             {
-                semanticVersion = BuildVersion(tip, versionFromTip);
-            }
-
-            semanticVersion.OverrideVersionManuallyIfNeeded(repository);
-
-            if (semanticVersion == null || semanticVersion.IsEmpty())
-            {
-                throw new WarningException("The head of a support branch should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");
+                var semanticVersion = BuildVersion(tip, versionFromTip);
+                semanticVersion.OverrideVersionManuallyIfNeeded(repository);
+                return semanticVersion;
             }
-
-            return semanticVersion;
+            throw new WarningException("The head of a support branch should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");
         }
 
         SemanticVersion BuildVersion(Commit tip, ShortVersion shortVersion)
diff --git a/GitVersionCore/GitHubFlow/NextSemverCalculator.cs b/GitVersionCore/GitHubFlow/NextSemverCalculator.cs
@@ -1,5 +1,6 @@
 ﻿namespace GitVersion
 {
+    using System.Collections.Generic;
     using System.Linq;
 
     public class NextSemverCalculator
@@ -26,13 +27,21 @@ public SemanticVersion NextVersion()
         {
             var versionZero = new SemanticVersion();
             var lastRelease = lastTaggedReleaseFinder.GetVersion();
-            var fileVersion = nextVersionTxtFileFinder.GetNextVersion();
-            var mergedBranchVersion = mergedBranchesWithVersionFinder.GetVersion();
+            var versions = new List<SemanticVersion>();
+            SemanticVersion fileVersion;
+            if(nextVersionTxtFileFinder.TryGetNextVersion(out fileVersion))
+            {
+                versions.Add(fileVersion);
+            }
+            versions.Add(mergedBranchesWithVersionFinder.GetVersion());
             var otherBranchVersion = unknownBranchFinder.FindVersion(context);
             if (otherBranchVersion != null && otherBranchVersion.PreReleaseTag != null && otherBranchVersion.PreReleaseTag.Name == "release")
+            {
                 otherBranchVersion.PreReleaseTag.Name = "beta";
+            }
+            versions.Add(otherBranchVersion);
 
-            var maxCalculated = new[] { fileVersion, otherBranchVersion, mergedBranchVersion }.Max();
+            var maxCalculated = versions.Max();
 
             if (lastRelease.SemVer == versionZero && maxCalculated == versionZero)
             {
diff --git a/GitVersionCore/GitHubFlow/NextVersionTxtFileFinder.cs b/GitVersionCore/GitHubFlow/NextVersionTxtFileFinder.cs
@@ -12,27 +12,29 @@ public NextVersionTxtFileFinder(string repositoryDirectory)
             this.repositoryDirectory = repositoryDirectory;
         }
 
-        public SemanticVersion GetNextVersion()
+        public bool TryGetNextVersion(out SemanticVersion semanticVersion)
         {
             var filePath = Path.Combine(repositoryDirectory, "NextVersion.txt");
             if (!File.Exists(filePath))
             {
-                return new SemanticVersion();
+                semanticVersion = null;
+                return false;
             }
 
             var version = File.ReadAllText(filePath);
             if (string.IsNullOrEmpty(version))
             {
-                return new SemanticVersion();
+                semanticVersion = null;
+                return false;
             }
 
-            SemanticVersion semanticVersion;
             if (!SemanticVersion.TryParse(version, out semanticVersion))
             {
                 throw new ArgumentException("Make sure you have a valid semantic version in NextVersion.txt");
             }
 
-            return semanticVersion;
+
+                return true;
         }
     }
 }
diff --git a/GitVersionCore/SemanticVersion.cs b/GitVersionCore/SemanticVersion.cs
@@ -5,8 +5,6 @@ namespace GitVersion
 
     public class SemanticVersion : IFormattable, IComparable<SemanticVersion>
     {
-        public static SemanticVersion Empty = new SemanticVersion();
-
         static Regex ParseSemVer = new Regex(
             @"[vV]?(?<SemVer>(?<Major>\d+)(\.(?<Minor>\d+))?(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]*))?(\+(?<BuildMetaData>.*))?",
             RegexOptions.Compiled);
@@ -36,11 +34,6 @@ public bool Equals(SemanticVersion obj)
                    BuildMetaData == obj.BuildMetaData;
         }
 
-        public bool IsEmpty()
-        {
-            return Equals(Empty);
-        }
-
         public static bool operator ==(SemanticVersion v1, SemanticVersion v2)
         {
             if (ReferenceEquals(v1, null))
diff --git a/GitVersionCore/SemanticVersionExtensions.cs b/GitVersionCore/SemanticVersionExtensions.cs
@@ -7,8 +7,8 @@ public static class SemanticVersionExtensions
         public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version, IRepository repository)
         {
             var nextVersionTxtFileFinder = new NextVersionTxtFileFinder(repository.GetRepositoryDirectory());
-            var manualNextVersion = nextVersionTxtFileFinder.GetNextVersion();
-            if (!manualNextVersion.IsEmpty())
+            SemanticVersion manualNextVersion ;
+            if (nextVersionTxtFileFinder.TryGetNextVersion(out manualNextVersion))
             {
                 if (manualNextVersion > version)
                 {
diff --git a/GitVersionTask.Tests/VersionOnMasterFinderTests.Should_find_previous_commit_that_was_at_least_a_minor_bump.approved.txt b/GitVersionTask.Tests/VersionOnMasterFinderTests.Should_find_previous_commit_that_was_at_least_a_minor_bump.approved.txt
@@ -1,6 +1,4 @@
 ﻿{
     "Major": 0,
-    "Minor": 3,
-    "Timestamp": "2000-10-09T23:59:58Z",
-    "CommitSha": "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
+    "Minor": 3
 }

Original file line number	Diff line number	Diff line change
`@@ -67,14 +67,6 @@ public void VersionSorting()`
`67`	`67`	`SemanticVersion.Parse("1.0.0").ShouldBeGreaterThan(SemanticVersion.Parse("1.0.0-beta"));`
`68`	`68`	`}`
`69`	`69`
`70`		`- [Test]`
`71`		`- public void EmptyVersion()`
`72`		`- {`
`73`		`- Assert.IsTrue(SemanticVersion.Empty.IsEmpty());`
`74`		`-`
`75`		`- var emptyVersion = new SemanticVersion();`
`76`		`- Assert.IsTrue(emptyVersion.IsEmpty());`
`77`		`- }`
`78`	`70`	`[Test]`
`79`	`71`	`public void ToStringJTests()`
`80`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,20 +15,12 @@ public SemanticVersion FindVersion(IRepository repository, Commit tip)`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`- var semanticVersion = new SemanticVersion();`
`19`		`-`
`20`	`18`	`ShortVersion versionFromTip;`
`21`	`19`	`if (MergeMessageParser.TryParse(tip, out versionFromTip))`
`22`	`20`	`{`
`23`		`- semanticVersion = BuildVersion(tip, versionFromTip);`
	`21`	`+ return BuildVersion(tip, versionFromTip);`
`24`	`22`	`}`
`25`		`-`
`26`		`- if (semanticVersion == null \|\| semanticVersion.IsEmpty())`
`27`		`- {`
`28`		`- throw new WarningException("The head of master should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");`
`29`		`- }`
`30`		`-`
`31`		`- return semanticVersion;`
	`23`	`+ throw new WarningException("The head of master should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");`
`32`	`24`	`}`
`33`	`25`
`34`	`26`	`SemanticVersion BuildVersion(Commit tip, ShortVersion shortVersion)`
Original file line number	Diff line number	Diff line change
`@@ -8,29 +8,21 @@ public SemanticVersion FindVersion(IRepository repository, Commit tip)`
`8`	`8`	`{`
`9`	`9`	`foreach (var tag in repository.TagsByDate(tip))`
`10`	`10`	`{`
`11`		`- ShortVersion shortVersion;`
`12`		`- if (ShortVersionParser.TryParse(tag.Name, out shortVersion))`
	`11`	`+ ShortVersion shortVersion;`
	`12`	`+ if (ShortVersionParser.TryParse(tag.Name, out shortVersion))`
`13`	`13`	`{`
`14`	`14`	`return BuildVersion(tip, shortVersion);`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`- var semanticVersion = new SemanticVersion();`
`19`		`-`
`20`	`18`	`ShortVersion versionFromTip;`
`21`	`19`	`if (MergeMessageParser.TryParse(tip, out versionFromTip))`
`22`	`20`	`{`
`23`		`- semanticVersion = BuildVersion(tip, versionFromTip);`
`24`		`- }`
`25`		`-`
`26`		`- semanticVersion.OverrideVersionManuallyIfNeeded(repository);`
`27`		`-`
`28`		`- if (semanticVersion == null \|\| semanticVersion.IsEmpty())`
`29`		`- {`
`30`		`- throw new WarningException("The head of a support branch should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");`
	`21`	`+ var semanticVersion = BuildVersion(tip, versionFromTip);`
	`22`	`+ semanticVersion.OverrideVersionManuallyIfNeeded(repository);`
	`23`	`+ return semanticVersion;`
`31`	`24`	`}`
`32`		`-`
`33`		`- return semanticVersion;`
	`25`	`+ throw new WarningException("The head of a support branch should always be a merge commit if you follow gitflow. Please create one or work around this by tagging the commit with SemVer compatible Id.");`
`34`	`26`	`}`
`35`	`27`
`36`	`28`	`SemanticVersion BuildVersion(Commit tip, ShortVersion shortVersion)`
Original file line number	Diff line number	Diff line change
`@@ -12,27 +12,29 @@ public NextVersionTxtFileFinder(string repositoryDirectory)`
`12`	`12`	`this.repositoryDirectory = repositoryDirectory;`
`13`	`13`	`}`
`14`	`14`
`15`		`- public SemanticVersion GetNextVersion()`
	`15`	`+ public bool TryGetNextVersion(out SemanticVersion semanticVersion)`
`16`	`16`	`{`
`17`	`17`	`var filePath = Path.Combine(repositoryDirectory, "NextVersion.txt");`
`18`	`18`	`if (!File.Exists(filePath))`
`19`	`19`	`{`
`20`		`- return new SemanticVersion();`
	`20`	`+ semanticVersion = null;`
	`21`	`+ return false;`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`var version = File.ReadAllText(filePath);`
`24`	`25`	`if (string.IsNullOrEmpty(version))`
`25`	`26`	`{`
`26`		`- return new SemanticVersion();`
	`27`	`+ semanticVersion = null;`
	`28`	`+ return false;`
`27`	`29`	`}`
`28`	`30`
`29`		`- SemanticVersion semanticVersion;`
`30`	`31`	`if (!SemanticVersion.TryParse(version, out semanticVersion))`
`31`	`32`	`{`
`32`	`33`	`throw new ArgumentException("Make sure you have a valid semantic version in NextVersion.txt");`
`33`	`34`	`}`
`34`	`35`
`35`		`- return semanticVersion;`
	`36`	`+`
	`37`	`+ return true;`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@ namespace GitVersion`
`5`	`5`
`6`	`6`	`public class SemanticVersion : IFormattable, IComparable<SemanticVersion>`
`7`	`7`	`{`
`8`		`- public static SemanticVersion Empty = new SemanticVersion();`
`9`		`-`
`10`	`8`	`static Regex ParseSemVer = new Regex(`
`11`	`9`	`@"[vV]?(?<SemVer>(?<Major>\d+)(\.(?<Minor>\d+))?(\.(?<Patch>\d+))?)(\.(?<FourthPart>\d+))?(-(?<Tag>[^\+]))?(\+(?<BuildMetaData>.))?",`
`12`	`10`	`RegexOptions.Compiled);`
`@@ -36,11 +34,6 @@ public bool Equals(SemanticVersion obj)`
`36`	`34`	`BuildMetaData == obj.BuildMetaData;`
`37`	`35`	`}`
`38`	`36`
`39`		`- public bool IsEmpty()`
`40`		`- {`
`41`		`- return Equals(Empty);`
`42`		`- }`
`43`		`-`
`44`	`37`	`public static bool operator ==(SemanticVersion v1, SemanticVersion v2)`
`45`	`38`	`{`
`46`	`39`	`if (ReferenceEquals(v1, null))`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ public static class SemanticVersionExtensions`
`7`	`7`	`public static void OverrideVersionManuallyIfNeeded(this SemanticVersion version, IRepository repository)`
`8`	`8`	`{`
`9`	`9`	`var nextVersionTxtFileFinder = new NextVersionTxtFileFinder(repository.GetRepositoryDirectory());`
`10`		`- var manualNextVersion = nextVersionTxtFileFinder.GetNextVersion();`
`11`		`- if (!manualNextVersion.IsEmpty())`
	`10`	`+ SemanticVersion manualNextVersion ;`
	`11`	`+ if (nextVersionTxtFileFinder.TryGetNextVersion(out manualNextVersion))`
`12`	`12`	`{`
`13`	`13`	`if (manualNextVersion > version)`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"Major": 0,`
`3`		`- "Minor": 3,`
`4`		`- "Timestamp": "2000-10-09T23:59:58Z",`
`5`		`- "CommitSha": "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"`
	`3`	`+ "Minor": 3`
`6`	`4`	`}`