Configuration Updates

GitVersionCore.Tests/ConfigProviderTests.cs

@@ -51,22 +51,6 @@ public void CanReadDocument()
         config.Branches["develop"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
     }
 
-    [Test]
-    public void CanInheritVersioningMode()
-    {
-        const string text = @"
-mode: ContinuousDelivery
-branches:
-    develop:
-        mode: ContinuousDeployment
-";
-        SetupConfigFileContent(text);
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
-        config.Branches["develop"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
-        config.Branches["develop"].Tag.ShouldBe("unstable");
-        config.Branches["release[/-]"].VersioningMode.ShouldBe(VersioningMode.ContinuousDelivery);
-    }
-
     [Test]
     public void CanReadOldDocument()
     {

GitVersionCore.Tests/GitVersionContextTests.cs

@@ -0,0 +1,54 @@
+namespace GitVersionCore.Tests
+{
+    using GitVersion;
+    using NUnit.Framework;
+    using Shouldly;
+
+    public class GitVersionContextTests
+    {
+        [Test]
+        [Theory]
+        public void CanInheritVersioningMode(VersioningMode mode)
+        {
+            var config = new Config
+            {
+                VersioningMode = mode
+            };
+
+            var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } };
+            var mockRepository = new MockRepository
+            {
+                Branches = new MockBranchCollection
+                {
+                    mockBranch
+                }
+            };
+
+            var context = new GitVersionContext(mockRepository, mockBranch, config);
+            context.Configuration.VersioningMode.ShouldBe(mode);
+        }
+
+        [Test]
+        public void UsesBranchSpecificConfigOverTopLevelDefaults()
+        {
+            var config = new Config
+            {
+                VersioningMode = VersioningMode.ContinuousDelivery
+            };
+            config.Branches["develop"].VersioningMode = VersioningMode.ContinuousDeployment;
+            config.Branches["develop"].Tag = "alpha";
+            var develop = new MockBranch("develop") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } };
+            var mockRepository = new MockRepository
+            {
+                Branches = new MockBranchCollection
+                {
+                    new MockBranch("master") { new MockCommit { CommitterEx = SignatureBuilder.SignatureNow() } },
+                    develop
+                }
+            };
+            var context = new GitVersionContext(mockRepository, develop, config);
+            context.Configuration.VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
+            context.Configuration.Tag.ShouldBe("alpha");
+        }
+    }
+}

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -74,6 +74,7 @@
     <Compile Include="Fixtures\RemoteRepositoryFixture.cs" />
     <Compile Include="GitDirFinderTests.cs" />
     <Compile Include="Fixtures\BaseGitFlowRepositoryFixture.cs" />
+    <Compile Include="GitVersionContextTests.cs" />
     <Compile Include="IntegrationTests\RemoteRepositoryTests.cs" />
     <Compile Include="IntegrationTests\GitFlow\DevelopScenarios.cs" />
     <Compile Include="IntegrationTests\GitFlow\FeatureBranchTests.cs" />
@@ -91,6 +92,18 @@
     <Compile Include="InformationalVersionBuilderTests.cs" />
     <Compile Include="IntegrationTests\GitHubFlow\SupportBranchScenarios.cs" />
     <Compile Include="JsonVersionBuilderTests.cs" />
+    <Compile Include="Mocks\MockBranch.cs" />
+    <Compile Include="Mocks\MockBranchCollection.cs" />
+    <Compile Include="Mocks\MockCommit.cs" />
+    <Compile Include="Mocks\MockCommitLog.cs" />
+    <Compile Include="Mocks\MockMergeCommit.cs" />
+    <Compile Include="Mocks\MockReferenceCollection.cs" />
+    <Compile Include="Mocks\MockReflogCollection.cs" />
+    <Compile Include="Mocks\MockRepository.cs" />
+    <Compile Include="Mocks\MockTag.cs" />
+    <Compile Include="Mocks\MockTagAnnotation.cs" />
+    <Compile Include="Mocks\MockTagCollection.cs" />
+    <Compile Include="Mocks\SignatureBuilder.cs" />
     <Compile Include="ModuleInitializer.cs" />
     <Compile Include="Fixtures\EmptyRepositoryFixture.cs" />
     <Compile Include="Helpers\GitTestExtensions.cs" />
