Skip to content

Commit 0f9d750

Browse files
arturcicarturcic
committed
cleanup
1 parent 65db5a4 commit 0f9d750

File tree

14 files changed

+63
-50
lines changed

14 files changed

+63
-50
lines changed

‎src/GitVersionCore/Core/GitVersionTool.cs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,25 @@ public class GitVersionTool : IGitVersionTool
2828

2929
private readonly IBuildServer buildServer;
3030

31-
public GitVersionTool(ILog log, IGitVersionCache gitVersionCache, INextVersionCalculator nextVersionCalculator, IVariableProvider variableProvider,
32-
IGitVersionCacheKeyFactory cacheKeyFactory, IBuildServerResolver buildServerResolver,
31+
public GitVersionTool(ILog log, INextVersionCalculator nextVersionCalculator, IVariableProvider variableProvider,
32+
IGitVersionCache gitVersionCache, IGitVersionCacheKeyFactory cacheKeyFactory, IBuildServerResolver buildServerResolver,
3333
IWixVersionFileUpdater wixVersionFileUpdater, IGitVersionInformationGenerator gitVersionInformationGenerator, IAssemblyInfoFileUpdater assemblyInfoFileUpdater,
3434
IOptions<Arguments> options, IOptions<GitVersionContext> versionContext)
3535
{
3636
this.log = log ?? throw new ArgumentNullException(nameof(log));
37-
this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));
37+
3838
this.nextVersionCalculator = nextVersionCalculator ?? throw new ArgumentNullException(nameof(nextVersionCalculator));
3939
this.variableProvider = variableProvider ?? throw new ArgumentNullException(nameof(variableProvider));
40-
this.options = options ?? throw new ArgumentNullException(nameof(options));
40+
4141
this.cacheKeyFactory = cacheKeyFactory ?? throw new ArgumentNullException(nameof(cacheKeyFactory));
42+
this.gitVersionCache = gitVersionCache ?? throw new ArgumentNullException(nameof(gitVersionCache));
4243

4344
this.wixVersionFileUpdater = wixVersionFileUpdater ?? throw new ArgumentNullException(nameof(wixVersionFileUpdater));
4445
this.gitVersionInformationGenerator = gitVersionInformationGenerator ?? throw new ArgumentNullException(nameof(gitVersionInformationGenerator));
4546
this.assemblyInfoFileUpdater = assemblyInfoFileUpdater ?? throw new ArgumentNullException(nameof(gitVersionInformationGenerator));
4647

48+
this.options = options ?? throw new ArgumentNullException(nameof(options));
49+
4750
context = versionContext.Value;
4851
buildServer = buildServerResolver.Resolve();
4952
}

