Config based versioning improvements

GitVersionCore.Tests/Fixtures/BaseGitFlowRepositoryFixture.cs

@@ -1,8 +1,6 @@
 using System;
 using System.IO;
-using System.Text;
 using GitVersion;
-using GitVersion.Helpers;
 using LibGit2Sharp;
 
 /// <summary>
@@ -41,19 +39,4 @@ void SetupRepo(Action<IRepository> initialMasterAction)
         Repository.CreateBranch("develop").Checkout();
         Repository.MakeACommit();
     }
-
-    public void DumpGraph()
-    {
-        var output = new StringBuilder();
-
-        ProcessHelper.Run(
-            o => output.AppendLine(o),
-            e => output.AppendLineFormat("ERROR: {0}", e),
-            null,
-            "git",
-            @"log --graph --abbrev-commit --decorate --date=relative --all",
-            RepositoryPath);
-
-        Console.Write(output.ToString());
-    }
 }

GitVersionCore.Tests/Fixtures/EmptyRepositoryFixture.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Text;
 using GitVersion;
+using GitVersion.Helpers;
 using LibGit2Sharp;
 
 public class EmptyRepositoryFixture : RepositoryFixtureBase
@@ -9,6 +11,21 @@ public EmptyRepositoryFixture(Config configuration) :
     {
     }
 
+    public void DumpGraph()
+    {
+        var output = new StringBuilder();
+
+        ProcessHelper.Run(
+            o => output.AppendLine(o),
+            e => output.AppendLineFormat("ERROR: {0}", e),
+            null,
+            "git",
+            @"log --graph --abbrev-commit --decorate --date=relative --all",
+            RepositoryPath);
+
+        Console.Write(output.ToString());
+    }
+
     static IRepository CreateNewRepository(string path)
     {
         LibGit2Sharp.Repository.Init(path);

GitVersionCore.Tests/GitVersionContextBuilder.cs

@@ -0,0 +1,80 @@
+namespace GitVersionCore.Tests
+{
+    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 GitVersionContextBuilder WithTaggedMaster()
+        {
+            repository = CreateRepository();
+            var target = repository.Head.Tip;
+            ((MockTagCollection)repository.Tags).Add(new MockTag ("1.0.0", target));
+            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();
+            return AddBranch(branchName);
+        }
+
+        public GitVersionContextBuilder AddBranch(string branchName)
+        {
+            var mockBranch = new MockBranch(branchName)
+            {
+                new MockCommit()
+            };
+            ((MockBranchCollection)repository.Branches).Add(mockBranch);
+            ((MockRepository)repository).Head = mockBranch;
+            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
+                },
+                Tags = new MockTagCollection(),
+                Head = mockBranch
+            };
+
+            return mockRepository;
+        }
+    }
+}

GitVersionCore.Tests/GitVersionContextTests.cs

@@ -1,6 +1,7 @@
 namespace GitVersionCore.Tests
 {
     using GitVersion;
+    using LibGit2Sharp;
     using NUnit.Framework;
     using Shouldly;
 
@@ -50,5 +51,26 @@ public void UsesBranchSpecificConfigOverTopLevelDefaults()
             context.Configuration.VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
             context.Configuration.Tag.ShouldBe("alpha");
         }
+
+        [Test]
+        public void CanFindParentBranchForInheritingIncrementStrategy()
+        {
+            var config = new Config();
+            config.Branches["develop"].Increment = IncrementStrategy.Major;
+            config.Branches["feature[/-]"].Increment = IncrementStrategy.Inherit;
+
+            using (var repo = new EmptyRepositoryFixture(config))
+            {
+                repo.Repository.MakeACommit();
+                repo.Repository.CreateBranch("develop").Checkout();
+                repo.Repository.MakeACommit();
+                var featureBranch = repo.Repository.CreateBranch("feature/foo");
+                featureBranch.Checkout();
+                repo.Repository.MakeACommit();
+
+                var context = new GitVersionContext(repo.Repository, config);
+                context.Configuration.Increment.ShouldBe(IncrementStrategy.Major);
+            }
+        }
     }
 }

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -96,6 +96,7 @@
     <Compile Include="Mocks\MockCommit.cs" />
     <Compile Include="Mocks\MockCommitLog.cs" />
     <Compile Include="Mocks\MockMergeCommit.cs" />
+    <Compile Include="Mocks\MockQueryableCommitLog.cs" />
     <Compile Include="Mocks\MockReferenceCollection.cs" />
     <Compile Include="Mocks\MockReflogCollection.cs" />
     <Compile Include="Mocks\MockRepository.cs" />
@@ -114,6 +115,15 @@
     <Compile Include="TestEffectiveConfiguration.cs" />
     <Compile Include="TestFileSystem.cs" />
     <Compile Include="VariableProviderTests.cs" />
+    <Compile Include="VersionCalculation\BaseVersionCalculatorTests.cs" />
+    <Compile Include="VersionCalculation\NewNextVersionCalculatorTests.cs" />
+    <Compile Include="VersionCalculation\Strategies\ConfigNextVersionBaseVersionStrategyTests.cs" />
+    <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>
   <ItemGroup>
     <None Include="packages.config" />

GitVersionCore.Tests/IntegrationTests/GitFlow/DevelopScenarios.cs