@@ -99,6 +112,7 @@
     <Compile Include="ApprovalTestsConfig.cs" />
     <Compile Include="Fixtures\RepositoryFixtureBase.cs" />
     <Compile Include="SemanticVersionTests.cs" />
+    <Compile Include="TestEffectiveConfiguration.cs" />
     <Compile Include="TestFileSystem.cs" />
     <Compile Include="VariableProviderTests.cs" />
   </ItemGroup>

GitVersionCore.Tests/IntegrationTests/GitFlow/MetaDataByCommitScenarios.cs

@@ -1,5 +1,6 @@
 using System;
 using GitVersion;
+using GitVersionCore.Tests;
 using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
@@ -157,7 +158,7 @@ static void EnsureBranchMatch(CommitCountingRepoFixture fixture, string branchNa
         var referenceCommitFinder = commitFinder ?? (r => r.FindBranch(branchName).Tip);
 
         var commit = referenceCommitFinder(fixture.Repository);
-        var releaseDate = LastMinorVersionFinder.Execute(fixture.Repository, new Config(), commit);
+        var releaseDate = LastMinorVersionFinder.Execute(fixture.Repository, new TestEffectiveConfiguration(), commit);
         releaseDate.ShouldBe(commit.When());
     }
 

GitVersionCore.Tests/JsonVersionBuilderTests.cs

@@ -17,7 +17,7 @@ public void Json()
                 PreReleaseTag = "unstable4",
                 BuildMetaData = new SemanticVersionBuildMetaData(5, "feature1", "commitSha",DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
             };
-        var variables = VariableProvider.GetVariablesFor(semanticVersion, new Config());
+        var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery);
         var json = JsonOutputFormatter.ToJson(variables);
         Approvals.Verify(json);
     }

GitVersionTask.Tests/Mocks/MockBranch.cs → GitVersionCore.Tests/Mocks/MockBranch.cs

@@ -18,7 +18,7 @@ public MockBranch(string name, string canonicalName)
 
     public MockBranch()
     {
-        
+
     }
     MockCommitLog commits = new MockCommitLog();
     string name;
@@ -66,7 +66,7 @@ public bool Remove(Commit item)
         return commits.Remove(item);
     }
 
-    public int Count{get{return commits.Count;}}
+    public int Count { get { return commits.Count; } }
 
-    public bool IsReadOnly { get{return false;} }
+    public bool IsReadOnly { get { return false; } }
 }

GitVersionTask.Tests/Mocks/MockBranchCollection.cs → GitVersionCore.Tests/Mocks/MockBranchCollection.cs

@@ -13,7 +13,7 @@ public override IEnumerator<Branch> GetEnumerator()
 
     public override Branch this[string name]
     {
-        get { return Branches.FirstOrDefault(x=>x.Name ==name); }
+        get { return Branches.FirstOrDefault(x => x.Name == name); }
     }
 
     public void Add(Branch item)
@@ -40,16 +40,17 @@ public override void Remove(Branch item)
     {
         Branches.Remove(item);
     }
-     bool ICollection<Branch>.Remove(Branch item)
+    bool ICollection<Branch>.Remove(Branch item)
     {
         return Branches.Remove(item);
     }
 
     public int Count
     {
-        get {
+        get
+        {
             return Branches.Count;
         }
     }
-    public bool IsReadOnly { get{return false;}}
+    public bool IsReadOnly { get { return false; } }
 }

GitVersionTask.Tests/Mocks/MockCommit.cs → GitVersionCore.Tests/Mocks/MockCommit.cs

