injected IGitVersionContextFactory into NextVersionCalculator

arturcic · arturcic · commit ed0cb7a870e1 · 2020-03-23T17:08:46.000+02:00
diff --git a/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs
@@ -42,7 +42,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
 
             try
             {
-                var executeGitVersion = nextVersionCalculator.FindVersion(context);
+                var executeGitVersion = nextVersionCalculator.FindVersion();
                 var variables = variableProvider.GetVariablesFor(executeGitVersion, context.Configuration, context.IsCurrentCommitTagged);
 
                 return variables;
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -21,16 +21,19 @@ public void ShouldIncrementVersionBasedOnConfig()
         {
             var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, "master", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now);
 
-            var sp = ConfigureServices(services =>
-            {
-                services.AddSingleton<IBaseVersionCalculator>(new TestBaseVersionCalculator(true, new SemanticVersion(1), new MockCommit()));
-                services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
-            });
+            var contextBuilder = new GitVersionContextBuilder();
 
-            var nextVersionCalculator = sp.GetService<INextVersionCalculator>() as NextVersionCalculator;
-            nextVersionCalculator.ShouldNotBeNull();
+            var context = contextBuilder
+                .OverrideServices(services =>
+                {
+                    services.AddSingleton<IBaseVersionCalculator>(new TestBaseVersionCalculator(true, new SemanticVersion(1), new MockCommit()));
+                    services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
+                })
+                .WithConfig(new Config())
+                .Build();
 
-            var context = new GitVersionContextBuilder().WithConfig(new Config()).Build();
+            var nextVersionCalculator = contextBuilder.ServicesProvider.GetService<INextVersionCalculator>() as NextVersionCalculator;
+            nextVersionCalculator.ShouldNotBeNull();
 
             var version = nextVersionCalculator.FindVersionInternal(context);
 
@@ -41,16 +44,21 @@ public void ShouldIncrementVersionBasedOnConfig()
         public void DoesNotIncrementWhenBaseVersionSaysNotTo()
         {
             var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData("ef7d0d7e1e700f1c7c9fa01ea6791bb778a5c37c", 1, "master", "b1a34edbd80e141f7cc046c074f109be7d022074", "b1a34e", DateTimeOffset.Now);
-            var sp = ConfigureServices(services =>
-            {
-                services.AddSingleton<IBaseVersionCalculator>(new TestBaseVersionCalculator(false, new SemanticVersion(1), new MockCommit()));
-                services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
-            });
 
-            var nextVersionCalculator = sp.GetService<INextVersionCalculator>() as NextVersionCalculator;
+            var contextBuilder = new GitVersionContextBuilder();
+
+            var context = contextBuilder
+                .OverrideServices(services =>
+                {
+                    services.AddSingleton<IBaseVersionCalculator>(new TestBaseVersionCalculator(false, new SemanticVersion(1), new MockCommit()));
+                    services.AddSingleton<IMainlineVersionCalculator>(new TestMainlineVersionCalculator(semanticVersionBuildMetaData));
+                })
+                .WithConfig(new Config())
+                .Build();
+
+            var nextVersionCalculator = contextBuilder.ServicesProvider.GetService<INextVersionCalculator>() as NextVersionCalculator;
 
             nextVersionCalculator.ShouldNotBeNull();
-            var context = new GitVersionContextBuilder().WithConfig(new Config()).Build();
 
             var version = nextVersionCalculator.FindVersionInternal(context);
 
diff --git a/src/GitVersionCore.Tests/VersionSourceTests.cs b/src/GitVersionCore.Tests/VersionSourceTests.cs
@@ -44,9 +44,8 @@ public void VersionSourceSha()
             _ = fixture.Repository.MakeACommit();
 
             gitVersionContextFactory.Init(fixture.Repository, fixture.Repository.Head);
-            var context = gitVersionContextFactory.Context;
 
-            var version = nextVersionCalculator.FindVersion(context);
+            var version = nextVersionCalculator.FindVersion();
 
             version.BuildMetaData.VersionSourceSha.ShouldBe(initialCommit.Sha);
             version.BuildMetaData.CommitsSinceVersionSource.ShouldBe(2);
@@ -59,9 +58,8 @@ public void VersionSourceShaOneCommit()
             var initialCommit = fixture.Repository.MakeACommit();
 
             gitVersionContextFactory.Init(fixture.Repository, fixture.Repository.Head);
-            var context = gitVersionContextFactory.Context;
 
-            var version = nextVersionCalculator.FindVersion(context);
+            var version = nextVersionCalculator.FindVersion();
 
             version.BuildMetaData.VersionSourceSha.ShouldBe(initialCommit.Sha);
             version.BuildMetaData.CommitsSinceVersionSource.ShouldBe(0);
@@ -80,9 +78,8 @@ public void VersionSourceShaUsingTag()
             _ = fixture.Repository.MakeACommit();
 
             gitVersionContextFactory.Init(fixture.Repository, fixture.Repository.Head);
-            var context = gitVersionContextFactory.Context;
 
-            var version = nextVersionCalculator.FindVersion(context);
+            var version = nextVersionCalculator.FindVersion();
 
             version.BuildMetaData.VersionSourceSha.ShouldBe(secondCommit.Sha);
             version.BuildMetaData.CommitsSinceVersionSource.ShouldBe(1);
diff --git a/src/GitVersionCore/Common/IGitVersionContextFactory.cs b/src/GitVersionCore/Common/IGitVersionContextFactory.cs
@@ -5,6 +5,6 @@ namespace GitVersion
     public interface IGitVersionContextFactory
     {
         void Init(IRepository repository, Branch currentBranch, string commitId = null, bool onlyTrackedBranches = false);
-        GitVersionContext Context { get; set; }
+        GitVersionContext Context { get; }
     }
 }
diff --git a/src/GitVersionCore/Core/GitVersionCalculator.cs b/src/GitVersionCore/Core/GitVersionCalculator.cs
@@ -62,7 +62,7 @@ private VersionVariables ExecuteInternal(Arguments arguments)
             gitVersionContextFactory.Init(repo, targetBranch, arguments.CommitId);
             var context = gitVersionContextFactory.Context;
 
-            var semanticVersion = nextVersionCalculator.FindVersion(context);
+            var semanticVersion = nextVersionCalculator.FindVersion();
 
             return variableProvider.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);
         }
