introduce the concept of Authentication

SimonCropp · SimonCropp · commit 7ef98d482026 · 2014-07-06T13:09:46.000+10:00
reduces the use of the Arguments god class
diff --git a/GitVersionCore/ArgumentParser.cs b/GitVersionCore/ArgumentParser.cs
@@ -84,13 +84,13 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
 
                 if (IsSwitch("u", name))
                 {
-                    arguments.Username = value;
+                    arguments.Authentication.Username = value;
                     continue;
                 }
 
                 if (IsSwitch("p", name))
                 {
-                    arguments.Password = value;
+                    arguments.Authentication.Password = value;
                     continue;
                 }
 
diff --git a/GitVersionCore/Arguments.cs b/GitVersionCore/Arguments.cs
@@ -1,23 +1,20 @@
 namespace GitVersion
 {
-    using System;
-
     public class Arguments
     {
         public Arguments()
         {
-            Username = Environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");
-            Password = Environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");
+            Authentication = new Authentication();
             Output = OutputType.Json;
         }
 
+        public Authentication Authentication;
+
         public string TargetPath;
 
         public string TargetUrl;
         public string TargetBranch;
 
-        public string Username;
-        public string Password;
 
         public bool IsHelp;
         public string LogFilePath;
diff --git a/GitVersionCore/Authentication.cs b/GitVersionCore/Authentication.cs
@@ -0,0 +1,15 @@
+namespace GitVersion
+{
+    using System;
+
+    public class Authentication
+    {
+        public Authentication()
+        {
+            Username = Environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");
+            Password = Environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");
+        }
+        public string Username;
+        public string Password;
+    }
+}
diff --git a/GitVersionCore/BuildServers/AppVeyor.cs b/GitVersionCore/BuildServers/AppVeyor.cs
@@ -6,11 +6,11 @@
 
     public class AppVeyor : BuildServerBase
     {
-        Arguments arguments;
+        Authentication authentication;
 
-        public AppVeyor(Arguments arguments)
+        public AppVeyor(Authentication authentication)
         {
-            this.arguments = arguments;
+            this.authentication = authentication;
         }
 
         public override bool CanApplyToCurrentContext()
@@ -27,7 +27,7 @@ public override void PerformPreProcessingSteps(string gitDirectory)
 
             var repoBranch = Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH");
 
-            GitHelper.NormalizeGitDirectory(gitDirectory, arguments, repoBranch);
+            GitHelper.NormalizeGitDirectory(gitDirectory, authentication, repoBranch);
         }
 
         public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)
diff --git a/GitVersionCore/BuildServers/BuildServerList.cs b/GitVersionCore/BuildServers/BuildServerList.cs
@@ -7,27 +7,27 @@ public static class BuildServerList
     {
         static List<IBuildServer> BuildServers;
 
-        public static Func<Arguments, IEnumerable<IBuildServer>> Selector = arguments => DefaultSelector(arguments);
+        public static Func<Authentication, IEnumerable<IBuildServer>> Selector = arguments => DefaultSelector(arguments);
 
         public static void ResetSelector()
         {
             Selector = DefaultSelector;
         }
 
-        public static IEnumerable<IBuildServer> GetApplicableBuildServers(Arguments arguments)
+        public static IEnumerable<IBuildServer> GetApplicableBuildServers(Authentication authentication)
         {
-            return Selector(arguments);
+            return Selector(authentication);
         }
 
-        static IEnumerable<IBuildServer> DefaultSelector(Arguments arguments)
+        static IEnumerable<IBuildServer> DefaultSelector(Authentication authentication)
         {
             if (BuildServers == null)
             {
                 BuildServers = new List<IBuildServer>
                 {
-                    new ContinuaCi(arguments),
-                    new TeamCity(arguments),
-                    new AppVeyor(arguments)
+                    new ContinuaCi(authentication),
+                    new TeamCity(authentication),
+                    new AppVeyor(authentication)
                 };
             }
 
diff --git a/GitVersionCore/BuildServers/ContinuaCi.cs b/GitVersionCore/BuildServers/ContinuaCi.cs
@@ -4,11 +4,11 @@
 
     public class ContinuaCi : BuildServerBase
     {
-        Arguments arguments;
+        Authentication authentication;
 
-        public ContinuaCi(Arguments arguments)
+        public ContinuaCi(Authentication authentication)
         {
-            this.arguments = arguments;
+            this.authentication = authentication;
         }
 
         public override bool CanApplyToCurrentContext()
@@ -35,7 +35,7 @@ public override void PerformPreProcessingSteps(string gitDirectory)
                 throw new WarningException("Failed to find .git directory on agent");
             }
 
-            GitHelper.NormalizeGitDirectory(gitDirectory, arguments);
+            GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
diff --git a/GitVersionCore/BuildServers/GitHelper.cs b/GitVersionCore/BuildServers/GitHelper.cs
@@ -6,7 +6,7 @@ namespace GitVersion
 
     public static class GitHelper
     {
-        public static void NormalizeGitDirectory(string gitDirectory, Arguments arguments, string branch = null)
+        public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication, string branch = null)
         {
             using (var repo = new Repository(gitDirectory))
             {
@@ -17,7 +17,7 @@ public static void NormalizeGitDirectory(string gitDirectory, Arguments argument
                 Logger.WriteInfo(string.Format("Fetching from remote '{0}' using the following refspecs: {1}.",
                     remote.Name, string.Join(", ", remote.FetchRefSpecs.Select(r => r.Specification))));
 
-                var fetchOptions = BuildFetchOptions(arguments.Username, arguments.Password);
+                var fetchOptions = BuildFetchOptions(authentication.Username, authentication.Password);
                 repo.Network.Fetch(remote, fetchOptions);
 
                 CreateMissingLocalBranchesFromRemoteTrackingOnes(repo, remote.Name);
@@ -37,7 +37,7 @@ public static void NormalizeGitDirectory(string gitDirectory, Arguments argument
                 }
                 else
                 {
-                    CreateFakeBranchPointingAtThePullRequestTip(repo, arguments);
+                    CreateFakeBranchPointingAtThePullRequestTip(repo, authentication);
                 }
             }
         }
@@ -71,13 +71,13 @@ static FetchOptions BuildFetchOptions(string username, string password)
             return fetchOptions;
         }
 
-        static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Arguments arguments)
+        static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Authentication authentication)
         {
             var remote = repo.Network.Remotes.Single();
 
-            var remoteTips = string.IsNullOrEmpty(arguments.Username) ?
+            var remoteTips = string.IsNullOrEmpty(authentication.Username) ?
                 GetRemoteTipsForAnonymousUser(repo, remote) :
-                GetRemoteTipsUsingUsernamePasswordCredentials(repo, remote, arguments.Username, arguments.Password);
+                GetRemoteTipsUsingUsernamePasswordCredentials(repo, remote, authentication.Username, authentication.Password);
 
             var headTipSha = repo.Head.Tip.Sha;
 
diff --git a/GitVersionCore/BuildServers/TeamCity.cs b/GitVersionCore/BuildServers/TeamCity.cs
@@ -4,11 +4,11 @@
 
     public class TeamCity : BuildServerBase
     {
-        Arguments arguments;
+        Authentication authentication;
 
-        public TeamCity(Arguments arguments)
+        public TeamCity(Authentication authentication)
         {
-            this.arguments = arguments;
+            this.authentication = authentication;
         }
 
         public override bool CanApplyToCurrentContext()
@@ -23,7 +23,7 @@ public override void PerformPreProcessingSteps(string gitDirectory)
                 throw new WarningException("Failed to find .git directory on agent. Please make sure agent checkout mode is enabled for you VCS roots - http://confluence.jetbrains.com/display/TCD8/VCS+Checkout+Mode");
             }
 
-            GitHelper.NormalizeGitDirectory(gitDirectory, arguments);
+            GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
         }
 
         public override string[] GenerateSetParameterMessage(string name, string value)
diff --git a/GitVersionCore/GitVersionCore.csproj b/GitVersionCore/GitVersionCore.csproj
@@ -58,6 +58,7 @@
     <Compile Include="AssemblyMetaData.cs" />
     <Compile Include="AssemblyVersionsGenerator.cs" />
     <Compile Include="AssemblyVersioningScheme.cs" />
+    <Compile Include="Authentication.cs" />
     <Compile Include="BuildServers\AppVeyor.cs" />
     <Compile Include="BuildServers\BuildServerBase.cs" />
     <Compile Include="BuildServers\BuildServerList.cs" />
diff --git a/GitVersionExe/GitPreparer.cs b/GitVersionExe/GitPreparer.cs
@@ -42,14 +42,15 @@ string GetGitInfoFromUrl()
             }
 
             Credentials credentials = null;