@@ -6,29 +6,43 @@
 public class DevelopScenarios
 {
     [Test]
-    public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
+    public void WhenDevelopBranchedFromTaggedCommitOnMasterVersionDoesNotChange()
     {
         using (var fixture = new EmptyRepositoryFixture(new Config()))
         {
             fixture.Repository.MakeATaggedCommit("1.0.0");
             fixture.Repository.CreateBranch("develop").Checkout();
+            // TODO Should actually be 1.0.0+0
             fixture.AssertFullSemver("1.1.0-unstable.0+0");
         }
     }
 
+    [Test]
+    public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("develop").Checkout();
+            fixture.Repository.MakeACommit();
+            fixture.AssertFullSemver("1.1.0-unstable.1+1");
+        }
+    }
+
     [Test]
     public void MergingReleaseBranchBackIntoDevelopWithoutMergingToMaster_DoesNotBumpDevelopVersion()
     {
         using (var fixture = new EmptyRepositoryFixture(new Config()))
         {
             fixture.Repository.MakeATaggedCommit("1.0.0");
             fixture.Repository.CreateBranch("develop").Checkout();
+            fixture.Repository.MakeACommit();
             fixture.Repository.CreateBranch("release-2.0.0").Checkout();
             fixture.AssertFullSemver("2.0.0-beta.1+0");
             fixture.Repository.Checkout("develop");
-            fixture.AssertFullSemver("1.1.0-unstable.0+0");
+            fixture.AssertFullSemver("1.1.0-unstable.1+1");
             fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
-            fixture.AssertFullSemver("1.1.0-unstable.0+0");
+            fixture.AssertFullSemver("1.1.0-unstable.1+1");
         }
     }
 

GitVersionCore.Tests/Mocks/MockCommit.cs

@@ -6,12 +6,17 @@
 [DebuggerDisplay("{DebuggerDisplay}")]
 public class MockCommit : Commit
 {
+    static int commitCount = 1;
+    static DateTimeOffset when = DateTimeOffset.Now;
+
     public MockCommit(ObjectId id = null)
     {
         idEx = id ?? new ObjectId(Guid.NewGuid().ToString().Replace("-", "") + "00000000");
-        MessageEx = "";
+        MessageEx = "Commit " + commitCount++;
         ParentsEx = new List<Commit> { null };
-        CommitterEx = new Signature("Joe", "[email protected]", DateTimeOffset.Now);
+        CommitterEx = new Signature("Joe", "[email protected]", when);
+        // Make sure each commit is a different time
+        when = when.AddSeconds(1);
     }
 
     public string MessageEx;

GitVersionCore.Tests/Mocks/MockCommitLog.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using LibGit2Sharp;
 
 public class MockCommitLog : ICommitLog, ICollection<Commit>
@@ -8,7 +9,10 @@ public class MockCommitLog : ICommitLog, ICollection<Commit>
 
     public IEnumerator<Commit> GetEnumerator()
     {
-        return Commits.GetEnumerator();
+        if (SortedBy == CommitSortStrategies.Reverse)
+            return Commits.GetEnumerator();
+
+        return Enumerable.Reverse(Commits).GetEnumerator();
     }
 
     IEnumerator IEnumerable.GetEnumerator()

GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using LibGit2Sharp;
+
+public class MockQueryableCommitLog : IQueryableCommitLog
+{
+    readonly ICommitLog commits;
+
+    public MockQueryableCommitLog(ICommitLog commits)
+    {
+        this.commits = commits;
+    }
+
+    public IEnumerator<Commit> GetEnumerator()
+    {
+        return commits.GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+
+    public CommitSortStrategies SortedBy
+    {
+        get { throw new NotImplementedException(); }
+    }
+
+    public ICommitLog QueryBy(CommitFilter filter)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Commit FindMergeBase(Commit first, Commit second)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Commit FindMergeBase(IEnumerable<Commit> commits, MergeBaseFindingStrategy strategy)
+    {
+        throw new NotImplementedException();
+    }
+}

GitVersionCore.Tests/Mocks/MockRepository.cs

@@ -4,6 +4,8 @@
 
 public class MockRepository : IRepository
 {
+    IQueryableCommitLog commits;
+
     public MockRepository()
     {
         Tags = new MockTagCollection();
@@ -116,7 +118,13 @@ public BlameHunkCollection Blame(string path, BlameOptions options = null)
     public Configuration Config { get; set; }
     public Index Index { get; set; }
     public ReferenceCollection Refs { get; set; }
-    public IQueryableCommitLog Commits { get; set; }
+
+    public IQueryableCommitLog Commits
+    {
+        get { return commits ?? new MockQueryableCommitLog(Head.Commits); }
+        set { commits = value; }
+    }
+
     public BranchCollection Branches { get; set; }
     public TagCollection Tags { get; set; }
     public RepositoryInformation Info { get; set; }

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/TestEffectiveConfiguration.cs

@@ -9,8 +9,9 @@ public TestEffectiveConfiguration(
             VersioningMode versioningMode = VersioningMode.ContinuousDelivery, 
             string gitTagPrefix = "v", 
             string tag = "",
-            string nextVersion = null) : 
-                base(assemblyVersioningScheme, versioningMode, gitTagPrefix, tag, nextVersion)
+            string nextVersion = null,
+            string branchPrefixToTrim = "") : 
+                base(assemblyVersioningScheme, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch, branchPrefixToTrim)
         {
         }
     }