Merge branch 'enhancements/async-git-setup' into enhancements/git-setup-download

# Conflicts:
#	src/tests/IntegrationTests/Git/GitSetupTests.cs

Author: StanleyGoldman

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 GitHub
+Copyright (c) 2016-2018 GitHub
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/GitHub.Api/GitHub.Api.csproj

@@ -118,7 +118,6 @@
     <Compile Include="Helpers\Constants.cs" />
     <Compile Include="Helpers\Validation.cs" />
     <Compile Include="Installer\GitInstaller.cs" />
-    <Compile Include="Installer\ShortCircuitTask.cs" />
     <Compile Include="Installer\UnzipTask.cs" />
     <Compile Include="OutputProcessors\GitAheadBehindStatusOutputProcessor.cs" />
     <Compile Include="OutputProcessors\LfsVersionOutputProcessor.cs" />

src/GitHub.Api/Installer/ShortCircuitTask.cs

@@ -85,7 +85,12 @@ public static WebResponse GetResponseWithoutException(this WebRequest request)
             }
             catch (WebException e)
             {
-                return e.Response;
+                if (e.Response != null)
+                {
+                    return e.Response;
+                }
+
+                throw e;
             }
         }
     }

src/GitHub.Api/Tasks/DownloadTask.cs

@@ -81,7 +81,6 @@ public void TestDownloadFailure()
             exceptionThrown.Should().NotBeNull();
         }
 
-
         [Test]
         public void TestDownloadTextTask()
         {
@@ -92,6 +91,26 @@ public void TestDownloadTextTask()
             var resultLines = result.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
             resultLines[0].Should().Be("# If you would like to crawl GitHub contact us at [email protected].");
         }
+
+        [Test]
+        public void TestDownloadTextFailture()
+        {
+            InitializeTaskManager();
+
+            var downloadTask = new DownloadTextTask(CancellationToken.None, "https://ggggithub.com/robots.txt");
+            var exceptionThrown = false;
+
+            try
+            {
+                var result = downloadTask.Start().Result;
+            }
+            catch (Exception e)
+            {
+                exceptionThrown = true;
+            }
+
+            exceptionThrown.Should().BeTrue();
+        }
 
         [Test]
         public void TestDownloadFileAndHash()

src/tests/IntegrationTests/Download/DownloadTaskTests.cs

