Merge pull request #189 from JakeGinnivan/BetterFeatureBranchSupport

JakeGinnivan · JakeGinnivan · commit 7d4fd1241e08 · 2014-06-09T19:48:06.000+01:00
Better feature branch support
diff --git a/AcceptanceTests/GitFlow/MetaDataByCommitFixture.cs b/AcceptanceTests/GitFlow/MetaDataByCommitFixture.cs
@@ -49,10 +49,10 @@ public void CanCorrectlyDetectCommitCountsAndReleaseDataWhenThatApplies()
                 EnsureMetaDataMatch(f, "hotfix-1.3.1", "1.3.1-beta.1+1", r => (Commit)r.Tags["1.3.0"].Target);
 
                 ResetToK(f.Repository);
-                EnsureMetaDataMatch(f, "feature", "1.4.0-unstable.0+2");
+                EnsureMetaDataMatch(f, "feature", "1.4.0-feature+2");
 
                 ResetToJ(f.Repository);
-                EnsureMetaDataMatch(f, "feature", "1.4.0-unstable.0+1");
+                EnsureMetaDataMatch(f, "feature", "1.4.0-feature+1");
 
                 ResetToI(f.Repository);
                 EnsureMetaDataMatch(f, "develop", "1.4.0.2-unstable");
diff --git a/GitVersionCore/ExtensionMethods.cs b/GitVersionCore/ExtensionMethods.cs
@@ -29,7 +29,7 @@ public static void AppendLineFormat(this StringBuilder stringBuilder, string for
 
         public static string TrimStart(this string value, string toTrim)
         {
-            if (!value.StartsWith(toTrim))
+            if (!value.StartsWith(toTrim, StringComparison.InvariantCultureIgnoreCase))
             {
                 return value;
             }
diff --git a/GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs b/GitVersionCore/GitFlow/BranchFinders/DevelopBasedVersionFinderBase.cs
@@ -23,12 +23,15 @@ protected SemanticVersion FindVersion(
             var numberOfCommitsOnBranchSinceCommit = NumberOfCommitsOnBranchSinceCommit(context, ancestor);
             var sha = context.CurrentBranch.Tip.Sha;
             var releaseDate = ReleaseDateFinder.Execute(context.Repository, sha, 0);
+            var preReleaseTag = context.CurrentBranch.Name
+                .TrimStart(branchType.ToString() + '-')
+                .TrimStart(branchType.ToString() + '/');
             var semanticVersion = new SemanticVersion
             {
                 Major = versionFromMaster.Major,
                 Minor = versionFromMaster.Minor + 1,
                 Patch = 0,
-                PreReleaseTag = "unstable0",
+                PreReleaseTag = preReleaseTag,
                 BuildMetaData = new SemanticVersionBuildMetaData(
                     numberOfCommitsOnBranchSinceCommit,
                     context.CurrentBranch.Name, releaseDate)
diff --git a/GitVersionCore/SemanticVersionPreReleaseTag.cs b/GitVersionCore/SemanticVersionPreReleaseTag.cs
@@ -133,14 +133,31 @@ public string ToString(string format, IFormatProvider formatProvider = null)
                 case "t":
                     return Number.HasValue ? string.Format("{0}.{1}", Name, Number) : Name;
                 case "l":
-                    return Number.HasValue ? string.Format("{0}{1}", Name, Number) : Name;
+                    return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.ToString()) : FormatLegacy(GetLegacyName());
                 case "lp":
-                    return Number.HasValue ? string.Format("{0}{1}", Name, Number.Value.ToString("D4")) : Name;
+                    return Number.HasValue ? FormatLegacy(GetLegacyName(), Number.Value.ToString("D4")) : FormatLegacy(GetLegacyName());
                 default:
                     throw new ArgumentException("Unknown format", "format");
             }
         }
 
+        string FormatLegacy(string tag, string number = null)
+        {
+            var tagLength = tag.Length;
+            var numberLength = number == null ? 0 : number.Length;
+
+            if (tagLength + numberLength > 20)
+                return string.Format("{0}{1}", tag.Substring(0, 20 - numberLength), number);
+
+            return string.Format("{0}{1}", tag, number);
+        }
+
+        string GetLegacyName()
+        {
+            var firstPart = Name.Split('_')[0];
+            return firstPart.Replace("-", string.Empty).Replace(".", string.Empty);
+        }
+
         public bool HasTag()
         {
             return !string.IsNullOrEmpty(Name);
diff --git a/Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_1_commit.approved.txt b/Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_1_commit.approved.txt
@@ -3,8 +3,8 @@
     "Minor": 1,
     "Patch": 0,
     "PreReleaseTag": {
-        "Name": "unstable",
-        "Number": 0
+        "Name": "featureWithOneCommit",
+        "Number": null
     },
     "BuildMetaData": {
         "CommitsSinceTag": 1,
diff --git a/Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_2_commits.approved.txt b/Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_2_commits.approved.txt
@@ -3,8 +3,8 @@
     "Minor": 1,
     "Patch": 0,
     "PreReleaseTag": {
-        "Name": "unstable",
-        "Number": 0
+        "Name": "featureWithOneCommit",
+        "Number": null
     },
     "BuildMetaData": {
         "CommitsSinceTag": 2,
diff --git a/Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_2_commits_but_building_an_commit.approved.txt b/Tests/BranchFinders/FeatureBranchTests.Feature_branch_with_2_commits_but_building_an_commit.approved.txt
@@ -3,8 +3,8 @@
     "Minor": 1,
     "Patch": 0,
     "PreReleaseTag": {
-        "Name": "unstable",
-        "Number": 0
+        "Name": "featureWithOneCommit",
+        "Number": null
     },
     "BuildMetaData": {
         "CommitsSinceTag": 2,
diff --git a/Tests/GitFlow/GitFlowVersionFinderTests.cs b/Tests/GitFlow/GitFlowVersionFinderTests.cs
@@ -147,6 +147,31 @@ public void AFeatureBranchDoesNotRequireASpecificPrefix()
         }
     }
 
+    [Test]
+    public void AFeatureBranchPrefixIsNotIncludedInTag()
+    {
+        var repoPath = Clone(ASBMTestRepoWorkingDirPath);
+        using (var repo = new Repository(repoPath))
+        {
+            repo.Branches["develop"].ForceCheckout();
+
+            const string branchName = "feature/ABC-1234_SomeDescription";
+            repo.Branches.Add(branchName, repo.Head.Tip).ForceCheckout();
+
+            AddOneCommitToHead(repo, "code");
+
+            var finder = new GitVersionFinder();
+
+            var versionAndBranch = finder.FindVersion(new GitVersionContext
+            {
+                Repository = repo,
+                CurrentBranch = repo.Head,
+            });
+
+            ObjectApprover.VerifyWithJson(versionAndBranch, Scrubbers.GuidAndDateScrubber);
+        }
+    }
+
     [Test]
     public void AReleaseBranchIsRequiredToBranchOffOfDevelopBranch()
     {
diff --git a/Tests/GitFlow/GitVersionFinderTests.AFeatureBranchDoesNotRequireASpecificPrefix.approved.txt b/Tests/GitFlow/GitVersionFinderTests.AFeatureBranchDoesNotRequireASpecificPrefix.approved.txt
@@ -3,8 +3,8 @@
     "Minor": 1,
     "Patch": 0,
     "PreReleaseTag": {
-        "Name": "unstable",
-        "Number": 0
+        "Name": "every-feature-is-welcome",
+        "Number": null
     },
     "BuildMetaData": {
         "CommitsSinceTag": 1,
diff --git a/Tests/GitFlow/GitVersionFinderTests.AFeatureBranchPrefixIsNotIncludedInTag.approved.txt b/Tests/GitFlow/GitVersionFinderTests.AFeatureBranchPrefixIsNotIncludedInTag.approved.txt
@@ -0,0 +1,21 @@
+﻿{
+    "Major": 1,
+    "Minor": 1,
+    "Patch": 0,
+    "PreReleaseTag": {
+        "Name": "ABC-1234_SomeDescription",
+        "Number": null
+    },
+    "BuildMetaData": {
+        "CommitsSinceTag": 1,
+        "Branch": "feature/ABC-1234_SomeDescription",
+        "ReleaseDate": {
+            "OriginalDate": "<date replaced>",
+            "OriginalCommitSha": "000000000000000000000000000000000000000",
+            "Date": "<date replaced>",
+            "CommitSha": "000000000000000000000000000000000000000"
+        },
+        "Sha": "000000000000000000000000000000000000000",
+        "OtherMetaData": null
+    }
+}
diff --git a/Tests/SemanticVersionTests.cs b/Tests/SemanticVersionTests.cs
@@ -1,5 +1,6 @@
 using GitVersion;
 using NUnit.Framework;
+using Shouldly;
 
 [TestFixture]
 public class SemanticVersionTests
@@ -51,5 +52,14 @@ public void ValidateInvalidVersionParsing(string versionString)
         Assert.IsFalse(SemanticVersion.TryParse(versionString, out version), "TryParse Result");
     }
 
+    [Test]
+    public void LegacySemVerTest()
+    {
+        new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", null).ToString("l").ShouldBe("TKT2134");
+        new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", null).ToString("l").ShouldBe("AReallyReallyReallyL");
+        new SemanticVersionPreReleaseTag("TKT-2134_JiraDescription", 1).ToString("lp").ShouldBe("TKT21340001");
+        new SemanticVersionPreReleaseTag("AReallyReallyReallyLongBranchName", 1).ToString("lp").ShouldBe("AReallyReallyRea0001");
+    }
+
 
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static void AppendLineFormat(this StringBuilder stringBuilder, string for`
`29`	`29`
`30`	`30`	`public static string TrimStart(this string value, string toTrim)`
`31`	`31`	`{`
`32`		`- if (!value.StartsWith(toTrim))`
	`32`	`+ if (!value.StartsWith(toTrim, StringComparison.InvariantCultureIgnoreCase))`
`33`	`33`	`{`
`34`	`34`	`return value;`
`35`	`35`	`}`