diff --git a/src/GitVersionCore/Core/GitVersionContextFactory.cs b/src/GitVersionCore/Core/GitVersionContextFactory.cs
@@ -16,7 +16,7 @@ public class GitVersionContextFactory : IGitVersionContextFactory
         private readonly IGitRepoMetadataProvider gitRepoMetadataProvider;
         private readonly IBranchConfigurationCalculator branchConfigurationCalculator;
         private readonly IOptions<Arguments> options;
-        public GitVersionContext Context { get; set; }
+        public GitVersionContext Context { get; private set; }
 
         public GitVersionContextFactory(ILog log, IConfigProvider configProvider, IGitRepoMetadataProvider gitRepoMetadataProvider, IBranchConfigurationCalculator branchConfigurationCalculator, IOptions<Arguments> options)
         {
diff --git a/src/GitVersionCore/VersionCalculation/INextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/INextVersionCalculator.cs
@@ -2,6 +2,6 @@ namespace GitVersion.VersionCalculation
 {
     public interface INextVersionCalculator
     {
-        SemanticVersion FindVersion(GitVersionContext context);
+        SemanticVersion FindVersion();
     }
 }
diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs
@@ -14,18 +14,23 @@ public class NextVersionCalculator : INextVersionCalculator
         private readonly IBaseVersionCalculator baseVersionCalculator;
         private readonly IMainlineVersionCalculator mainlineVersionCalculator;
         private readonly IGitRepoMetadataProvider gitRepoMetadataProvider;
+        private readonly IGitVersionContextFactory gitVersionContextFactory;
 
-        public NextVersionCalculator(ILog log, IBaseVersionCalculator baseVersionCalculator, IMainlineVersionCalculator mainlineVersionCalculator, IGitRepoMetadataProvider gitRepoMetadataProvider)
+        public NextVersionCalculator(ILog log, IBaseVersionCalculator baseVersionCalculator,
+            IMainlineVersionCalculator mainlineVersionCalculator, IGitRepoMetadataProvider gitRepoMetadataProvider,
+            IGitVersionContextFactory gitVersionContextFactory)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
 
             this.baseVersionCalculator = baseVersionCalculator ?? throw new ArgumentNullException(nameof(baseVersionCalculator));
             this.mainlineVersionCalculator = mainlineVersionCalculator ?? throw new ArgumentNullException(nameof(mainlineVersionCalculator));
             this.gitRepoMetadataProvider = gitRepoMetadataProvider ?? throw new ArgumentNullException(nameof(gitRepoMetadataProvider));
+            this.gitVersionContextFactory = gitVersionContextFactory ?? throw new ArgumentNullException(nameof(gitRepoMetadataProvider));
         }
 
