Adding LastTagBaseVersionStrategy

Author: JakeGinnivan

GitVersionCore.Tests/VersionCalculation/Strategies/GitVersionContextBuilder.cs renamed to GitVersionCore.Tests/GitVersionContextBuilder.cs

@@ -1,4 +1,4 @@
-namespace GitVersionCore.Tests.VersionCalculation.Strategies
+namespace GitVersionCore.Tests
 {
     using GitVersion;
     using LibGit2Sharp;
@@ -20,6 +20,15 @@ public GitVersionContextBuilder WithConfig(Config config)
             return this;
         }
 
+        public GitVersionContextBuilder WithTaggedMaster()
+        {
+            repository = CreateRepository();
+            var target = repository.Head.Tip;
+            ((MockTagCollection)repository.Tags).Add(new MockTag ("1.0.0", target));
+            ((MockBranch)repository.Head).Add(new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() });
+            return this;
+        }
+
         public GitVersionContext Build()
         {
             return new GitVersionContext(repository ?? CreateRepository(), config ?? new Config());
@@ -34,6 +43,7 @@ IRepository CreateRepository()
                 {
                     mockBranch
                 },
+                Tags = new MockTagCollection(),
                 Head = mockBranch
             };
 

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -117,7 +117,8 @@
     <Compile Include="VariableProviderTests.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculatorTests.cs" />
     <Compile Include="VersionCalculation\Strategies\ConfigNextVersionBaseVersionStrategyTests.cs" />
-    <Compile Include="VersionCalculation\Strategies\GitVersionContextBuilder.cs" />
+    <Compile Include="GitVersionContextBuilder.cs" />
+    <Compile Include="VersionCalculation\Strategies\LastTagBaseVersionStrategyTests.cs" />
     <Compile Include="VersionCalculation\Strategies\MergeMessageBaseVersionStrategyTests.cs" />
   </ItemGroup>
   <ItemGroup>

GitVersionCore.Tests/Mocks/MockTag.cs

@@ -15,6 +15,15 @@ public override GitObject Target
         get { return TargetEx; }
     }
     public TagAnnotation AnnotationEx;
+
+    public MockTag() { }
+
+    public MockTag(string name, Commit target)
+    {
+        NameEx = name;
+        TargetEx = target;
+    }
+
     public override TagAnnotation Annotation
     {
         get { return AnnotationEx; }

GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

@@ -3,7 +3,6 @@
     using GitVersion;
     using GitVersion.VersionCalculation;
     using GitVersion.VersionCalculation.BaseVersionCalculators;
-    using GitVersionCore.Tests.VersionCalculation.Strategies;
     using NUnit.Framework;
     using Shouldly;
 

GitVersionCore.Tests/VersionCalculation/Strategies/LastTagBaseVersionStrategyTests.cs

@@ -0,0 +1,23 @@
+namespace GitVersionCore.Tests.VersionCalculation.Strategies
+{
+    using GitVersion.VersionCalculation.BaseVersionCalculators;
+    using NUnit.Framework;
+    using Shouldly;
+
+    [TestFixture]
+    public class LastTagBaseVersionStrategyTests
+    {
+        [Test]
+        public void ShouldAllowVersionIncremenet()
+        {
+            var context = new GitVersionContextBuilder()
+                .WithTaggedMaster()
+                .Build();
+            var sut = new LastTagBaseVersionStrategy();
+
+            var baseVersion = sut.GetVersion(context);
+
+            baseVersion.ShouldIncrement.ShouldBe(true);
+        }
+    }
+}

GitVersionCore/GitVersionCore.csproj

@@ -90,6 +90,7 @@
     <Compile Include="VersionCalculation\BaseVersionCalculator.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\BaseVersion.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\ConfigNextVersionBaseVersionStrategy.cs" />
+    <Compile Include="VersionCalculation\BaseVersionCalculators\LastTagBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\MergeMessageBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionStrategy.cs" />
     <Compile Include="VersioningModes\ContinuousDeliveryMode.cs" />

GitVersionCore/VersionCalculation/BaseVersionCalculators/LastTagBaseVersionStrategy.cs

@@ -0,0 +1,14 @@
+namespace GitVersion.VersionCalculation.BaseVersionCalculators
+{
+    public class LastTagBaseVersionStrategy : BaseVersionStrategy
+    {
+        public override BaseVersion GetVersion(GitVersionContext context)
+        {
+            VersionTaggedCommit version;
+            if (new LastTaggedReleaseFinder(context).GetVersion(out version))
+                return new BaseVersion(true, version.SemVer);
+
+            return null;
+        }
+    }
+}