Config file updates

GitVersionCore.Tests/ConfigReaderTests.cs

@@ -0,0 +1,33 @@
+using System.IO;
+using GitVersion;
+using NUnit.Framework;
+using Shouldly;
+
+[TestFixture]
+public class ConfigReaderTests
+{
+
+    [Test]
+    public void CanReadDocument()
+    {
+        const string text = @"
+assemblyVersioningScheme: MajorMinor
+develop-branch-tag: alpha
+release-branch-tag: rc
+";
+        var config = ConfigReader.Read(new StringReader(text));
+        config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
+        config.DevelopBranchTag.ShouldBe("alpha");
+        config.ReleaseBranchTag.ShouldBe("rc");
+    }
+
+    [Test]
+    public void CanReadDefaultDocument()
+    {
+        const string text = "";
+        var config = ConfigReader.Read(new StringReader(text));
+        config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
+        config.DevelopBranchTag.ShouldBe("unstable");
+        config.ReleaseBranchTag.ShouldBe("beta");
+    }
+}

GitVersionCore.Tests/GitFlow/BaseGitFlowRepositoryFixture.cs → GitVersionCore.Tests/Fixtures/BaseGitFlowRepositoryFixture.cs

@@ -1,15 +1,16 @@
 using System;
 using System.IO;
