Added missing base version finder

Author: JakeGinnivan

GitVersionCore.Tests/GitVersionContextBuilder.cs

@@ -29,14 +29,25 @@ public GitVersionContextBuilder WithTaggedMaster()
             return this;
         }
 
+        public GitVersionContextBuilder AddCommit()
+        {
+            ((MockBranch)repository.Head).Add(new MockCommit());
+            return this;
+        }
+
         public GitVersionContextBuilder WithDevelopBranch()
+        {
+            return WithBranch("develop");
+        }
+
+        public GitVersionContextBuilder WithBranch(string branchName)
         {
             repository = CreateRepository();
-            var mockBranch = new MockBranch("develop")
+            var mockBranch = new MockBranch(branchName)
             {
                 new MockCommit()
             };
-            ((MockBranchCollection) repository.Branches).Add(mockBranch);
+            ((MockBranchCollection)repository.Branches).Add(mockBranch);
             ((MockRepository)repository).Head = mockBranch;
             return this;
         }

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -121,6 +121,7 @@
     <Compile Include="GitVersionContextBuilder.cs" />
     <Compile Include="VersionCalculation\Strategies\LastTagBaseVersionStrategyTests.cs" />
     <Compile Include="VersionCalculation\Strategies\MergeMessageBaseVersionStrategyTests.cs" />
+    <Compile Include="VersionCalculation\Strategies\VersionInBranchBaseVersionStrategyTests.cs" />
     <Compile Include="VersionCalculation\TestBaseVersionCalculator.cs" />
     <Compile Include="VersionCalculation\TestMetaDataCalculator.cs" />
   </ItemGroup>

GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchBaseVersionStrategyTests.cs

@@ -0,0 +1,34 @@
+namespace GitVersionCore.Tests.VersionCalculation.Strategies
+{
+    using GitVersion.VersionCalculation.BaseVersionCalculators;
+    using NUnit.Framework;
+    using Shouldly;
+
+    [TestFixture]
+    public class VersionInBranchBaseVersionStrategyTests
+    {
+        [Test]
+        [TestCase("release-2.0.0", "2.0.0")]
+        [TestCase("release/2.0.0", "2.0.0")]
+        [TestCase("hotfix-2.0.0", "2.0.0")]
+        [TestCase("hotfix/2.0.0", "2.0.0")]
+        [TestCase("hotfix/2.0.0", "2.0.0")]
+        [TestCase("feature/JIRA-123", null)]
+        public void CanTakeVersionFromBranchName(string branchName, string expectedBaseVersion)
+        {
+            var context = new GitVersionContextBuilder()
+                .WithBranch(branchName)
+                .AddCommit()
+                .Build();
+
+            var sut = new VersionInBranchBaseVersionStrategy();
+
+            var baseVersion = sut.GetVersion(context);
+
+            if (expectedBaseVersion == null)
+                baseVersion.ShouldBe(null);
+            else
+                baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
+        }
+    }
+}

GitVersionCore/GitVersionCore.csproj

@@ -93,6 +93,7 @@
     <Compile Include="VersionCalculation\BaseVersionCalculators\ConfigNextVersionBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\LastTagBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\MergeMessageBaseVersionStrategy.cs" />
+    <Compile Include="VersionCalculation\BaseVersionCalculators\VersionInBranchBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\IBaseVersionCalculator.cs" />
     <Compile Include="VersionCalculation\IMetaDataCalculator.cs" />

GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchBaseVersionStrategy.cs

@@ -0,0 +1,35 @@
+namespace GitVersion.VersionCalculation.BaseVersionCalculators
+{
+    using System;
+    using System.Linq;
+
+    public class VersionInBranchBaseVersionStrategy : BaseVersionStrategy
+    {
+        public override BaseVersion GetVersion(GitVersionContext context)
+        {
+            var versionInBranch = GetVersionInBranch(context);
+            if (versionInBranch != null)
+            {
+                var firstCommitOfBranch = context.CurrentBranch.Commits.Last();
+                return new BaseVersion(false, versionInBranch.Item2, firstCommitOfBranch);
+            }
+
+            return null;
+        }
+
+        Tuple<string, SemanticVersion> GetVersionInBranch(GitVersionContext context)
+        {
+            var branchParts = context.CurrentBranch.Name.Split('/', '-');
+            foreach (var part in branchParts)
+            {
+                SemanticVersion semanticVersion;
+                if (SemanticVersion.TryParse(part, context.Configuration.GitTagPrefix, out semanticVersion))
+                {
+                    return Tuple.Create(part, semanticVersion);
+                }
+            }
+
+            return null;
+        }
+    }
+}

GitVersionCore/VersionCalculation/NewNextVersionCalculator.cs

@@ -15,7 +15,8 @@ public NewNextVersionCalculator(IBaseVersionCalculator baseVersionCalculator = n
                 new BaseVersionCalculator(
                 new ConfigNextVersionBaseVersionStrategy(),
                 new LastTagBaseVersionStrategy(),
-                new MergeMessageBaseVersionStrategy());
+                new MergeMessageBaseVersionStrategy(),
+                new VersionInBranchBaseVersionStrategy());
         }
 
         public SemanticVersion FindVersion(GitVersionContext context)