@@ -4,24 +4,24 @@
 using LibGit2Sharp;
 
 [DebuggerDisplay("{DebuggerDisplay}")]
-public class MockCommit:Commit
+public class MockCommit : Commit
 {
     public MockCommit(ObjectId id = null)
     {
-        idEx = id ?? new ObjectId(Guid.NewGuid().ToString().Replace("-", "")+ "00000000");
+        idEx = id ?? new ObjectId(Guid.NewGuid().ToString().Replace("-", "") + "00000000");
         MessageEx = "";
         ParentsEx = new List<Commit> { null };
         CommitterEx = new Signature("Joe", "[email protected]", DateTimeOffset.Now);
     }
 
     public string MessageEx;
-    public override string Message{get { return MessageEx; }}
+    public override string Message { get { return MessageEx; } }
 
     public Signature CommitterEx;
-    public override Signature Committer{get { return CommitterEx; }}
+    public override Signature Committer { get { return CommitterEx; } }
 
     ObjectId idEx;
-    public override ObjectId Id{get { return idEx; }}
+    public override ObjectId Id { get { return idEx; } }
 
     public override string Sha { get { return idEx.Sha; } }
 
@@ -39,4 +39,4 @@ string DebuggerDisplay
             return MessageEx;
         }
     }
-}
+}

GitVersionTask.Tests/Mocks/MockCommitLog.cs → GitVersionCore.Tests/Mocks/MockCommitLog.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using LibGit2Sharp;
 
-public class MockCommitLog:ICommitLog,ICollection<Commit>
+public class MockCommitLog : ICommitLog, ICollection<Commit>
 {
     public List<Commit> Commits = new List<Commit>();
 
@@ -26,7 +26,7 @@ public void Clear()
     {
         Commits.Clear();
     }
-    
+
 
     public bool Contains(Commit item)
     {
@@ -44,6 +44,8 @@ public bool Remove(Commit item)
     }
 
     public int Count { get { return Commits.Count; } }
-    public bool IsReadOnly {get { return false; } 
+    public bool IsReadOnly
+    {
+        get { return false; }
     }
 }

GitVersionTask.Tests/Mocks/MockMergeCommit.cs → GitVersionCore.Tests/Mocks/MockMergeCommit.cs

@@ -6,4 +6,4 @@ public MockMergeCommit(ObjectId id = null) : base(id)
     {
         ParentsEx.Add(null);
     }
-}
+}

GitVersionTask.Tests/Mocks/MockReferenceCollection.cs → GitVersionCore.Tests/Mocks/MockReferenceCollection.cs

@@ -8,9 +8,9 @@ public class MockReferenceCollection : ReferenceCollection, ICollection<Commit>
     public override ReflogCollection Log(string canonicalName)
     {
         return new MockReflogCollection
-               {
-                   Commits = Commits
-               };
+        {
+            Commits = Commits
+        };
     }
 
     public List<Commit> Commits = new List<Commit>();

GitVersionTask.Tests/Mocks/MockRepository.cs → GitVersionCore.Tests/Mocks/MockRepository.cs

@@ -136,4 +136,4 @@ public StashCollection Stashes
     {
         get { throw new NotImplementedException(); }
     }
-}
+}

GitVersionTask.Tests/Mocks/MockTag.cs → GitVersionCore.Tests/Mocks/MockTag.cs

@@ -1,6 +1,6 @@
 using LibGit2Sharp;
 
