Merge pull request #623 from onovotny/padding-config

Make padding configurable and add padded BuildMetaData

Author: JakeGinnivan

docs/more-info/variables.md

@@ -10,6 +10,7 @@ For the `release/3.0.0` branch of GitVersion it shows:
   "PreReleaseTag":"beta.1",
   "PreReleaseTagWithDash":"-beta.1",
   "BuildMetaData":1,
+  "BuildMetaDataPadded": "0001",
   "FullBuildMetaData":"1.Branch.release/3.0.0.Sha.28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
   "MajorMinorPatch":"3.0.0",
   "SemVer":"3.0.0-beta.1",

src/GitVersionCore.Tests/BuildServers/BuildServerBaseTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using GitVersion;
+using GitVersionCore.Tests;
 using NUnit.Framework;
 using Shouldly;
 
@@ -22,7 +23,10 @@ public void BuildNumberIsFullSemVer()
 
         semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
         semanticVersion.BuildMetaData.Sha = "commitSha";
-        var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
+
+        var config = new TestEffectiveConfiguration();
+
+        var variables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
         new BuildServer().WriteIntegration(writes.Add, variables);
 
         writes[1].ShouldBe("1.2.3-beta.1+5");

src/GitVersionCore.Tests/BuildServers/JenkinsMessageGenerationTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using GitVersion;
+using GitVersionCore.Tests;
 using NUnit.Framework;
 using Shouldly;
 
@@ -54,7 +55,10 @@ static void AssertVariablesAreWrittenToFile(string f)
 
         semanticVersion.BuildMetaData.CommitDate = DateTimeOffset.Parse("2014-03-06 23:59:59Z");
         semanticVersion.BuildMetaData.Sha = "commitSha";
-        var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
+
+        var config = new TestEffectiveConfiguration();
+
+        var variables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
 
         var j = new Jenkins(f);
 

src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -5,6 +5,8 @@ continuous-delivery-fallback-tag: ci
 major-version-bump-message: '\+semver:\s?(breaking|major)'
 minor-version-bump-message: '\+semver:\s?(feature|minor)'
 patch-version-bump-message: '\+semver:\s?(fix|patch)'
+legacy-semver-padding: 4
+build-metadata-padding: 4
 commit-message-incrementing: Enabled
 branches:
   master:

src/GitVersionCore.Tests/Fixtures/RepositoryFixtureBase.cs

@@ -152,11 +152,7 @@ VersionVariables GetVersion(IRepository repository = null, string commitId = nul
     {
         var gitVersionContext = new GitVersionContext(repository ?? Repository, configuration, IsForTrackedBranchOnly, commitId);
         var executeGitVersion = ExecuteGitVersion(gitVersionContext);
-        var variables = VariableProvider.GetVariablesFor(executeGitVersion,
-            gitVersionContext.Configuration.AssemblyVersioningScheme,
-            gitVersionContext.Configuration.VersioningMode,
-            gitVersionContext.Configuration.ContinuousDeploymentFallbackTag,
-            gitVersionContext.IsCurrentCommitTagged);
+        var variables = VariableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
         try
         {
             return variables;

src/GitVersionCore.Tests/JsonVersionBuilderTests.Json.approved.txt

@@ -5,6 +5,7 @@
   "PreReleaseTag":"unstable.4",
   "PreReleaseTagWithDash":"-unstable.4",
   "BuildMetaData":5,
+  "BuildMetaDataPadded":"0005",
   "FullBuildMetaData":"5.Branch.feature1.Sha.commitSha",
   "MajorMinorPatch":"1.2.3",
   "SemVer":"1.2.3-unstable.4",

src/GitVersionCore.Tests/JsonVersionBuilderTests.cs

@@ -1,6 +1,7 @@
 using System;
 using ApprovalTests;
 using GitVersion;
+using GitVersionCore.Tests;
 using NUnit.Framework;
 
 [TestFixture]
@@ -17,7 +18,10 @@ public void Json()
                 PreReleaseTag = "unstable4",
                 BuildMetaData = new SemanticVersionBuildMetaData(5, "feature1", "commitSha",DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
             };
-        var variables = VariableProvider.GetVariablesFor(semanticVersion, AssemblyVersioningScheme.MajorMinorPatch, VersioningMode.ContinuousDelivery, "ci", false);
+
+        var config = new TestEffectiveConfiguration();
+
+        var variables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
         var json = JsonOutputFormatter.ToJson(variables);
         Approvals.Verify(json);
     }

src/GitVersionCore.Tests/TestEffectiveConfiguration.cs

@@ -18,12 +18,14 @@ public TestEffectiveConfiguration(
             string majorMessage = null,
             string minorMessage = null,
             string patchMessage = null,
-            CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled) : 
+            CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled,
+            int legacySemVerPadding = 4,
+            int buildMetaDataPadding = 4) : 
                 base(assemblyVersioningScheme, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch, 
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,
                     majorMessage, minorMessage, patchMessage,
-                    commitMessageMode)
+                    commitMessageMode, legacySemVerPadding, buildMetaDataPadding)
         {
         }
     }

src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

@@ -5,6 +5,7 @@
   "PreReleaseTag":"unstable.4",
   "PreReleaseTagWithDash":"-unstable.4",
   "BuildMetaData":5,
+  "BuildMetaDataPadded":"0005",
   "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
   "MajorMinorPatch":"1.2.3",
   "SemVer":"1.2.3-unstable.4",

src/GitVersionCore.Tests/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt

@@ -0,0 +1,22 @@
+{
+  "Major":1,
+  "Minor":2,
+  "Patch":3,
+  "PreReleaseTag":"unstable.4",
+  "PreReleaseTagWithDash":"-unstable.4",
+  "BuildMetaData":5,
+  "BuildMetaDataPadded":"05",
+  "FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
+  "MajorMinorPatch":"1.2.3",
+  "SemVer":"1.2.3-unstable.4",
+  "LegacySemVer":"1.2.3-unstable4",
+  "LegacySemVerPadded":"1.2.3-unstable00004",
+  "AssemblySemVer":"1.2.3.0",
+  "FullSemVer":"1.2.3-unstable.4+5",
+  "InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
+  "BranchName":"develop",
+  "Sha":"commitSha",
+  "NuGetVersionV2":"1.2.3-unstable00004",
+  "NuGetVersion":"1.2.3-unstable00004",
+  "CommitDate":"2014-03-06"
+}