-        public SemanticVersion FindVersion(GitVersionContext context)
+        public SemanticVersion FindVersion()
         {
+            var context = gitVersionContextFactory.Context;
             log.Info($"Running against branch: {context.CurrentBranch.FriendlyName} ({(context.CurrentCommit == null ? "-" : context.CurrentCommit.Sha)})");
             if (context.IsCurrentCommitTagged)
             {
@@ -43,7 +48,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
             return FindVersionInternal(context);
         }
 
-        public SemanticVersion FindVersionInternal(GitVersionContext context)
+        internal SemanticVersion FindVersionInternal(GitVersionContext context)
         {
             SemanticVersion taggedSemanticVersion = null;
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co`
`42`	`42`
`43`	`43`	`try`
`44`	`44`	`{`
`45`		`- var executeGitVersion = nextVersionCalculator.FindVersion(context);`
	`45`	`+ var executeGitVersion = nextVersionCalculator.FindVersion();`
`46`	`46`	`var variables = variableProvider.GetVariablesFor(executeGitVersion, context.Configuration, context.IsCurrentCommitTagged);`
`47`	`47`
`48`	`48`	`return variables;`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ namespace GitVersion`
`5`	`5`	`public interface IGitVersionContextFactory`
`6`	`6`	`{`
`7`	`7`	`void Init(IRepository repository, Branch currentBranch, string commitId = null, bool onlyTrackedBranches = false);`
`8`		`- GitVersionContext Context { get; set; }`
	`8`	`+ GitVersionContext Context { get; }`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private VersionVariables ExecuteInternal(Arguments arguments)`
`62`	`62`	`gitVersionContextFactory.Init(repo, targetBranch, arguments.CommitId);`
`63`	`63`	`var context = gitVersionContextFactory.Context;`
`64`	`64`
`65`		`- var semanticVersion = nextVersionCalculator.FindVersion(context);`
	`65`	`+ var semanticVersion = nextVersionCalculator.FindVersion();`
`66`	`66`
`67`	`67`	`return variableProvider.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public class GitVersionContextFactory : IGitVersionContextFactory`
`16`	`16`	`private readonly IGitRepoMetadataProvider gitRepoMetadataProvider;`
`17`	`17`	`private readonly IBranchConfigurationCalculator branchConfigurationCalculator;`
`18`	`18`	`private readonly IOptions<Arguments> options;`
`19`		`- public GitVersionContext Context { get; set; }`
	`19`	`+ public GitVersionContext Context { get; private set; }`
`20`	`20`
`21`	`21`	`public GitVersionContextFactory(ILog log, IConfigProvider configProvider, IGitRepoMetadataProvider gitRepoMetadataProvider, IBranchConfigurationCalculator branchConfigurationCalculator, IOptions<Arguments> options)`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ namespace GitVersion.VersionCalculation`
`2`	`2`	`{`
`3`	`3`	`public interface INextVersionCalculator`
`4`	`4`	`{`
`5`		`- SemanticVersion FindVersion(GitVersionContext context);`
	`5`	`+ SemanticVersion FindVersion();`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,18 +14,23 @@ public class NextVersionCalculator : INextVersionCalculator`
`14`	`14`	`private readonly IBaseVersionCalculator baseVersionCalculator;`
`15`	`15`	`private readonly IMainlineVersionCalculator mainlineVersionCalculator;`
`16`	`16`	`private readonly IGitRepoMetadataProvider gitRepoMetadataProvider;`
	`17`	`+ private readonly IGitVersionContextFactory gitVersionContextFactory;`
`17`	`18`
`18`		`- public NextVersionCalculator(ILog log, IBaseVersionCalculator baseVersionCalculator, IMainlineVersionCalculator mainlineVersionCalculator, IGitRepoMetadataProvider gitRepoMetadataProvider)`
	`19`	`+ public NextVersionCalculator(ILog log, IBaseVersionCalculator baseVersionCalculator,`
	`20`	`+ IMainlineVersionCalculator mainlineVersionCalculator, IGitRepoMetadataProvider gitRepoMetadataProvider,`
	`21`	`+ IGitVersionContextFactory gitVersionContextFactory)`
`19`	`22`	`{`
`20`	`23`	`this.log = log ?? throw new ArgumentNullException(nameof(log));`
`21`	`24`
`22`	`25`	`this.baseVersionCalculator = baseVersionCalculator ?? throw new ArgumentNullException(nameof(baseVersionCalculator));`
`23`	`26`	`this.mainlineVersionCalculator = mainlineVersionCalculator ?? throw new ArgumentNullException(nameof(mainlineVersionCalculator));`
`24`	`27`	`this.gitRepoMetadataProvider = gitRepoMetadataProvider ?? throw new ArgumentNullException(nameof(gitRepoMetadataProvider));`
	`28`	`+ this.gitVersionContextFactory = gitVersionContextFactory ?? throw new ArgumentNullException(nameof(gitRepoMetadataProvider));`
`25`	`29`	`}`
`26`	`30`
`27`		`- public SemanticVersion FindVersion(GitVersionContext context)`
	`31`	`+ public SemanticVersion FindVersion()`
`28`	`32`	`{`
	`33`	`+ var context = gitVersionContextFactory.Context;`
`29`	`34`	`log.Info($"Running against branch: {context.CurrentBranch.FriendlyName} ({(context.CurrentCommit == null ? "-" : context.CurrentCommit.Sha)})");`
`30`	`35`	`if (context.IsCurrentCommitTagged)`
`31`	`36`	`{`
`@@ -43,7 +48,7 @@ public SemanticVersion FindVersion(GitVersionContext context)`
`43`	`48`	`return FindVersionInternal(context);`
`44`	`49`	`}`
`45`	`50`
`46`		`- public SemanticVersion FindVersionInternal(GitVersionContext context)`
	`51`	`+ internal SemanticVersion FindVersionInternal(GitVersionContext context)`
`47`	`52`	`{`
`48`	`53`	`SemanticVersion taggedSemanticVersion = null;`
`49`	`54`