Merge branch 'master' into feature/improved-exception-handling

Author: asbjornu

GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

@@ -35,11 +35,6 @@ public override bool CanApplyToCurrentContext()
             throw new NotImplementedException();
         }
 
-        public override void PerformPreProcessingSteps(string gitDirectory, bool noFetch)
-        {
-            throw new NotImplementedException();
-        }
-
         public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
         {
             return versionToUseForBuildNumber;

GitVersionCore.Tests/BuildServers/ContinuaCiTests.cs

@@ -8,8 +8,7 @@ public class ContinuaCiTests
     [Test]
     public void GenerateBuildVersion()
     {
-        var authentication = new Authentication();
-        var versionBuilder = new ContinuaCi(authentication);
+        var versionBuilder = new ContinuaCi();
         var continuaCiVersion = versionBuilder.GenerateSetVersionMessage("0.0.0-Beta4.7");
         Assert.AreEqual("@@continua[setBuildVersion value='0.0.0-Beta4.7']", continuaCiVersion);
     }

GitVersionCore.Tests/BuildServers/MyGetTests.cs

@@ -7,26 +7,23 @@ public class MyGetTests
     [Test]
     public void Develop_branch()
     {
-        var authentication = new Authentication();
-        var versionBuilder = new MyGet(authentication);
+        var versionBuilder = new MyGet();
         var message = versionBuilder.GenerateSetVersionMessage("0.0.0-Unstable4");
         Assert.AreEqual(null, message);
     }
 
     [Test]
     public void EscapeValues()
     {
-        var authentication = new Authentication();
-        var versionBuilder = new MyGet(authentication);
+        var versionBuilder = new MyGet();
         var message = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
         Assert.AreEqual("##myget[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", message[0]);
     }
 
     [Test]
     public void BuildNumber()
     {
-        var authentication = new Authentication();
-        var versionBuilder = new MyGet(authentication);
+        var versionBuilder = new MyGet();
         var message = versionBuilder.GenerateSetParameterMessage("LegacySemVerPadded", "0.8.0-unstable568");
         Assert.AreEqual("##myget[buildNumber '0.8.0-unstable568']", message[1]);
     }

GitVersionCore.Tests/BuildServers/TeamCityTests.cs

@@ -7,17 +7,15 @@ public class TeamCityTests
     [Test]
     public void Develop_branch()
     {
-        var authentication = new Authentication();
-        var versionBuilder = new TeamCity(authentication);
+        var versionBuilder = new TeamCity();
         var tcVersion = versionBuilder.GenerateSetVersionMessage("0.0.0-Unstable4");
         Assert.AreEqual("##teamcity[buildNumber '0.0.0-Unstable4']", tcVersion);
     }
 
     [Test]
     public void EscapeValues()
     {
-        var authentication = new Authentication();
-        var versionBuilder = new TeamCity(authentication);
+        var versionBuilder = new TeamCity();
         var tcVersion = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
         Assert.AreEqual("##teamcity[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[0]);
         Assert.AreEqual("##teamcity[setParameter name='system.GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[1]);

GitVersionCore.Tests/ConfigProviderTests.cs

@@ -13,14 +13,14 @@
 [TestFixture]
 public class ConfigProviderTests
 {
-    string gitDirectory;
+    string repoPath;
     IFileSystem fileSystem;
 
     [SetUp]
     public void Setup()
     {
         fileSystem = new TestFileSystem();
-        gitDirectory = "c:\\MyGitRepo\\.git";
+        repoPath = "c:\\MyGitRepo";
     }
 
     [Test]
@@ -41,7 +41,7 @@ public void CanReadDocument()
 ";
         SetupConfigFileContent(text);
 
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
         config.NextVersion.ShouldBe("2.0.0");
         config.TagPrefix.ShouldBe("[vV|version-]");
@@ -61,7 +61,7 @@ public void CanReadOldDocument()
 release-branch-tag: rc
 ";
         SetupConfigFileContent(text);
-        var error = Should.Throw<OldConfigurationException>(() => ConfigurationProvider.Provide(gitDirectory, fileSystem));
+        var error = Should.Throw<OldConfigurationException>(() => ConfigurationProvider.Provide(repoPath, fileSystem));
         error.Message.ShouldContainWithoutWhitespace(@"GitVersionConfig.yaml contains old configuration, please fix the following errors:
 assemblyVersioningScheme has been replaced by assembly-versioning-scheme
 develop-branch-tag has been replaced by branch specific configuration.See https://github.com/ParticularLabs/GitVersion/wiki/Branch-Specific-Configuration
@@ -79,7 +79,7 @@ public void OverwritesDefaultsWithProvidedConfig()
         tag: dev";
         SetupConfigFileContent(text);
         var defaultConfig = new Config();
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.Provide(repoPath, fileSystem);
 
         config.NextVersion.ShouldBe("2.0.0");
         config.AssemblyVersioningScheme.ShouldBe(defaultConfig.AssemblyVersioningScheme);
@@ -97,7 +97,7 @@ public void CanProvideConfigForNewBranch()
     bug[/-]:
         tag: bugfix";
         SetupConfigFileContent(text);
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.Provide(repoPath, fileSystem);
 
         config.Branches["bug[/-]"].Tag.ShouldBe("bugfix");
     }
@@ -106,7 +106,7 @@ public void CanProvideConfigForNewBranch()
     [MethodImpl(MethodImplOptions.NoInlining)]
     public void CanWriteOutEffectiveConfiguration()
     {
-        var config = ConfigurationProvider.GetEffectiveConfigAsString(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.GetEffectiveConfigAsString(repoPath, fileSystem);
 
         Approvals.Verify(config);
     }
@@ -116,7 +116,7 @@ public void CanReadDefaultDocument()
     {
         const string text = "";
         SetupConfigFileContent(text);
-        var config = ConfigurationProvider.Provide(gitDirectory, fileSystem);
+        var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
         config.Branches["develop"].Tag.ShouldBe("unstable");
         config.Branches["release[/-]"].Tag.ShouldBe("beta");
@@ -156,6 +156,6 @@ public void VerifyAliases()
 
     void SetupConfigFileContent(string text)
     {
-        fileSystem.WriteAllText(Path.Combine(Directory.GetParent(gitDirectory).FullName, "GitVersionConfig.yaml"), text);
+        fileSystem.WriteAllText(Path.Combine(repoPath, "GitVersionConfig.yaml"), text);
     }
 }

GitVersionCore.Tests/Fixtures/RemoteRepositoryFixture.cs

@@ -8,6 +8,12 @@ public class RemoteRepositoryFixture : RepositoryFixtureBase
     public string LocalRepositoryPath;
     public IRepository LocalRepository;
 
+    public RemoteRepositoryFixture(Func<string, IRepository> builder, Config configuration)
+        : base(builder, configuration)
+    {
+        CloneRepository();
+    }
+
     public RemoteRepositoryFixture(Config configuration)
         : base(CreateNewRepository, configuration)
     {

GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs

@@ -16,6 +16,33 @@ public void GivenARemoteGitRepositoryWithCommits_ThenClonedLocalShouldMatchRemot
         }
     }
 
+    [Test]
+    public void GivenARemoteGitRepositoryWithCommitsAndBranches_ThenClonedLocalShouldMatchRemoteVersion()
+    {
+        using (var fixture = new RemoteRepositoryFixture(
+            path =>
+            {
+                Repository.Init(path);
+                Console.WriteLine("Created git repository at '{0}'", path);
+
+                var repo = new Repository(path);
+                repo.MakeCommits(5);
+
+                repo.CreateBranch("develop");
+                repo.CreateBranch("release-1.0");
+
+                repo.Checkout("release-1.0");
+                repo.MakeCommits(5);
+
+                return repo;
+            },
+            new Config()))
+        {
+            fixture.AssertFullSemver("1.0.0-beta.1+5");
+            fixture.AssertFullSemver("1.0.0-beta.1+5", fixture.LocalRepository);
+        }
+    }
+
     [Test]
     public void GivenARemoteGitRepositoryAheadOfLocalRepository_ThenChangesShouldPull()
     {

GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt

@@ -16,5 +16,6 @@
   "BranchName":"feature1",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0004",
-  "NuGetVersion":"1.2.3-unstable0004"
+  "NuGetVersion":"1.2.3-unstable0004",
+  "CommitDate":"2014-03-06"
 }

GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

@@ -16,5 +16,6 @@
   "BranchName":"develop",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3-unstable0004",
-  "NuGetVersion":"1.2.3-unstable0004"
+  "NuGetVersion":"1.2.3-unstable0004",
+  "CommitDate":"2014-03-06"
 }

GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt

@@ -16,5 +16,6 @@
   "BranchName":"develop",
   "Sha":"commitSha",
   "NuGetVersionV2":"1.2.3",
-  "NuGetVersion":"1.2.3"
+  "NuGetVersion":"1.2.3",
+  "CommitDate":"2014-03-06"
 }