+using GitVersion;
 using LibGit2Sharp;
 
 public class BaseGitFlowRepositoryFixture : EmptyRepositoryFixture
 {
-    public BaseGitFlowRepositoryFixture(string initialVersion)
+    public BaseGitFlowRepositoryFixture(string initialVersion) : base(new Config())
     {
         SetupRepo(r => r.MakeATaggedCommit(initialVersion));
     }
 
-    public BaseGitFlowRepositoryFixture(Action<IRepository> initialMasterAction)
+    public BaseGitFlowRepositoryFixture(Action<IRepository> initialMasterAction) : base(new Config())
     {
         SetupRepo(initialMasterAction);
     }

GitVersionCore.Tests/CommitCountingRepoFixture.cs → GitVersionCore.Tests/Fixtures/CommitCountingRepoFixture.cs

@@ -1,11 +1,12 @@
 using System;
 using System.IO;
+using GitVersion;
 using LibGit2Sharp;
 
 public class CommitCountingRepoFixture : RepositoryFixtureBase
 {
     public CommitCountingRepoFixture() :
-        base(CloneTestRepo)
+        base(CloneTestRepo, new Config())
     {
     }
 

GitVersionCore.Tests/EmptyRepositoryFixture.cs → GitVersionCore.Tests/Fixtures/EmptyRepositoryFixture.cs

@@ -1,10 +1,11 @@
 using System;
+using GitVersion;
 using LibGit2Sharp;
 
 public class EmptyRepositoryFixture : RepositoryFixtureBase
 {
-    public EmptyRepositoryFixture() :
-        base(CreateNewRepository)
+    public EmptyRepositoryFixture(Config configuration) :
+        base(CreateNewRepository, configuration)
     {
     }
 

GitVersionCore.Tests/RepositoryFixtureBase.cs → GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs

@@ -7,9 +7,11 @@ public abstract class RepositoryFixtureBase : IDisposable
 {
     public string RepositoryPath;
     public IRepository Repository;
+    private Config configuration;
 
-    protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder)
+    protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder, Config configuration)
     {
+        this.configuration = configuration;
         RepositoryPath = PathHelper.GetTempPath();
         Repository = repoBuilder(RepositoryPath);
         Repository.Config.Set("user.name", "Test");
@@ -19,7 +21,7 @@ protected RepositoryFixtureBase(Func<string, IRepository> repoBuilder)
     public SemanticVersion ExecuteGitVersion()
     {
         var vf = new GitVersionFinder();
-        return vf.FindVersion(new GitVersionContext(Repository));
+        return vf.FindVersion(new GitVersionContext(Repository, configuration));
     }
 
     public void AssertFullSemver(string fullSemver)

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -65,27 +65,29 @@
     <Compile Include="..\GitVersionTask.Tests\Helpers\DirectoryHelper.cs">
       <Link>Helpers\DirectoryHelper.cs</Link>
     </Compile>
-    <Compile Include="CommitCountingRepoFixture.cs" />
+    <Compile Include="Fixtures\CommitCountingRepoFixture.cs" />
+    <Compile Include="ConfigReaderTests.cs" />
     <Compile Include="GitDirFinderTests.cs" />
-    <Compile Include="GitFlow\BaseGitFlowRepositoryFixture.cs" />
-    <Compile Include="GitFlow\DevelopScenarios.cs" />
-    <Compile Include="GitFlow\MetaDataByCommitFixture.cs" />
-    <Compile Include="GitFlow\PatchScenarios.cs" />
-    <Compile Include="GitFlow\UncycloScenarios.cs" />
-    <Compile Include="GitHubFlow\OtherBranchTests.cs" />
-    <Compile Include="GitHubFlow\ReleaseBranchTests.cs" />
+    <Compile Include="Fixtures\BaseGitFlowRepositoryFixture.cs" />
+    <Compile Include="IntegrationTests\GitFlow\DevelopScenarios.cs" />
+    <Compile Include="IntegrationTests\GitFlow\MetaDataByCommitScenarios.cs" />
+    <Compile Include="IntegrationTests\GitFlow\PatchScenarios.cs" />
+    <Compile Include="IntegrationTests\GitFlow\ReleaseBranchTests.cs" />
+    <Compile Include="IntegrationTests\GitFlow\UncycloScenarios.cs" />
+    <Compile Include="IntegrationTests\GitHubFlow\OtherBranchTests.cs" />
+    <Compile Include="IntegrationTests\GitHubFlow\ReleaseBranchTests.cs" />
     <Compile Include="Helpers\Constants.cs" />
     <Compile Include="Helpers\NextVersionWriter.cs" />
     <Compile Include="InformationalVersionBuilderTests.cs" />
     <Compile Include="JsonVersionBuilderTests.cs" />
     <Compile Include="LastVersionOnMasterFinderTests.cs" />
     <Compile Include="ModuleInitializer.cs" />
-    <Compile Include="EmptyRepositoryFixture.cs" />
+    <Compile Include="Fixtures\EmptyRepositoryFixture.cs" />
     <Compile Include="Helpers\GitHelper.cs" />
     <Compile Include="Helpers\PathHelper.cs" />
-    <Compile Include="GitHubFlow\MasterTests.cs" />
+    <Compile Include="IntegrationTests\GitHubFlow\MasterTests.cs" />
     <Compile Include="ApprovalTestsConfig.cs" />
-    <Compile Include="RepositoryFixtureBase.cs" />
+    <Compile Include="Fixtures\RepositoryFixtureBase.cs" />
     <Compile Include="SemanticVersionTests.cs" />
     <Compile Include="ShortVersionParserTests.cs" />
     <Compile Include="VariableProviderTests.cs" />
@@ -103,6 +105,7 @@
     <Content Include="FodyWeavers.xml" />
     <Content Include="JsonVersionBuilderTests.Json.approved.txt" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

GitVersionCore.Tests/GitVersionCore.Tests.v2.ncrunchproject

@@ -22,6 +22,6 @@
   <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
   <MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
   <BuildProcessArchitecture>x86</BuildProcessArchitecture>
-  <AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\**.*</AdditionalFilesToInclude>
+  <AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\**.*;Resources\**.*</AdditionalFilesToInclude>
   <HiddenWarnings>PostBuildEventDisabled</HiddenWarnings>
 </ProjectConfiguration>

GitVersionCore.Tests/IntegrationTests/GitFlow/DevelopScenarios.cs

@@ -0,0 +1,61 @@
+using GitVersion;
+using LibGit2Sharp;
+using NUnit.Framework;
+
+[TestFixture]
+public class DevelopScenarios
+{
+    [Test]
+    public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("develop").Checkout();
+            fixture.AssertFullSemver("1.1.0-unstable.0+0");
+        }
+    }
+
+    [Test]
+    public void CanChangeDevelopTagViaConfig()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config
+        {
+            DevelopBranchTag = "alpha"
+        }))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("develop").Checkout();
+            fixture.AssertFullSemver("1.1.0-alpha.0+0");
+        }
+    }
+
+    [Test]
+    public void CanClearDevelopTagViaConfig()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config
+        {
+            DevelopBranchTag = ""
+        }))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("develop").Checkout();
+            fixture.AssertFullSemver("1.1.0+0");
+        }
+    }
+
+    [Test]
+    public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("develop").Checkout();
+            fixture.Repository.MakeACommit();
+            var commit = fixture.Repository.Head.Tip;
+            fixture.Repository.MakeACommit();
+            fixture.Repository.Checkout(commit);
+            fixture.AssertFullSemver("1.1.0-unstable.1+1");
+        }
+    }
+}