‎src/GitVersionCore/Extensions/GitVersionInformationResources/GitVersionInformationGenerator.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
namespace GitVersion.Extensions.GitVersionInformationResources
77
{
8-
public interface IGitVersionInformationGenerator
9-
{
10-
void Generate(VersionVariables variables, FileWriteInfo writeInfo);
11-
}
12-
138
public class GitVersionInformationGenerator : IGitVersionInformationGenerator
149
{
1510
private readonly IFileSystem fileSystem;

‎src/GitVersionCore/Extensions/GitVersionInformationResources/IGitVersionInformationGenerator.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using GitVersion.OutputVariables;
2+
3+
namespace GitVersion.Extensions.GitVersionInformationResources
4+
{
5+
public interface IGitVersionInformationGenerator
6+
{
7+
void Generate(VersionVariables variables, FileWriteInfo writeInfo);
8+
}
9+
}

‎src/GitVersionCore/Extensions/IWixVersionFileUpdater.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System;
2+
using GitVersion.OutputVariables;
3+
4+
namespace GitVersion.Extensions
5+
{
6+
public interface IWixVersionFileUpdater : IDisposable
7+
{
8+
string Update(VersionVariables variables, string workingDirectory);
9+
}
10+
}

‎src/GitVersionCore/Extensions/VersionAssemblyInfoResources/AssemblyInfoFileUpdater.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88

99
namespace GitVersion.Extensions.VersionAssemblyInfoResources
1010
{
11-
public interface IAssemblyInfoFileUpdater : IDisposable
12-
{
13-
void Update(VersionVariables variables, bool ensureAssemblyInfo, string workingDirectory, params string[] assemblyInfo);
14-
void CommitChanges();
15-
}
16-
1711
public class AssemblyInfoFileUpdater : IAssemblyInfoFileUpdater
1812
{
1913
private readonly List<Action> restoreBackupTasks = new List<Action>();

‎src/GitVersionCore/Extensions/VersionAssemblyInfoResources/IAssemblyInfoFileUpdater.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
using GitVersion.OutputVariables;
3+
4+
namespace GitVersion.Extensions.VersionAssemblyInfoResources
5+
{
6+
public interface IAssemblyInfoFileUpdater : IDisposable
7+
{
8+
void Update(VersionVariables variables, bool ensureAssemblyInfo, string workingDirectory, params string[] assemblyInfo);
9+
void CommitChanges();
10+
}
11+
}

‎src/GitVersionCore/Extensions/WixVersionFileUpdater.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77

88
namespace GitVersion.Extensions
99
{
10-
public interface IWixVersionFileUpdater : IDisposable
11-
{
12-
string Update(VersionVariables variables, string workingDirectory);
13-
}
14-
1510
public class WixVersionFileUpdater : IWixVersionFileUpdater
1611
{
1712
private readonly IFileSystem fileSystem;

‎src/GitVersionCore/Model/FileWriteInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace GitVersion
1+
namespace GitVersion
22
{
33
public sealed class FileWriteInfo
44
{

‎src/GitVersionExe.Tests/ArgumentParserTests.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,26 @@
22
using GitVersion.Logging;
33
using GitVersion.Model;
44
using GitVersionCore.Tests.Helpers;
5+
using Microsoft.Extensions.DependencyInjection;
56
using NUnit.Framework;
67
using Shouldly;
78
using Environment = System.Environment;
89

910
namespace GitVersionExe.Tests
1011
{
1112
[TestFixture]
12-
public class ArgumentParserTests
13+
public class ArgumentParserTests : TestBase
1314
{
1415
private IArgumentParser argumentParser;
1516

1617
[SetUp]
1718
public void SetUp()
1819
{
19-
argumentParser = new ArgumentParser(new TestEnvironment());
20+
var sp = ConfigureServices(services =>
21+
{
22+
services.AddSingleton<IArgumentParser, ArgumentParser>();
23+
});
24+
argumentParser = sp.GetService<IArgumentParser>();
2025
}
2126

2227
[Test]

‎src/GitVersionExe.Tests/ExecutionResults.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public ExecutionResults(int exitCode, string output, string logContents)
1414
Log = logContents;
1515
}
1616

17-
public int ExitCode { get; private set; }
18-
public string Output { get; private set; }
19-
public string Log { get; private set; }
17+
public int ExitCode { get; }
18+
public string Output { get; }
19+
public string Log { get; }
2020

2121
public virtual VersionVariables OutputVariables
2222
{

‎src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PackageReference Include="Mono.Cecil" Version="0.11.2"></PackageReference>
1111
</ItemGroup>
1212
<ItemGroup>
13+
<ProjectReference Include="..\GitVersionCore.Tests\GitVersionCore.Tests.csproj" />
1314
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
1415
<ProjectReference Include="..\GitVersionExe\GitVersionExe.csproj" />
1516
</ItemGroup>

‎src/GitVersionExe/ArgumentParser.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ namespace GitVersion
1414
public class ArgumentParser : IArgumentParser
1515
{
1616
private readonly IEnvironment environment;
17+
private readonly IBuildServerResolver buildServerResolver;
1718

18-
public ArgumentParser(IEnvironment environment)
19+
public ArgumentParser(IEnvironment environment, IBuildServerResolver buildServerResolver)
1920
{
2021
this.environment = environment ?? throw new ArgumentNullException(nameof(environment));
22+
this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
2123
}
2224

2325
public Arguments ParseArguments(string commandLineArguments)
@@ -158,7 +160,6 @@ public Arguments ParseArguments(string[] commandLineArguments)
158160
continue;
159161
}
160162

161-
162163
if (name.IsSwitch("execargs"))
163164
{
164165
EnsureArgumentValueCount(values);
@@ -186,7 +187,6 @@ public Arguments ParseArguments(string[] commandLineArguments)
186187
continue;
187188
}
188189

189-
190190
if (name.IsSwitch("diag"))
191191
{
192192
if (value == null || value.IsTrue())
@@ -305,18 +305,11 @@ public Arguments ParseArguments(string[] commandLineArguments)
305305

306306
if (name.IsSwitch("ensureassemblyinfo"))
307307
{
308-
if (value.IsTrue())
309-
{
310-
arguments.EnsureAssemblyInfo = true;
311-
}
312-
else if (value.IsFalse())
308+
arguments.EnsureAssemblyInfo = true;
309+
if (value.IsFalse())
313310
{
314311
arguments.EnsureAssemblyInfo = false;
315312
}
316-
else
317-
{
318-
arguments.EnsureAssemblyInfo = true;
319-
}
320313

321314
if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)
322315
{
@@ -428,6 +421,9 @@ public Arguments ParseArguments(string[] commandLineArguments)
428421
: firstArgument;
429422
}
430423

424+
var buildServer = buildServerResolver.Resolve();
425+
arguments.NoFetch = arguments.NoFetch || buildServer != null && buildServer.PreventFetch();
426+
431427
return arguments;
432428
}
433429

‎src/GitVersionExe/ExecCommand.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ namespace GitVersion
1010
{
1111
public class ExecCommand : IExecCommand
1212
{
13-
1413
private readonly ILog log;
1514
private readonly IOptions<Arguments> options;
1615

‎src/GitVersionExe/GitVersionExecutor.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,16 @@ public class GitVersionExecutor : IGitVersionExecutor
1515
private readonly IHelpWriter helpWriter;
1616
private readonly IExecCommand execCommand;
1717
private readonly IConfigProvider configProvider;
18-
private readonly IBuildServerResolver buildServerResolver;
1918
private readonly IGitVersionTool gitVersionTool;
2019
private readonly IVersionWriter versionWriter;
2120

22-
public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IConfigProvider configProvider,
23-
IBuildServerResolver buildServerResolver, IGitVersionTool gitVersionTool,
21+
public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IConfigProvider configProvider, IGitVersionTool gitVersionTool,
2422
IVersionWriter versionWriter, IHelpWriter helpWriter, IExecCommand execCommand)
2523
{
2624
this.log = log ?? throw new ArgumentNullException(nameof(log));
2725
this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
2826
this.configProvider = configProvider ?? throw new ArgumentNullException(nameof(configFileLocator));
2927

30-
this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
3128
this.gitVersionTool = gitVersionTool ?? throw new ArgumentNullException(nameof(gitVersionTool));
3229

3330
this.versionWriter = versionWriter ?? throw new ArgumentNullException(nameof(versionWriter));
@@ -38,7 +35,10 @@ public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IConfi
3835

3936
public int Execute(Arguments arguments)
4037
{
41-
var exitCode = VerifyArgumentsAndRun(arguments);
38+
if (!HandleNonMainCommand(arguments, out var exitCode))
39+
{
40+
exitCode = RunGitVersionTool(arguments);
41+
}
4242

4343
if (exitCode != 0)
4444
{
@@ -49,12 +49,10 @@ public int Execute(Arguments arguments)
4949
return exitCode;
5050
}
5151

52-
private int VerifyArgumentsAndRun(Arguments arguments)
52+
private int RunGitVersionTool(Arguments arguments)
5353
{
5454
try
5555
{
56-
if (HandleNonMainCommand(arguments, out var exitCode)) return exitCode;
57-
5856
var variables = gitVersionTool.CalculateVersionVariables();
5957

6058
gitVersionTool.OutputVariables(variables, Console.WriteLine);
@@ -132,9 +130,6 @@ private bool HandleNonMainCommand(Arguments arguments, out int exitCode)
132130
arguments.Output.Add(OutputType.BuildServer);
133131
}
134132

135-
var buildServer = buildServerResolver.Resolve();
136-
arguments.NoFetch = arguments.NoFetch || buildServer != null && buildServer.PreventFetch();
137-
138133
ConfigureLogging(arguments, log);
139134

140135
if (arguments.Diag)

0 commit comments

Comments
 (0)