code cleanup

Author: arturcic

src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

@@ -8,6 +8,7 @@
 using GitVersion.Logging;
 using Microsoft.Extensions.Options;
 using GitVersion.Extensions;
+using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -29,10 +30,10 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
 
             var log = sp.GetService<ILog>();
             var variableProvider = sp.GetService<IVariableProvider>();
-            var versionFinder = sp.GetService<IGitVersionFinder>();
+            var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
 
             var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, onlyTrackedBranches, commitId);
-            var executeGitVersion = versionFinder.FindVersion(gitVersionContext);
+            var executeGitVersion = nextVersionCalculator.FindVersion(gitVersionContext);
             var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
 
             try

src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs

@@ -28,11 +28,12 @@ public void ShouldIncrementVersionBasedOnConfig()
                 services.AddSingleton<IMetaDataCalculator>(new TestMetaDataCalculator(semanticVersionBuildMetaData));
             });
 
-            var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
+            var nextVersionCalculator = sp.GetService<INextVersionCalculator>() as NextVersionCalculator;
+            nextVersionCalculator.ShouldNotBeNull();
 
             var context = new GitVersionContextBuilder().WithConfig(new Config()).Build();
 
-            var version = nextVersionCalculator.FindVersion(context);
+            var version = nextVersionCalculator.FindVersionInternal(context);
 
             version.ToString().ShouldBe("1.0.1");
         }
@@ -47,11 +48,12 @@ public void DoesNotIncrementWhenBaseVersionSaysNotTo()
                 services.AddSingleton<IMetaDataCalculator>(new TestMetaDataCalculator(semanticVersionBuildMetaData));
             });
 
-            var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
+            var nextVersionCalculator = sp.GetService<INextVersionCalculator>() as NextVersionCalculator;
 
+            nextVersionCalculator.ShouldNotBeNull();
             var context = new GitVersionContextBuilder().WithConfig(new Config()).Build();
 
-            var version = nextVersionCalculator.FindVersion(context);
+            var version = nextVersionCalculator.FindVersionInternal(context);
 
             version.ToString().ShouldBe("1.0.0");
         }
@@ -67,13 +69,14 @@ public void AppliesBranchPreReleaseTag()
                 services.AddSingleton<IMetaDataCalculator>(new TestMetaDataCalculator(semanticVersionBuildMetaData));
             });
 
-            var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
+            var nextVersionCalculator = sp.GetService<INextVersionCalculator>() as NextVersionCalculator;
+            nextVersionCalculator.ShouldNotBeNull();
 
             var context = new GitVersionContextBuilder()
                 .WithDevelopBranch()
                 .Build();
 
-            var version = nextVersionCalculator.FindVersion(context);
+            var version = nextVersionCalculator.FindVersionInternal(context);
 
             version.ToString("f").ShouldBe("1.0.0-alpha.1+2");
         }

src/GitVersionCore/GitVersionCalculator.cs

@@ -5,6 +5,7 @@
 using GitVersion.Logging;
 using Microsoft.Extensions.Options;
 using GitVersion.Extensions;
+using GitVersion.VersionCalculation;
 
 namespace GitVersion
 {
@@ -14,21 +15,21 @@ public class GitVersionCalculator : IGitVersionCalculator
         private readonly IConfigProvider configProvider;
         private readonly IBuildServerResolver buildServerResolver;
         private readonly IGitVersionCache gitVersionCache;
-        private readonly IGitVersionFinder gitVersionFinder;
+        private readonly INextVersionCalculator nextVersionCalculator;
         private readonly IGitPreparer gitPreparer;
         private readonly IVariableProvider variableProvider;
         private readonly IOptions<Arguments> options;
         private readonly IGitVersionCacheKeyFactory cacheKeyFactory;
 
         public GitVersionCalculator(ILog log, IConfigProvider configProvider, IBuildServerResolver buildServerResolver,
-            IGitVersionCache gitVersionCache, IGitVersionFinder gitVersionFinder, IGitPreparer gitPreparer, IVariableProvider variableProvider,
+            IGitVersionCache gitVersionCache, INextVersionCalculator nextVersionCalculator, IGitPreparer gitPreparer, IVariableProvider variableProvider,
             IOptions<Arguments> options, IGitVersionCacheKeyFactory cacheKeyFactory)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.configProvider = configProvider ?? throw new ArgumentNullException(nameof(configProvider));
             this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
             this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));
-            this.gitVersionFinder = gitVersionFinder ?? throw new ArgumentNullException(nameof(gitVersionFinder));
+            this.nextVersionCalculator = nextVersionCalculator ?? throw new ArgumentNullException(nameof(nextVersionCalculator));
             this.gitPreparer = gitPreparer ?? throw new ArgumentNullException(nameof(gitPreparer));
             this.variableProvider = variableProvider ?? throw new ArgumentNullException(nameof(variableProvider));
             this.options = options ?? throw new ArgumentNullException(nameof(options));
@@ -106,7 +107,7 @@ private VersionVariables ExecuteInternal(string targetBranch, string commitId, C
             return gitPreparer.GetDotGitDirectory().WithRepository(repo =>
             {
                 var gitVersionContext = new GitVersionContext(repo, log, targetBranch, configuration, commitId: commitId);
-                var semanticVersion = gitVersionFinder.FindVersion(gitVersionContext);
+                var semanticVersion = nextVersionCalculator.FindVersion(gitVersionContext);
 
                 return variableProvider.GetVariablesFor(semanticVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
             });

src/GitVersionCore/GitVersionCoreModule.cs

@@ -24,7 +24,6 @@ public void RegisterTypes(IServiceCollection services)
 
             services.AddSingleton<IConfigProvider, ConfigProvider>();
             services.AddSingleton<IVariableProvider, VariableProvider>();
-            services.AddSingleton<IGitVersionFinder, GitVersionFinder>();
 
             services.AddSingleton<IMetaDataCalculator, MetaDataCalculator>();
             services.AddSingleton<IBaseVersionCalculator, BaseVersionCalculator>();

src/GitVersionCore/GitVersionFinder.cs

@@ -1,10 +1,12 @@
 using System;
+using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 
 using GitVersion.VersionCalculation.BaseVersionCalculators;
 using GitVersion.VersioningModes;
 using GitVersion.Configuration;
+using GitVersion.Exceptions;
 using GitVersion.Logging;
 using GitVersion.Extensions;
 
@@ -27,6 +29,39 @@ public NextVersionCalculator(ILog log, IMetaDataCalculator metaDataCalculator, I
         }
 
         public SemanticVersion FindVersion(GitVersionContext context)
+        {
+            log.Info($"Running against branch: {context.CurrentBranch.FriendlyName} ({(context.CurrentCommit == null ? "-" : context.CurrentCommit.Sha)})");
+            if (context.IsCurrentCommitTagged)
+            {
+                log.Info($"Current commit is tagged with version {context.CurrentCommitTaggedVersion}, " +
+                         "version calculation is for metadata only.");
+            }
+            EnsureHeadIsNotDetached(context);
+
+            var filePath = Path.Combine(context.Repository.GetRepositoryDirectory(), "NextVersion.txt");
+            if (File.Exists(filePath))
+            {
+                throw new WarningException("NextVersion.txt has been deprecated. See http://gitversion.readthedocs.org/en/latest/configuration/ for replacement");
+            }
+
+            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;