Experiments with wrapping git CLI command with CliWrap

Freshli.Test/Acceptance.cs

@@ -1,11 +1,8 @@
 using System;
 using ApprovalTests;
-using ApprovalTests.Reporters;
-using ApprovalTests.Reporters.TestFrameworks;
 using Xunit;
 
 namespace Freshli.Test {
-  [UseReporter(typeof(XUnit2Reporter))]
   public class Acceptance {
 
     private DateTime _testingBoundary =

Freshli.Test/ApprovalTestsConfig.cs

@@ -0,0 +1,4 @@
+using ApprovalTests.Reporters;
+using Freshli.Test;
+
+[assembly: UseReporter(typeof(FreshliApprovalsReporter))]

Freshli.Test/FreshliApprovalsReporter.cs

@@ -0,0 +1,14 @@
+using ApprovalTests.Reporters;
+using ApprovalTests.Reporters.TestFrameworks;
+
+namespace Freshli.Test {
+  class FreshliApprovalsReporter : FirstWorkingReporter {
+    public FreshliApprovalsReporter() : base(
+      RiderReporter.INSTANCE,
+      BeyondCompareReporter.INSTANCE,
+      VisualStudioReporter.INSTANCE,
+      XUnit2Reporter.INSTANCE,
+      DiffReporter.INSTANCE
+    ) { }
+  }
+}

Freshli.Test/Integration/GitCliRepositoryTest.CloneValidRepo.approved.txt

@@ -0,0 +1,28 @@
+files[0] = /.git/config
+files[1] = /.git/description
+files[2] = /.git/HEAD
+files[3] = /.git/hooks/applypatch-msg.sample
+files[4] = /.git/hooks/commit-msg.sample
+files[5] = /.git/hooks/fsmonitor-watchman.sample
+files[6] = /.git/hooks/post-update.sample
+files[7] = /.git/hooks/pre-applypatch.sample
+files[8] = /.git/hooks/pre-commit.sample
+files[9] = /.git/hooks/pre-merge-commit.sample
+files[10] = /.git/hooks/pre-push.sample
+files[11] = /.git/hooks/pre-rebase.sample
+files[12] = /.git/hooks/pre-receive.sample
+files[13] = /.git/hooks/prepare-commit-msg.sample
+files[14] = /.git/hooks/push-to-checkout.sample
+files[15] = /.git/hooks/update.sample
+files[16] = /.git/index
+files[17] = /.git/info/exclude
+files[18] = /.git/logs/HEAD
+files[19] = /.git/logs/refs/heads/master
+files[20] = /.git/logs/refs/remotes/origin/HEAD
+files[21] = /.git/objects/pack/pack-e4a774ac9dbfc86d77f95bc8244ac029df16663d.idx
+files[22] = /.git/objects/pack/pack-e4a774ac9dbfc86d77f95bc8244ac029df16663d.pack
+files[23] = /.git/packed-refs
+files[24] = /.git/refs/heads/master
+files[25] = /.git/refs/remotes/origin/HEAD
+files[26] = /Gemfile
+files[27] = /Gemfile.lock

Freshli.Test/Integration/GitCliRepositoryTest.FileContentsForShaForRubyGemfile.approved.txt

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem 'nokogiri', '1.8.1'
+

Freshli.Test/Integration/GitCliRepositoryTest.FileContentsForShaForRubyGemfileDotLock.approved.txt

@@ -0,0 +1,15 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    mini_portile2 (2.1.0)
+    nokogiri (1.7.0)
+      mini_portile2 (~> 2.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  nokogiri (= 1.7.0)
+
+BUNDLED WITH
+   2.1.3

Freshli.Test/Integration/GitCliRepositoryTest.LogEntriesFor.approved.txt

@@ -0,0 +1,3 @@
+Gemfile[0] = [1/1/2019 8:00:46 AM, 017031627f36deb582d69cddd381718be0044b02]
+Gemfile[1] = [1/1/2018 8:00:59 AM, 902a3082740f83776eec419c59a56e54424fdec5]
+Gemfile[2] = [1/1/2017 8:01:29 AM, 13963f09081c175c66d20f7dd15d23fedc789ce4]

Freshli.Test/Integration/GitCliRepositoryTest.LogEntriesForRubyGemfile.approved.txt

@@ -0,0 +1,3 @@
+2017-01-01 00:01:29Z => 13963f09081c175c66d20f7dd15d23fedc789ce4
+2018-01-01 00:00:59Z => 902a3082740f83776eec419c59a56e54424fdec5
+2019-01-01 00:00:46Z => 017031627f36deb582d69cddd381718be0044b02

Freshli.Test/Integration/GitCliRepositoryTest.LogEntriesForRubyGemfileDotLock.approved.txt

@@ -0,0 +1,3 @@
+2017-01-01 00:01:29Z => 13963f09081c175c66d20f7dd15d23fedc789ce4
+2018-01-01 00:00:59Z => 902a3082740f83776eec419c59a56e54424fdec5
+2019-01-01 00:00:46Z => 017031627f36deb582d69cddd381718be0044b02

Freshli.Test/Integration/GitCliRepositoryTest.cs

@@ -0,0 +1,112 @@
+using System.IO;
+using System.Linq;
+using ApprovalTests;
+using Xunit;
+
+namespace Freshli.Test.Integration {
+  public class GitCliRepositoryTest {
+    [Fact]
+    public void IsValidReturnsTrue() {
+      var fixturePath = Fixtures.Path("ruby", "nokotest");
+      Assert.True(GitCliRepository.IsValid(fixturePath));
+    }
+
+    [Fact]
+    public void IsValidReturnsFalse() {
+      var fixturePath = Fixtures.Path("empty");
+      Assert.False(GitCliRepository.IsValid(fixturePath));
+    }
+
+    [Fact]
+    public void IsCloneableReturnsTrue() {
+      var path = "https://github.com/corgibytes/freshli-fixture-ruby-nokotest";
+      Assert.True(GitCliRepository.IsCloneable(path));
+    }
+
+    [Fact]
+    public void IsCloneableReturnsFalse() {
+      var path = "invalid";
+      Assert.False(GitCliRepository.IsCloneable(path));
+    }
+
+    private void ForceDelete(string path) {
+      var directory = new DirectoryInfo(path);
+      directory.DeleteReadOnly();
+    }
+
+    [Fact]
+    public void CloneValidRepo() {
+      var repoUrl =
+        "https://github.com/corgibytes/freshli-fixture-ruby-nokotest";
+      var targetDir = Path.Combine(Path.GetTempPath(), "clone-valid-repo");
+
+      if (Directory.Exists(targetDir)) {
+        ForceDelete(targetDir);
+      }
+
+      GitCliRepository.Clone(repoUrl, targetDir);
+      var files = Directory.GetFiles(
+        targetDir,
+        "*",
+        new EnumerationOptions() {
+          AttributesToSkip = 0,
+          RecurseSubdirectories = true
+        }
+      );
+      Approvals.VerifyAll(
+        files.Select(f =>
+          f.Replace(targetDir, "").Replace("\\", "/")).OrderBy(f => f),
+        "files"
+      );
+      ForceDelete(targetDir);
+    }
+
+    [Fact]
+    public void LogEntriesForRubyGemfile() {
+      var fixturePath = Fixtures.Path("ruby", "nokotest");
+      var repository = new GitCliRepository(fixturePath);
+
+      Approvals.VerifyAll(
+        repository.LogEntriesFor("Gemfile"),
+        (date, sha) => $"{date.ToString("u")} => {sha}"
+      );
+    }
+
+    [Fact]
+    public void LogEntriesForRubyGemfileDotLock() {
+      var fixturePath = Fixtures.Path("ruby", "nokotest");
+      var repository = new GitCliRepository(fixturePath);
+
+      Approvals.VerifyAll(
+        repository.LogEntriesFor("Gemfile.lock"),
+        (date, sha) => $"{date.ToString("u")} => {sha}"
+      );
+    }
+
+    [Fact]
+    public void FileContentsForShaForRubyGemfile() {
+      var fixturePath = Fixtures.Path("ruby", "nokotest");
+      var repository = new GitCliRepository(fixturePath);
+
+      Approvals.Verify(
+        repository.FileContentsFromSha(
+          "Gemfile",
+          "902a3082740f83776eec419c59a56e54424fdec5"
+        )
+      );
+    }
+
+    [Fact]
+    public void FileContentsForShaForRubyGemfileDotLock() {
+      var fixturePath = Fixtures.Path("ruby", "nokotest");
+      var repository = new GitCliRepository(fixturePath);
+
+      Approvals.Verify(
+        repository.FileContentsFromSha(
+          "Gemfile.lock",
+          "13963f09081c175c66d20f7dd15d23fedc789ce4"
+        )
+      );
+    }
+  }
+}

Freshli.Test/Unit/Ruby/RubyGemsVersionInfoTest.cs

@@ -12,42 +12,67 @@ public RubyGemsVersionInfoTest(ITestOutputHelper testOutputHelper) {
     }
 
     [Theory]
-    [InlineData("1", new[] { "1" }, false)]
-    [InlineData("3.6.0", new[] { "3", "6", "0" }, false)]
-    [InlineData("1.2", new[] { "1", "2" }, false)]
-    [InlineData("1.2.3", new[] { "1", "2", "3" }, false)]
-    [InlineData("1.2.3.4", new[] { "1", "2", "3", "4" }, false)]
-    [InlineData("1.2.3.4.5", new[] { "1", "2", "3", "4", "5" }, false)]
-    [InlineData("1.2.3.4.5.6", new[] { "1", "2", "3", "4", "5", "6" }, false)]
-    [InlineData("1.5.6.rc1", new[] { "1", "5", "6", "rc", "1" }, true)]
-    [InlineData("1.5.6.rc2", new[] { "1", "5", "6", "rc", "2" }, true)]
-    [InlineData("1.5.6.rc22", new[] { "1", "5", "6", "rc", "22" }, true)]
-    [InlineData("1.5.6.rc22alpha",
-      new[] { "1", "5", "6", "rc", "22", "alpha" }, true)]
-    [InlineData("1.5.6.rc22alpha1",
-      new[] { "1", "5", "6", "rc", "22", "alpha", "1" }, true)]
-    [InlineData("1.5.6.1alpha", new[] { "1", "5", "6", "1", "alpha" }, true)]
+    [InlineData("0.9",  new[] { "0", "9" }, false, false, null)]
+    [InlineData("1", new[] { "1" }, false, false, null)]
+    [InlineData("1-x86-linux", new[] { "1" }, false, true, "x86-linux")]
+    [InlineData("1.0.a.2", new[] { "1", "0", "a", "2" }, true, false, null)]
+    [InlineData("1.0.b1", new[] { "1", "0", "b", "1" }, true, false, null)]
+    [InlineData("1.0.b10", new[] { "1", "0", "b", "10" }, true, false, null)]
+    [InlineData("1.0009",  new[] { "1", "0009" }, false, false, null)]
+    [InlineData("1.0045",  new[] { "1", "0045" }, false, false, null)]
+    [InlineData("1.2", new[] { "1", "2" }, false, false, null)]
+    [InlineData("1.2-x86-linux", new[] { "1", "2" }, false, true, "x86-linux")]
+    [InlineData("1.2.3", new[] { "1", "2", "3" }, false, false, null)]
+    [InlineData("1.2.3-x86-linux",
+      new[] { "1", "2", "3" }, false, true, "x86-linux")]
+    [InlineData("1.2.3.4", new[] { "1", "2", "3", "4" }, false, false, null)]
+    [InlineData("1.2.3.4-x86-linux",
+      new[] { "1", "2", "3", "4" }, false, true, "x86-linux")]
+    [InlineData("1.2.3.4.5",
+      new[] { "1", "2", "3", "4", "5" }, false, false, null)]
+    [InlineData("1.2.3.4.5-x86-linux",
+      new[] { "1", "2", "3", "4", "5" }, false, true, "x86-linux")]
+    [InlineData("1.2.3.4.5.6",
+      new[] { "1", "2", "3", "4", "5", "6" }, false, false, null)]
+    [InlineData("1.2.3.4.5.6-x86-linux",
+      new[] { "1", "2", "3", "4", "5", "6" }, false, true, "x86-linux")]
+    [InlineData("1.2.3a1",
+      new[] { "1", "2", "3", "a", "1" }, true, false, null)]
     [InlineData("1.5.6.123alpha",
-      new[] { "1", "5", "6", "123", "alpha" }, true)]
+      new[] { "1", "5", "6", "123", "alpha" }, true, false, null)]
     [InlineData("1.5.6.123alpha123",
-      new[] { "1", "5", "6", "123", "alpha", "123" }, true)]
-    [InlineData("1.0.b1", new[] { "1", "0", "b", "1" }, true)]
-    [InlineData("1.0.b10", new[] { "1", "0", "b", "10" }, true)]
-    [InlineData("1.0.a.2", new[] { "1", "0", "a", "2" }, true)]
-    [InlineData("0.9",  new[] { "0", "9" }, false)]
-    [InlineData("1.2.3a1",  new[] { "1", "2", "3", "a", "1" }, true)]
-    [InlineData("1.0045",  new[] { "1", "0045" }, false)]
-    [InlineData("1.0009",  new[] { "1", "0009" }, false)]
-    [InlineData("20110131120940",  new[] { "20110131120940" }, false)]
-    [InlineData("2.20110131120940",  new[] { "2", "20110131120940" }, false)]
+      new[] { "1", "5", "6", "123", "alpha", "123" }, true, false, null)]
+    [InlineData("1.5.6.1alpha",
+      new[] { "1", "5", "6", "1", "alpha" }, true, false, null)]
+    [InlineData("1.5.6.rc1",
+      new[] { "1", "5", "6", "rc", "1" }, true, false, null)]
+    [InlineData("1.5.6.rc1-x86-linux",
+      new[] { "1", "5", "6", "rc", "1" }, true, true, "x86-linux")]
+    [InlineData("1.5.6.rc2",
+      new[] { "1", "5", "6", "rc", "2" }, true, false, null)]
+    [InlineData("1.5.6.rc22",
+      new[] { "1", "5", "6", "rc", "22" }, true, false, null)]
+    [InlineData("1.5.6.rc22alpha",
+      new[] { "1", "5", "6", "rc", "22", "alpha" }, true, false, null)]
+    [InlineData("1.5.6.rc22alpha1",
+      new[] { "1", "5", "6", "rc", "22", "alpha", "1" }, true, false, null)]
     [InlineData("2.0.20110131120940",
-      new[] { "2", "0", "20110131120940" }, false)]
-    [InlineData("2.0.8.beta.20110131120940",  new[] { "2", "0", "8", "beta",
-      "20110131120940" }, true)]
+      new[] { "2", "0", "20110131120940" }, false, false, null)]
+    [InlineData("2.0.8.beta.20110131120940",
+      new[] { "2", "0", "8", "beta", "20110131120940" }, true, false, null)]
+    [InlineData("2.20110131120940",
+      new[] { "2", "20110131120940" }, false, false, null)]
+    [InlineData("20110131120940",
+      new[] { "20110131120940" }, false, false, null)]
+    [InlineData("3.6.0", new[] { "3", "6", "0" }, false, false, null)]
+    [InlineData("3.6.0-x86-linux",
+      new[] { "3", "6", "0" }, false, true, "x86-linux")]
     public void VersionIsParsedIntoParts(
       string version,
       string[] versionParts,
-      bool isPreRelease
+      bool isPreRelease,
+      bool isPlatformSpecific,
+      string platformSpecifier
     ) {
       var info = new RubyGemsVersionInfo() {Version = version};
 
@@ -57,6 +82,8 @@ bool isPreRelease
 
       Assert.Equal(versionParts, info.VersionParts);
       Assert.Equal(isPreRelease, info.IsPreRelease);
+      Assert.Equal(isPlatformSpecific, info.IsPlatformSpecific);
+      Assert.Equal(platformSpecifier, info.PlatformSpecifier);
     }
 
     [Theory]

Freshli/Freshli.csproj

@@ -8,6 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="CliWrap" Version="3.3.0" />
       <PackageReference Include="DotNetEnv" Version="2.0.0" />
       <PackageReference Include="Elasticsearch.Net" Version="7.11.1" />
       <PackageReference Include="HtmlAgilityPack" Version="1.11.30" />