@@ -0,0 +1,110 @@
+using System.Collections.Generic;
+using FluentAssertions;
+using GitHub.Unity;
+using NUnit.Framework;
+using Rackspace.Threading;
+using System.Threading.Tasks;
+using ICSharpCode.SharpZipLib.Zip;
+
+namespace IntegrationTests
+{
+    class GitSetupTests : BaseGitEnvironmentTest
+    {
+        [Test, Category("DoNotRunOnAppVeyor")]
+        public async Task InstallGit()
+        {
+            var environmentPath = NPath.CreateTempDirectory("integration-test-environment");
+            var environment = await Initialize(TestRepoMasterDirtyUnsynchronized, environmentPath);
+
+            var gitSetup = new GitInstaller(environment, TaskManager.Token);
+            var expectedPath = gitSetup.GitInstallationPath;
+
+            var setupDone = false;
+            var percent = -1f;
+            gitSetup.GitExecutablePath.FileExists().Should().BeFalse();
+
+            setupDone = await gitSetup.SetupIfNeeded(new Progress<float>(x => percent = x));
+
+            if (environment.IsWindows)
+            {
+                environment.GitExecutablePath = gitSetup.GitExecutablePath;
+
+                setupDone.Should().BeTrue();
+                percent.Should().Be(1);
+
+                Logger.Trace("Expected GitExecutablePath: {0}", gitSetup.GitExecutablePath);
+                gitSetup.GitExecutablePath.FileExists().Should().BeTrue();
+
+                var gitLfsDestinationPath = gitSetup.GitInstallationPath;
+                gitLfsDestinationPath = gitLfsDestinationPath.Combine("mingw32");
+
+                gitLfsDestinationPath = gitLfsDestinationPath.Combine("libexec", "git-core", "git-lfs.exe");
+                gitLfsDestinationPath.FileExists().Should().BeTrue();
+
+                var calculateMd5 = NPath.FileSystem.CalculateFileMD5(gitLfsDestinationPath);
+                Assert.IsTrue(string.Compare(calculateMd5, GitInstaller.WindowsGitLfsExecutableMD5, true) == 0);
+
+                setupDone = await gitSetup.SetupIfNeeded(new Progress<float>(x => percent = x));
+                setupDone.Should().BeFalse();
+            }
+            else
+            {
+                environment.GitExecutablePath = "/usr/local/bin/git".ToNPath();
+                setupDone.Should().BeFalse();
+            }
+
+            var platform = new Platform(environment);
+            var gitEnvironment = platform.GitEnvironment;
+            var processManager = new ProcessManager(environment, gitEnvironment, TaskManager.Token);
+
+            List<GitBranch> gitBranches = null;
+            gitBranches = await processManager
+                .GetGitBranches(TestRepoMasterDirtyUnsynchronized, environment.GitExecutablePath)
+                .StartAsAsync();
+
+            gitBranches.Should().BeEquivalentTo(
+                new GitBranch("master", "origin/master: behind 1", true),
+                new GitBranch("feature/document", "origin/feature/document", false));
+        }
+
+
+        [Test]
+        public void VerifyWindowsGitLfsBundle()
+        {
+            var environmentPath = NPath.CreateTempDirectory("integration-test-environment");
+
+            var gitLfsPath = environmentPath.Combine("git-lfs.exe");
+            gitLfsPath.Exists().Should().BeFalse();
+
+            var inputZipFile = SolutionDirectory.Combine("PlatformResources", "windows", "git-lfs.zip");
+
+            var fastZip = new FastZip();
+            fastZip.ExtractZip(inputZipFile, environmentPath, null);
+
+            gitLfsPath.Exists().Should().BeTrue();
+
+            var calculateMd5 = NPath.FileSystem.CalculateFileMD5(gitLfsPath);
+            calculateMd5.ToLower().Should().Be(GitInstaller.WindowsGitLfsExecutableMD5.ToLower());
+        }
+
+
+        [Test]
+        public void VerifyMacGitLfsBundle()
+        {
+            var environmentPath = NPath.CreateTempDirectory("integration-test-environment");
+
+            var gitLfsPath = environmentPath.Combine("git-lfs");
+            gitLfsPath.Exists().Should().BeFalse();
+
+            var inputZipFile = SolutionDirectory.Combine("PlatformResources", "mac", "git-lfs.zip");
+
+            var fastZip = new FastZip();
+            fastZip.ExtractZip(inputZipFile, environmentPath, null);
+
+            gitLfsPath.Exists().Should().BeTrue();
+
+            var calculateMd5 = NPath.FileSystem.CalculateFileMD5(gitLfsPath);
+            calculateMd5.ToLower().Should().Be(GitInstaller.MacGitLfsExecutableMD5.ToLower());
+        }
+    }
+}

src/tests/IntegrationTests/Git/GitSetupTests.cs

@@ -83,7 +83,6 @@
     <Compile Include="Git\GitClientTests.cs" />
     <Compile Include="IntegrationTestEnvironment.cs" />
     <Compile Include="Installer\GitInstallerTests.cs" />
-    <Compile Include="Installer\ShortCircuitTaskTests.cs" />
     <Compile Include="ProcessManagerExtensions.cs" />
     <Compile Include="Process\ProcessManagerIntegrationTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

src/tests/IntegrationTests/Installer/ShortCircuitTaskTests.cs

@@ -14,7 +14,7 @@ public void Setup()
 
             Logging.LogAdapter = new MultipleLogAdapter(
                 new FileLogAdapter($"..\\{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}-integration-tests.log")
-                , new ConsoleLogAdapter()
+                //, new ConsoleLogAdapter()
             );
         }
     }

src/tests/IntegrationTests/IntegrationTests.csproj

@@ -19,13 +19,13 @@ public void UnzipTest()
             var cacheContainer = Substitute.For<ICacheContainer>();
             Environment = new IntegrationTestEnvironment(cacheContainer, TestBasePath, SolutionDirectory);
 
-            var archiveFilePath = AssemblyResources.ToFile(ResourceType.Platform, "git.zip", TestBasePath.Combine("gip_zip_extracted"), Environment);
+            var destinationPath = TestBasePath.Combine("git_zip").CreateDirectory();
+            var archiveFilePath = AssemblyResources.ToFile(ResourceType.Platform, "git.zip", destinationPath, Environment);
 
             Logger.Trace("ArchiveFilePath: {0}", archiveFilePath);
             Logger.Trace("TestBasePath: {0}", TestBasePath);
 
-            var extractedPath = TestBasePath.Combine("git_zip_extracted");
-            extractedPath.CreateDirectory();
+            var extractedPath = TestBasePath.Combine("git_zip_extracted").CreateDirectory();
 
             var zipProgress = 0;
             Logger.Trace("Pct Complete {0}%", zipProgress);