GitVersionCore.Tests/GitFlow/MetaDataByCommitFixture.cs → GitVersionCore.Tests/IntegrationTests/GitFlow/MetaDataByCommitScenarios.cs

@@ -3,7 +3,7 @@
 using Shouldly;
 
 [TestFixture]
-public class MetaDataByCommitFixture
+public class MetaDataByCommitScenarios
 {
     /*
          *  hotfix-1.2.1       -----------C--      

GitVersionCore.Tests/IntegrationTests/GitFlow/ReleaseBranchTests.cs

@@ -0,0 +1,86 @@
+using GitVersion;
+using LibGit2Sharp;
+using NUnit.Framework;
+
+[TestFixture]
+public class GitFlowReleaseBranchTests
+{
+    [Test]
+    public void CanTakeVersionFromReleaseBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.CreateBranch("develop");
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+
+            fixture.AssertFullSemver("2.0.0-beta.1+5");
+        }
+    }
+
+    [Test]
+    public void CanTakeVersionFromReleaseBranchWithTagOverriden()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config { ReleaseBranchTag = "rc" }))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.CreateBranch("develop");
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+
+            fixture.AssertFullSemver("2.0.0-rc.1+5");
+        }
+    }
+
+    [Test]
+    public void WhenReleaseBranchIsMergedIntoMasterVersionIsTakenWithIt()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.CreateBranch("develop");
+            fixture.Repository.MakeCommits(1);
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+            fixture.Repository.MakeCommits(4);
+            fixture.Repository.Checkout("master");
+            fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
+
+            // TODO For GitHubFlow this is 2.0.0+6, why is it different
+            fixture.AssertFullSemver("2.0.0");
+        }
+    }
+
+    // TODO This test fails for GitFlow, it needs to be fixed (although in reality a support branch should be used)
+    [Test, Ignore]
+    public void WhenReleaseBranchIsMergedIntoMasterHighestVersionIsTakenWithIt()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.CreateBranch("develop");
+            fixture.Repository.MakeCommits(1);
+
+            fixture.Repository.CreateBranch("release-2.0.0");
+            fixture.Repository.Checkout("release-2.0.0");
+            fixture.Repository.MakeCommits(4);
+            fixture.Repository.Checkout("master");
+            fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
+            fixture.Repository.Checkout("develop");
+            fixture.Repository.MergeNoFF("release-2.0.0", Constants.SignatureNow());
+
+            fixture.Repository.CreateBranch("release-1.0.0");
+            fixture.Repository.Checkout("release-1.0.0");
+            fixture.Repository.MakeCommits(4);
+            fixture.Repository.Checkout("master");
+            fixture.Repository.MergeNoFF("release-1.0.0", Constants.SignatureNow());
+            fixture.Repository.Checkout("develop");
+            fixture.Repository.MergeNoFF("release-1.0.0", Constants.SignatureNow());
+
+            fixture.AssertFullSemver("2.0.0+11");
+        }
+    }
+}

GitVersionCore.Tests/GitFlow/UncycloScenarios.cs → GitVersionCore.Tests/IntegrationTests/GitFlow/UncycloScenarios.cs

@@ -1,4 +1,5 @@
-using LibGit2Sharp;
+using GitVersion;
+using LibGit2Sharp;
 using NUnit.Framework;
 
 [TestFixture]
@@ -37,7 +38,7 @@ participant release-1.3.0
     [Test]
     public void MinorReleaseExample()
     {
-        using (var fixture = new EmptyRepositoryFixture())
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
         {
             fixture.Repository.MakeATaggedCommit("1.2.0");