Starting on base version calculators

Author: JakeGinnivan

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -115,6 +115,9 @@
     <Compile Include="TestEffectiveConfiguration.cs" />
     <Compile Include="TestFileSystem.cs" />
     <Compile Include="VariableProviderTests.cs" />
+    <Compile Include="VersionCalculation\BaseVersionCalculatorTests.cs" />
+    <Compile Include="VersionCalculation\Strategies\ConfigNextVersionBaseVersionStrategyTests.cs" />
+    <Compile Include="VersionCalculation\Strategies\GitVersionContextBuilder.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

@@ -0,0 +1,41 @@
+namespace GitVersionCore.Tests.VersionCalculation
+{
+    using GitVersion;
+    using GitVersion.VersionCalculation;
+    using GitVersion.VersionCalculation.BaseVersionCalculators;
+    using GitVersionCore.Tests.VersionCalculation.Strategies;
+    using NUnit.Framework;
+    using Shouldly;
+
+    [TestFixture]
+    public class BaseVersionCalculatorTests
+    {
+        [Test]
+        public void ChoosesHighestVersionReturnedFromStrategies()
+        {
+            var context = new GitVersionContextBuilder().Build();
+            var sut = new BaseVersionCalculator(new V1Strategy(), new V2Strategy());
+
+            var baseVersion = sut.GetBaseVersion(context);
+
+            baseVersion.SemanticVersion.ToString().ShouldBe("2.0.0");
+            baseVersion.ShouldIncrement.ShouldBe(true);
+        }
+
+        class V1Strategy : BaseVersionStrategy
+        {
+            public override BaseVersion GetVersion(GitVersionContext context)
+            {
+                return new BaseVersion(false, new SemanticVersion(1));
+            }
+        }
+
+        class V2Strategy : BaseVersionStrategy
+        {
+            public override BaseVersion GetVersion(GitVersionContext context)
+            {
+                return new BaseVersion(true, new SemanticVersion(2));
+            }
+        }
+    }
+}

GitVersionCore.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs

@@ -0,0 +1,38 @@
+namespace GitVersionCore.Tests.VersionCalculation.Strategies
+{
+    using GitVersion;
+    using GitVersion.VersionCalculation.BaseVersionCalculators;
+    using NUnit.Framework;
+    using Shouldly;
+
+    [TestFixture]
+    public class ConfigNextVersionBaseVersionStrategyTests
+    {
+        [Test]
+        public void ShouldNotBeIncremented()
+        {
+            var contextBuilder = new GitVersionContextBuilder()
+                .WithConfig(new Config
+                {
+                    NextVersion = "1.0.0"
+                });
+            var sut = new ConfigNextVersionBaseVersionStrategy();
+
+            var baseVersion = sut.GetVersion(contextBuilder.Build());
+
+            baseVersion.ShouldIncrement.ShouldBe(false);
+            baseVersion.SemanticVersion.ToString().ShouldBe("1.0.0");
+        }
+
+        [Test]
+        public void ReturnsNullWhenNoNextVersionIsInConfig()
+        {
+            var contextBuilder = new GitVersionContextBuilder();
+            var sut = new ConfigNextVersionBaseVersionStrategy();
+
+            var baseVersion = sut.GetVersion(contextBuilder.Build());
+
+            baseVersion.ShouldBe(null);
+        }
+    }
+}

GitVersionCore.Tests/VersionCalculation/Strategies/GitVersionContextBuilder.cs

@@ -0,0 +1,43 @@
+namespace GitVersionCore.Tests.VersionCalculation.Strategies
+{
+    using GitVersion;
+    using LibGit2Sharp;
+
+    public class GitVersionContextBuilder
+    {
+        IRepository repository;
+        Config config;
+
+        public GitVersionContextBuilder WithRepository(IRepository repository)
+        {
+            this.repository = repository;
+            return this;
+        }
+
+        public GitVersionContextBuilder WithConfig(Config config)
+        {
+            this.config = config;
+            return this;
+        }
+
+        public GitVersionContext Build()
+        {
+            return new GitVersionContext(repository ?? CreateRepository(), config ?? new Config());
+        }
+
+        IRepository CreateRepository()
+        {
+            var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } };
+            var mockRepository = new MockRepository
+            {
+                Branches = new MockBranchCollection
+                {
+                    mockBranch
+                },
+                Head = mockBranch
+            };
+
+            return mockRepository;
+        }
+    }
+}