-            if (!string.IsNullOrWhiteSpace(arguments.Username) && !string.IsNullOrWhiteSpace(arguments.Password))
+            var authentication = arguments.Authentication;
+            if (!string.IsNullOrWhiteSpace(authentication.Username) && !string.IsNullOrWhiteSpace(authentication.Password))
             {
-                Logger.WriteInfo(string.Format("Setting up credentials using name '{0}'", arguments.Username));
+                Logger.WriteInfo(string.Format("Setting up credentials using name '{0}'", authentication.Username));
 
                 credentials = new UsernamePasswordCredentials
                     {
-                    Username = arguments.Username,
-                    Password = arguments.Password
+                        Username = authentication.Username,
+                        Password = authentication.Password
                 };
             }
 
@@ -61,7 +62,7 @@ string GetGitInfoFromUrl()
             if (!string.IsNullOrWhiteSpace(arguments.TargetBranch))
             {
                 // Normalize (download branches) before using the branch
-                GitHelper.NormalizeGitDirectory(gitDirectory, arguments);
+                GitHelper.NormalizeGitDirectory(gitDirectory, arguments.Authentication);
 
                 using (var repository = new Repository(gitDirectory))
                 {
diff --git a/GitVersionExe/Program.cs b/GitVersionExe/Program.cs
@@ -51,7 +51,7 @@ static void Main()
 
                 var workingDirectory = Directory.GetParent(gitDirectory).FullName;
                 Logger.WriteInfo("Working directory: " + workingDirectory);
-                var applicableBuildServers = GetApplicableBuildServers(arguments).ToList();
+                var applicableBuildServers = GetApplicableBuildServers(arguments.Authentication).ToList();
 
                 foreach (var buildServer in applicableBuildServers)
                 {
@@ -138,9 +138,9 @@ static void Main()
             Environment.Exit(exitCode.Value);
         }
 
-        static IEnumerable<IBuildServer> GetApplicableBuildServers(Arguments arguments)
+        static IEnumerable<IBuildServer> GetApplicableBuildServers(Authentication authentication)
         {
-            return BuildServerList.GetApplicableBuildServers(arguments);
+            return BuildServerList.GetApplicableBuildServers(authentication);
         }
 
         static void ConfigureLogging(Arguments arguments)
diff --git a/GitVersionTask/VersionAndBranchFinder.cs b/GitVersionTask/VersionAndBranchFinder.cs
@@ -21,8 +21,8 @@ public static bool TryGetVersion(string directory, out SemanticVersion versionAn
                 return false;
             }
 
-            var arguments = new Arguments();
-            foreach (var buildServer in BuildServerList.GetApplicableBuildServers(arguments))
+            var authentication = new Authentication();
+            foreach (var buildServer in BuildServerList.GetApplicableBuildServers(authentication))
             {
                 Logger.WriteInfo(string.Format("Executing PerformPreProcessingSteps for '{0}'.", buildServer.GetType().Name));
                 buildServer.PerformPreProcessingSteps(gitDirectory);
diff --git a/GitVersionTask/WriteVersionInfoToBuildLog.cs b/GitVersionTask/WriteVersionInfoToBuildLog.cs
@@ -52,8 +52,8 @@ public void InnerExecute()
                 return;
             }
 
-            var arguments = new Arguments();
-            WriteIntegrationParameters(semanticVersion, BuildServerList.GetApplicableBuildServers(arguments));
+            var authentication = new Authentication();
+            WriteIntegrationParameters(semanticVersion, BuildServerList.GetApplicableBuildServers(authentication));
         }
 
         public void WriteIntegrationParameters(SemanticVersion semanticVersion, IEnumerable<IBuildServer> applicableBuildServers)
diff --git a/Tests/ArgumentParserTests.cs b/Tests/ArgumentParserTests.cs
@@ -108,8 +108,8 @@ public void Username_and_Password_can_be_parsed()
     {
         var arguments = ArgumentParser.ParseArguments("targetDirectoryPath -u [username] -p [password]");
         Assert.AreEqual("targetDirectoryPath", arguments.TargetPath);
-        Assert.AreEqual("[username]", arguments.Username);
-        Assert.AreEqual("[password]", arguments.Password);
+        Assert.AreEqual("[username]", arguments.Authentication.Username);
+        Assert.AreEqual("[password]", arguments.Authentication.Password);
         Assert.IsFalse(arguments.IsHelp);
     }
 
diff --git a/Tests/BuildServers/ContinuaCiTests.cs b/Tests/BuildServers/ContinuaCiTests.cs
@@ -8,8 +8,8 @@ public class ContinuaCiTests
     [Test]
     public void GenerateBuildVersion()
     {
-        var arguments = new Arguments();
-        var versionBuilder = new ContinuaCi(arguments);
+        var authentication = new Authentication();
+        var versionBuilder = new ContinuaCi(authentication);
         var continuaCiVersion = versionBuilder.GenerateSetVersionMessage("0.0.0-Beta4.7");
         Assert.AreEqual("@@continua[setBuildVersion value='0.0.0-Beta4.7']", continuaCiVersion);
     }
diff --git a/Tests/BuildServers/TeamCityTests.cs b/Tests/BuildServers/TeamCityTests.cs
@@ -7,17 +7,17 @@ public class TeamCityTests
     [Test]
     public void Develop_branch()
     {
-        var arguments = new Arguments();
-        var versionBuilder = new TeamCity(arguments);
+        var authentication = new Authentication();
+        var versionBuilder = new TeamCity(authentication);
         var tcVersion = versionBuilder.GenerateSetVersionMessage("0.0.0-Unstable4");
         Assert.AreEqual("##teamcity[buildNumber '0.0.0-Unstable4']", tcVersion);
     }
 
     [Test]
     public void EscapeValues()
     {
-        var arguments = new Arguments();
-        var versionBuilder = new TeamCity(arguments);
+        var authentication = new Authentication();
+        var versionBuilder = new TeamCity(authentication);
         var tcVersion = versionBuilder.GenerateSetParameterMessage("Foo", "0.8.0-unstable568 Branch:'develop' Sha:'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb'");
         Assert.AreEqual("##teamcity[setParameter name='GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[0]);
         Assert.AreEqual("##teamcity[setParameter name='system.GitVersion.Foo' value='0.8.0-unstable568 Branch:|'develop|' Sha:|'ee69bff1087ebc95c6b43aa2124bd58f5722e0cb|'']", tcVersion[1]);
diff --git a/Tests/GitHelperTests.cs b/Tests/GitHelperTests.cs
@@ -12,8 +12,8 @@ public void CanDetermineTheVersionFromAFetchedMaster()
     {
         var gitDirectory = FakeTeamCityFetchAndCheckout(ASBMTestRepoWorkingDirPath, "refs/heads/master");
 
-        var arguments = new Arguments();
-        GitHelper.NormalizeGitDirectory(gitDirectory, arguments);
+        var authentication = new Authentication();
+        GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
 
         using (var repository = new Repository(gitDirectory))
         {
@@ -30,8 +30,8 @@ public void CanDetermineTheVersionFromAPullRequest()
 
         var gitDirectory = FakeTeamCityFetchAndCheckout(repoPath, "refs/pull/1735/merge");
 
-        var arguments = new Arguments();
-        GitHelper.NormalizeGitDirectory(gitDirectory, arguments);
+        var authentication = new Authentication();
+        GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
 
         using (var repository = new Repository(gitDirectory))
         {
@@ -45,8 +45,8 @@ public void CanDetermineTheVersionFromAFetchedDevelop()
     {
         var gitDirectory = FakeTeamCityFetchAndCheckout(ASBMTestRepoWorkingDirPath, "refs/heads/develop");
 
-        var arguments = new Arguments();
-        GitHelper.NormalizeGitDirectory(gitDirectory, arguments);
+        var authentication = new Authentication();
+        GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
 
         using (var repository = new Repository(gitDirectory))
         {
@@ -60,8 +60,8 @@ public void CanDetermineTheVersionFromAFetchedFeature()
     {
         var gitDirectory = FakeTeamCityFetchAndCheckout(ASBMTestRepoWorkingDirPath, "refs/heads/feature/one");
 
-        var arguments = new Arguments();
-        GitHelper.NormalizeGitDirectory(gitDirectory, arguments);
+        var authentication = new Authentication();
+        GitHelper.NormalizeGitDirectory(gitDirectory, authentication);
 
         using (var repository = new Repository(gitDirectory))
         {

Original file line number	Diff line number	Diff line change
`@@ -84,13 +84,13 @@ public static Arguments ParseArguments(List<string> commandLineArguments)`
`84`	`84`
`85`	`85`	`if (IsSwitch("u", name))`
`86`	`86`	`{`
`87`		`- arguments.Username = value;`
	`87`	`+ arguments.Authentication.Username = value;`
`88`	`88`	`continue;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (IsSwitch("p", name))`
`92`	`92`	`{`
`93`		`- arguments.Password = value;`
	`93`	`+ arguments.Authentication.Password = value;`
`94`	`94`	`continue;`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,20 @@`
`1`	`1`	`namespace GitVersion`
`2`	`2`	`{`
`3`		`- using System;`
`4`		`-`
`5`	`3`	`public class Arguments`
`6`	`4`	`{`
`7`	`5`	`public Arguments()`
`8`	`6`	`{`
`9`		`- Username = Environment.GetEnvironmentVariable("GITVERSION_REMOTE_USERNAME");`
`10`		`- Password = Environment.GetEnvironmentVariable("GITVERSION_REMOTE_PASSWORD");`
	`7`	`+ Authentication = new Authentication();`
`11`	`8`	`Output = OutputType.Json;`
`12`	`9`	`}`
`13`	`10`
	`11`	`+ public Authentication Authentication;`
	`12`	`+`
`14`	`13`	`public string TargetPath;`
`15`	`14`
`16`	`15`	`public string TargetUrl;`
`17`	`16`	`public string TargetBranch;`
`18`	`17`
`19`		`- public string Username;`
`20`		`- public string Password;`
`21`	`18`
`22`	`19`	`public bool IsHelp;`
`23`	`20`	`public string LogFilePath;`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@`
`6`	`6`
`7`	`7`	`public class AppVeyor : BuildServerBase`
`8`	`8`	`{`
`9`		`- Arguments arguments;`
	`9`	`+ Authentication authentication;`
`10`	`10`
`11`		`- public AppVeyor(Arguments arguments)`
	`11`	`+ public AppVeyor(Authentication authentication)`
`12`	`12`	`{`
`13`		`- this.arguments = arguments;`
	`13`	`+ this.authentication = authentication;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public override bool CanApplyToCurrentContext()`
`@@ -27,7 +27,7 @@ public override void PerformPreProcessingSteps(string gitDirectory)`
`27`	`27`
`28`	`28`	`var repoBranch = Environment.GetEnvironmentVariable("APPVEYOR_REPO_BRANCH");`
`29`	`29`
`30`		`- GitHelper.NormalizeGitDirectory(gitDirectory, arguments, repoBranch);`
	`30`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication, repoBranch);`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public override string GenerateSetVersionMessage(string versionToUseForBuildNumber)`
Original file line number	Diff line number	Diff line change
`@@ -7,27 +7,27 @@ public static class BuildServerList`
`7`	`7`	`{`
`8`	`8`	`static List<IBuildServer> BuildServers;`
`9`	`9`
`10`		`- public static Func<Arguments, IEnumerable<IBuildServer>> Selector = arguments => DefaultSelector(arguments);`
	`10`	`+ public static Func<Authentication, IEnumerable<IBuildServer>> Selector = arguments => DefaultSelector(arguments);`
`11`	`11`
`12`	`12`	`public static void ResetSelector()`
`13`	`13`	`{`
`14`	`14`	`Selector = DefaultSelector;`
`15`	`15`	`}`
`16`	`16`
`17`		`- public static IEnumerable<IBuildServer> GetApplicableBuildServers(Arguments arguments)`
	`17`	`+ public static IEnumerable<IBuildServer> GetApplicableBuildServers(Authentication authentication)`
`18`	`18`	`{`
`19`		`- return Selector(arguments);`
	`19`	`+ return Selector(authentication);`
`20`	`20`	`}`
`21`	`21`
`22`		`- static IEnumerable<IBuildServer> DefaultSelector(Arguments arguments)`
	`22`	`+ static IEnumerable<IBuildServer> DefaultSelector(Authentication authentication)`
`23`	`23`	`{`
`24`	`24`	`if (BuildServers == null)`
`25`	`25`	`{`
`26`	`26`	`BuildServers = new List<IBuildServer>`
`27`	`27`	`{`
`28`		`- new ContinuaCi(arguments),`
`29`		`- new TeamCity(arguments),`
`30`		`- new AppVeyor(arguments)`
	`28`	`+ new ContinuaCi(authentication),`
	`29`	`+ new TeamCity(authentication),`
	`30`	`+ new AppVeyor(authentication)`
`31`	`31`	`};`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`
`5`	`5`	`public class ContinuaCi : BuildServerBase`
`6`	`6`	`{`
`7`		`- Arguments arguments;`
	`7`	`+ Authentication authentication;`
`8`	`8`
`9`		`- public ContinuaCi(Arguments arguments)`
	`9`	`+ public ContinuaCi(Authentication authentication)`
`10`	`10`	`{`
`11`		`- this.arguments = arguments;`
	`11`	`+ this.authentication = authentication;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public override bool CanApplyToCurrentContext()`
`@@ -35,7 +35,7 @@ public override void PerformPreProcessingSteps(string gitDirectory)`
`35`	`35`	`throw new WarningException("Failed to find .git directory on agent");`
`36`	`36`	`}`
`37`	`37`
`38`		`- GitHelper.NormalizeGitDirectory(gitDirectory, arguments);`
	`38`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public override string[] GenerateSetParameterMessage(string name, string value)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace GitVersion`
`6`	`6`
`7`	`7`	`public static class GitHelper`
`8`	`8`	`{`
`9`		`- public static void NormalizeGitDirectory(string gitDirectory, Arguments arguments, string branch = null)`
	`9`	`+ public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication, string branch = null)`
`10`	`10`	`{`
`11`	`11`	`using (var repo = new Repository(gitDirectory))`
`12`	`12`	`{`
`@@ -17,7 +17,7 @@ public static void NormalizeGitDirectory(string gitDirectory, Arguments argument`
`17`	`17`	`Logger.WriteInfo(string.Format("Fetching from remote '{0}' using the following refspecs: {1}.",`
`18`	`18`	`remote.Name, string.Join(", ", remote.FetchRefSpecs.Select(r => r.Specification))));`
`19`	`19`
`20`		`- var fetchOptions = BuildFetchOptions(arguments.Username, arguments.Password);`
	`20`	`+ var fetchOptions = BuildFetchOptions(authentication.Username, authentication.Password);`
`21`	`21`	`repo.Network.Fetch(remote, fetchOptions);`
`22`	`22`
`23`	`23`	`CreateMissingLocalBranchesFromRemoteTrackingOnes(repo, remote.Name);`
`@@ -37,7 +37,7 @@ public static void NormalizeGitDirectory(string gitDirectory, Arguments argument`
`37`	`37`	`}`
`38`	`38`	`else`
`39`	`39`	`{`
`40`		`- CreateFakeBranchPointingAtThePullRequestTip(repo, arguments);`
	`40`	`+ CreateFakeBranchPointingAtThePullRequestTip(repo, authentication);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
`@@ -71,13 +71,13 @@ static FetchOptions BuildFetchOptions(string username, string password)`
`71`	`71`	`return fetchOptions;`
`72`	`72`	`}`
`73`	`73`
`74`		`- static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Arguments arguments)`
	`74`	`+ static void CreateFakeBranchPointingAtThePullRequestTip(Repository repo, Authentication authentication)`
`75`	`75`	`{`
`76`	`76`	`var remote = repo.Network.Remotes.Single();`
`77`	`77`
`78`		`- var remoteTips = string.IsNullOrEmpty(arguments.Username) ?`
	`78`	`+ var remoteTips = string.IsNullOrEmpty(authentication.Username) ?`
`79`	`79`	`GetRemoteTipsForAnonymousUser(repo, remote) :`
`80`		`- GetRemoteTipsUsingUsernamePasswordCredentials(repo, remote, arguments.Username, arguments.Password);`
	`80`	`+ GetRemoteTipsUsingUsernamePasswordCredentials(repo, remote, authentication.Username, authentication.Password);`
`81`	`81`
`82`	`82`	`var headTipSha = repo.Head.Tip.Sha;`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`
`5`	`5`	`public class TeamCity : BuildServerBase`
`6`	`6`	`{`
`7`		`- Arguments arguments;`
	`7`	`+ Authentication authentication;`
`8`	`8`
`9`		`- public TeamCity(Arguments arguments)`
	`9`	`+ public TeamCity(Authentication authentication)`
`10`	`10`	`{`
`11`		`- this.arguments = arguments;`
	`11`	`+ this.authentication = authentication;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public override bool CanApplyToCurrentContext()`
`@@ -23,7 +23,7 @@ public override void PerformPreProcessingSteps(string gitDirectory)`
`23`	`23`	`throw new WarningException("Failed to find .git directory on agent. Please make sure agent checkout mode is enabled for you VCS roots - http://confluence.jetbrains.com/display/TCD8/VCS+Checkout+Mode");`
`24`	`24`	`}`
`25`	`25`
`26`		`- GitHelper.NormalizeGitDirectory(gitDirectory, arguments);`
	`26`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, authentication);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public override string[] GenerateSetParameterMessage(string name, string value)`
Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,15 @@ string GetGitInfoFromUrl()`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`Credentials credentials = null;`
`45`		`- if (!string.IsNullOrWhiteSpace(arguments.Username) && !string.IsNullOrWhiteSpace(arguments.Password))`
	`45`	`+ var authentication = arguments.Authentication;`
	`46`	`+ if (!string.IsNullOrWhiteSpace(authentication.Username) && !string.IsNullOrWhiteSpace(authentication.Password))`
`46`	`47`	`{`
`47`		`- Logger.WriteInfo(string.Format("Setting up credentials using name '{0}'", arguments.Username));`
	`48`	`+ Logger.WriteInfo(string.Format("Setting up credentials using name '{0}'", authentication.Username));`
`48`	`49`
`49`	`50`	`credentials = new UsernamePasswordCredentials`
`50`	`51`	`{`
`51`		`- Username = arguments.Username,`
`52`		`- Password = arguments.Password`
	`52`	`+ Username = authentication.Username,`
	`53`	`+ Password = authentication.Password`
`53`	`54`	`};`
`54`	`55`	`}`
`55`	`56`
`@@ -61,7 +62,7 @@ string GetGitInfoFromUrl()`
`61`	`62`	`if (!string.IsNullOrWhiteSpace(arguments.TargetBranch))`
`62`	`63`	`{`
`63`	`64`	`// Normalize (download branches) before using the branch`
`64`		`- GitHelper.NormalizeGitDirectory(gitDirectory, arguments);`
	`65`	`+ GitHelper.NormalizeGitDirectory(gitDirectory, arguments.Authentication);`
`65`	`66`
`66`	`67`	`using (var repository = new Repository(gitDirectory))`
`67`	`68`	`{`