-public class MockTag:Tag
+public class MockTag : Tag
 {
 
     public string NameEx;

GitVersionTask.Tests/Mocks/MockTagAnnotation.cs → GitVersionCore.Tests/Mocks/MockTagAnnotation.cs

@@ -1,6 +1,6 @@
 using LibGit2Sharp;
 
-public class MockTagAnnotation:TagAnnotation
+public class MockTagAnnotation : TagAnnotation
 {
 
     public Signature TaggerEx;

GitVersionTask.Tests/Mocks/MockTagCollection.cs → GitVersionCore.Tests/Mocks/MockTagCollection.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using LibGit2Sharp;
 
-public class MockTagCollection : TagCollection,ICollection<Tag>
+public class MockTagCollection : TagCollection, ICollection<Tag>
 {
 
     public List<Tag> Tags = new List<Tag>();

GitVersionCore.Tests/TestEffectiveConfiguration.cs

@@ -0,0 +1,17 @@
+namespace GitVersionCore.Tests
+{
+    using GitVersion;
+
+    public class TestEffectiveConfiguration : EffectiveConfiguration
+    {
+        public TestEffectiveConfiguration(
+            AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch, 
+            VersioningMode versioningMode = VersioningMode.ContinuousDelivery, 
+            string gitTagPrefix = "v", 
+            string tag = "",
+            string nextVersion = null) : 
+                base(assemblyVersioningScheme, versioningMode, gitTagPrefix, tag, nextVersion)
+        {
+        }
+    }
+}

GitVersionCore.Tests/VariableProviderTests.cs

@@ -22,7 +22,7 @@ public void DevelopBranchFormatsSemVerForCiFeed()
         semVer.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
 
 
-        var vars = VariableProvider.GetVariablesFor(semVer, new Config());
+        var vars = VariableProvider.GetVariablesFor(semVer, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery);
 
         vars[VariableProvider.SemVer].ShouldBe("1.2.3.5-unstable");
     }

GitVersionCore/BuildServers/BuildServerBase.cs

@@ -1,6 +1,7 @@
 namespace GitVersion
 {
     using System;
+    using System.Collections.Generic;
 
     public abstract class BuildServerBase : IBuildServer
     {
@@ -9,7 +10,7 @@ public abstract class BuildServerBase : IBuildServer
         public abstract string GenerateSetVersionMessage(string versionToUseForBuildNumber);
         public abstract string[] GenerateSetParameterMessage(string name, string value);
 
-        public virtual void WriteIntegration(SemanticVersion semanticVersion, Action<string> writer)
+        public virtual void WriteIntegration(SemanticVersion semanticVersion, Action<string> writer, Dictionary<string, string> variables)
         {
             if (semanticVersion == null)
             {
@@ -22,9 +23,10 @@ public virtual void WriteIntegration(SemanticVersion semanticVersion, Action<str
             }
 
             writer(string.Format("Executing GenerateSetVersionMessage for '{0}'.", GetType().Name));
+            // TODO This should come from variable provider
             writer(GenerateSetVersionMessage(semanticVersion.ToString("f")));
             writer(string.Format("Executing GenerateBuildLogOutput for '{0}'.", GetType().Name));
-            foreach (var buildParameter in BuildOutputFormatter.GenerateBuildLogOutput(semanticVersion, this))
+            foreach (var buildParameter in BuildOutputFormatter.GenerateBuildLogOutput(this, variables))
             {
                 writer(buildParameter);
             }

GitVersionCore/BuildServers/IBuildServer.cs

@@ -1,6 +1,7 @@
 namespace GitVersion
 {
     using System;
+    using System.Collections.Generic;
 
     public interface IBuildServer
     {
@@ -9,7 +10,7 @@ public interface IBuildServer
         string GenerateSetVersionMessage(string versionToUseForBuildNumber);
         string[] GenerateSetParameterMessage(string name, string value);
 
-        void WriteIntegration(SemanticVersion semanticVersion, Action<string> writer);
+        void WriteIntegration(SemanticVersion semanticVersion, Action<string> writer, Dictionary<string,string> variables);
     }
 
 }

GitVersionCore/Configuration/BranchConfig.cs

@@ -5,7 +5,7 @@
     public class BranchConfig
     {
         [YamlAlias("mode")]
-        public VersioningMode VersioningMode { get; set; }
+        public VersioningMode? VersioningMode { get; set; }
 
         [YamlAlias("tag")]
         public string Tag { get; set; }