GitVersionCore/GitVersionCore.csproj

@@ -87,6 +87,10 @@
     <Compile Include="OutputVariables\CommitsAsFourthVersionPartFormatter.cs" />
     <Compile Include="OutputVariables\VersionVariables.cs" />
     <Compile Include="SemanticVersionExtensions.cs" />
+    <Compile Include="VersionCalculation\BaseVersionCalculator.cs" />
+    <Compile Include="VersionCalculation\BaseVersionCalculators\BaseVersion.cs" />
+    <Compile Include="VersionCalculation\BaseVersionCalculators\ConfigNextVersionBaseVersionStrategy.cs" />
+    <Compile Include="VersionCalculation\BaseVersionStrategy.cs" />
     <Compile Include="VersioningModes\ContinuousDeliveryMode.cs" />
     <Compile Include="VersioningModes\ContinuousDeploymentMode.cs" />
     <Compile Include="VersioningModes\VersioningMode.cs" />
@@ -144,6 +148,7 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

GitVersionCore/SemanticVersion.cs

@@ -15,8 +15,11 @@ public class SemanticVersion : IFormattable, IComparable<SemanticVersion>
         public SemanticVersionPreReleaseTag PreReleaseTag;
         public SemanticVersionBuildMetaData BuildMetaData;
 
-        public SemanticVersion()
+        public SemanticVersion(int major = 0, int minor = 0, int patch = 0)
         {
+            Major = major;
+            Minor = minor;
+            Patch = patch;
             PreReleaseTag = new SemanticVersionPreReleaseTag();
             BuildMetaData = new SemanticVersionBuildMetaData();
         }

GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

@@ -0,0 +1,23 @@
+namespace GitVersion.VersionCalculation
+{
+    using System.Linq;
+    using GitVersion.VersionCalculation.BaseVersionCalculators;
+
+    public class BaseVersionCalculator
+    {
+        readonly BaseVersionStrategy[] strategies;
+
+        public BaseVersionCalculator(params BaseVersionStrategy[] strategies)
+        {
+            this.strategies = strategies;
+        }
+
+        public BaseVersion GetBaseVersion(GitVersionContext context)
+        {
+            return strategies
+                .Select(s => s.GetVersion(context))
+                .Where(v => v != null)
+                .Aggregate((v1, v2) => v1.SemanticVersion > v2.SemanticVersion ? v1 : v2);
+        }
+    }
+}

GitVersionCore/VersionCalculation/BaseVersionCalculators/BaseVersion.cs

@@ -0,0 +1,15 @@
+namespace GitVersion.VersionCalculation.BaseVersionCalculators
+{
+    public class BaseVersion
+    {
+        public BaseVersion(bool shouldIncrement, SemanticVersion semanticVersion)
+        {
+            ShouldIncrement = shouldIncrement;
+            SemanticVersion = semanticVersion;
+        }
+
+        public bool ShouldIncrement { get; private set; }
+
+        public SemanticVersion SemanticVersion { get; private set; }
+    }
+}

GitVersionCore/VersionCalculation/BaseVersionCalculators/ConfigNextVersionBaseVersionStrategy.cs

@@ -0,0 +1,12 @@
+namespace GitVersion.VersionCalculation.BaseVersionCalculators
+{
+    public class ConfigNextVersionBaseVersionStrategy : BaseVersionStrategy
+    {
+        public override BaseVersion GetVersion(GitVersionContext context)
+        {
+            if (string.IsNullOrEmpty(context.Configuration.NextVersion))
+                return null;
+            return new BaseVersion(false, SemanticVersion.Parse(context.Configuration.NextVersion, context.Configuration.GitTagPrefix));
+        }
+    }
+}

GitVersionCore/VersionCalculation/BaseVersionStrategy.cs

@@ -0,0 +1,9 @@
+namespace GitVersion.VersionCalculation
+{
+    using GitVersion.VersionCalculation.BaseVersionCalculators;
+
+    public abstract class BaseVersionStrategy
+    {
+        public abstract BaseVersion GetVersion(GitVersionContext context);
+    }
+}