minor cleanup

GitTools · Mar 23, 2020 · 71d8fe5 · 71d8fe5
1 parent 4cc84d2
commit 71d8fe5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 40 deletions.
diff --git a/src/GitVersionCore/Configuration/ConfigExtensions.cs b/src/GitVersionCore/Configuration/ConfigExtensions.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.Extensions;
+using GitVersion.Logging;
 using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration
@@ -283,6 +284,29 @@ public static EffectiveConfiguration CalculateEffectiveConfiguration(this Config
                 preReleaseWeight);
         }
 
+        public static string GetBranchSpecificTag(this EffectiveConfiguration configuration, ILog log, string branchFriendlyName, string branchNameOverride)
+        {
+            var tagToUse = configuration.Tag;
+            if (tagToUse == "useBranchName")
+            {
+                tagToUse = "{BranchName}";
+            }
+            if (tagToUse.Contains("{BranchName}"))
+            {
+                log.Info("Using branch name to calculate version tag");
+
+                var branchName = branchNameOverride ?? branchFriendlyName;
+                if (!string.IsNullOrWhiteSpace(configuration.BranchPrefixToTrim))
+                {
+                    branchName = branchName.RegexReplace(configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
+                }
+                branchName = branchName.RegexReplace("[^a-zA-Z0-9-]", "-");
+
+                tagToUse = tagToUse.Replace("{BranchName}", branchName);
+            }
+            return tagToUse;
+        }
+
         private static BranchConfig GetOrCreateBranchDefaults(this Config config, string branchKey)
         {
             if (!config.Branches.ContainsKey(branchKey))

diff --git a/src/GitVersionCore/VersionCalculation/INextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/INextVersionCalculator.cs
@@ -1,10 +1,7 @@
-using GitVersion.Configuration;
-
 namespace GitVersion.VersionCalculation
 {
     public interface INextVersionCalculator
     {
         SemanticVersion FindVersion(GitVersionContext context);
-        string GetBranchSpecificTag(EffectiveConfiguration configuration, string branchFriendlyName, string branchNameOverride);
     }
 }
diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
 using GitVersion.Common;
 using GitVersion.Configuration;
 using GitVersion.Exceptions;
@@ -47,20 +46,6 @@ public SemanticVersion FindVersion(GitVersionContext context)
             return FindVersionInternal(context);
         }
 
-        private static void EnsureHeadIsNotDetached(GitVersionContext context)
-        {
-            if (!context.CurrentBranch.IsDetachedHead())
-            {
-                return;
-            }
-
-            var message = string.Format(
-                "It looks like the branch being examined is a detached Head pointing to commit '{0}'. " +
-                "Without a proper branch name GitVersion cannot determine the build version.",
-                context.CurrentCommit.Id.ToString(7));
-            throw new WarningException(message);
-        }
-
         public SemanticVersion FindVersionInternal(GitVersionContext context)
         {
             SemanticVersion taggedSemanticVersion = null;
@@ -129,7 +114,7 @@ private SemanticVersion PerformIncrement(GitVersionContext context, BaseVersion
 
         private void UpdatePreReleaseTag(GitVersionContext context, SemanticVersion semanticVersion, string branchNameOverride)
         {
-            var tagToUse = GetBranchSpecificTag(context.Configuration, context.CurrentBranch.FriendlyName, branchNameOverride);
+            var tagToUse = context.Configuration.GetBranchSpecificTag(log, context.CurrentBranch.FriendlyName, branchNameOverride);
 
             int? number = null;
 
@@ -152,27 +137,18 @@ private void UpdatePreReleaseTag(GitVersionContext context, SemanticVersion sema
             semanticVersion.PreReleaseTag = new SemanticVersionPreReleaseTag(tagToUse, number);
         }
 
-        public string GetBranchSpecificTag(EffectiveConfiguration configuration, string branchFriendlyName, string branchNameOverride)
+        private static void EnsureHeadIsNotDetached(GitVersionContext context)
         {
-            var tagToUse = configuration.Tag;
-            if (tagToUse == "useBranchName")
+            if (!context.CurrentBranch.IsDetachedHead())
             {
-                tagToUse = "{BranchName}";
+                return;
             }
-            if (tagToUse.Contains("{BranchName}"))
-            {
-                log.Info("Using branch name to calculate version tag");
-
-                var branchName = branchNameOverride ?? branchFriendlyName;
-                if (!string.IsNullOrWhiteSpace(configuration.BranchPrefixToTrim))
-                {
-                    branchName = branchName.RegexReplace(configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
-                }
-                branchName = branchName.RegexReplace("[^a-zA-Z0-9-]", "-");
 
-                tagToUse = tagToUse.Replace("{BranchName}", branchName);
-            }
-            return tagToUse;
+            var message = string.Format(
+                "It looks like the branch being examined is a detached Head pointing to commit '{0}'. " +
+                "Without a proper branch name GitVersion cannot determine the build version.",
+                context.CurrentCommit.Id.ToString(7));
+            throw new WarningException(message);
         }
 
         private static bool MajorMinorPatchEqual(SemanticVersion lastTag, SemanticVersion baseVersion)

diff --git a/src/GitVersionCore/VersionCalculation/VariableProvider.cs b/src/GitVersionCore/VersionCalculation/VariableProvider.cs
@@ -11,13 +11,11 @@ namespace GitVersion.OutputVariables
 {
     public class VariableProvider : IVariableProvider
     {
-        private readonly INextVersionCalculator nextVersionCalculator;
         private readonly IEnvironment environment;
         private readonly ILog log;
 
-        public VariableProvider(INextVersionCalculator nextVersionCalculator, IEnvironment environment, ILog log)
+        public VariableProvider(IEnvironment environment, ILog log)
         {
-            this.nextVersionCalculator = nextVersionCalculator ?? throw new ArgumentNullException(nameof(nextVersionCalculator));
             this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
             this.log = log ?? throw new ArgumentNullException(nameof(log));
         }
@@ -31,7 +29,7 @@ public VersionVariables GetVariablesFor(SemanticVersion semanticVersion, Effecti
                 // Continuous Deployment always requires a pre-release tag unless the commit is tagged
                 if (!semanticVersion.PreReleaseTag.HasTag())
                 {
-                    semanticVersion.PreReleaseTag.Name = nextVersionCalculator.GetBranchSpecificTag(config, semanticVersion.BuildMetaData.Branch, null);
+                    semanticVersion.PreReleaseTag.Name = config.GetBranchSpecificTag(log, semanticVersion.BuildMetaData.Branch, null);
                     if (string.IsNullOrEmpty(semanticVersion.PreReleaseTag.Name))
                     {
                         semanticVersion.PreReleaseTag.Name = config.ContinuousDeploymentFallbackTag;