From 0271515f7f2519970ddedc2394d26044af8dba6c Mon Sep 17 00:00:00 2001
From: Reid Morrison <reidmo@gmail.com>
Date: Mon, 28 Aug 2023 15:58:45 -0400
Subject: [PATCH 1/4] Update tcr.yml

---
 .github/workflows/tcr.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tcr.yml b/.github/workflows/tcr.yml
index fb8244e..3a5e0a1 100644
--- a/.github/workflows/tcr.yml
+++ b/.github/workflows/tcr.yml
@@ -13,14 +13,10 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - "2.0.0"
-          - "2.1.9"
-          - "2.2.10"
-          - "2.3.7"
-          - "2.4.4"
-          - "2.5.1"
-          - "2.7.3"
-          - "3.0.1"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+          - "3.2"
 
     steps:
       - uses: actions/checkout@v2

From f99a4e4d414772e12eae75178ce641e0e533bc98 Mon Sep 17 00:00:00 2001
From: Reid Morrison <reidmo@gmail.com>
Date: Mon, 28 Aug 2023 16:09:05 -0400
Subject: [PATCH 2/4] Get tests passing

---
 .github/workflows/tcr.yml | 29 ++++++++---------------------
 .gitignore                |  1 +
 Gemfile                   |  8 ++++++--
 tcr.gemspec               |  6 ------
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/tcr.yml b/.github/workflows/tcr.yml
index 3a5e0a1..5805d81 100644
--- a/.github/workflows/tcr.yml
+++ b/.github/workflows/tcr.yml
@@ -7,37 +7,24 @@ on:
 
 jobs:
   test:
-    name: Test
+    name: "Test: Ruby ${{ matrix.ruby }}"
     runs-on: ubuntu-latest
-
     strategy:
+      fail-fast: false
       matrix:
         ruby:
           - "2.7"
           - "3.0"
           - "3.1"
-          - "3.2"
-
     steps:
       - uses: actions/checkout@v2
-
-      - name: Initial setup
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Install dependencies
-        run: bundle install
-
-      - name: Run tests
+          # runs 'bundle install' and caches installed gems automatically
+          bundler-cache: true
+      - name: Ruby Version
+        run: ruby --version
+      - name: Run Tests
         run: bundle exec rspec
-
-  testall:
-    if: ${{ always() }}
-    runs-on: ubuntu-latest
-    name: Test (matrix)
-    needs: [test]
-    steps:
-      - name: Check status of all test runs
-        if: ${{ needs.test.result != 'success' }}
-        run: exit 1
diff --git a/.gitignore b/.gitignore
index b639e8c..d91b913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 /.idea
+.tool-versions
diff --git a/Gemfile b/Gemfile
index d3d1a19..df4e9a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in tcr.gemspec
 gemspec
+
+gem "rspec"
+gem "mail"
+gem "net-ldap"
+gem "mime-types"
diff --git a/tcr.gemspec b/tcr.gemspec
index ceb2ae1..27a661d 100644
--- a/tcr.gemspec
+++ b/tcr.gemspec
@@ -16,10 +16,4 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "mail"
-  gem.add_development_dependency "net-ldap"
-  gem.add_development_dependency "mime-types", "~>2.0"
-  gem.add_development_dependency "geminabox"
 end

From 7fbd77cf816788d780bcf932f578372f6ad08681 Mon Sep 17 00:00:00 2001
From: Reid Morrison <reidmo@gmail.com>
Date: Mon, 28 Aug 2023 16:15:03 -0400
Subject: [PATCH 3/4] Cleanup

---
 .rvmrc   | 1 -
 Rakefile | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 .rvmrc

diff --git a/.rvmrc b/.rvmrc
deleted file mode 100644
index 77cc2fe..0000000
--- a/.rvmrc
+++ /dev/null
@@ -1 +0,0 @@
-rvm use 1.9.3@tcr --create
diff --git a/Rakefile b/Rakefile
index 27e09f4..d13b715 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,4 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new('spec')
+RSpec::Core::RakeTask.new("spec")
 task :default => :spec

From 4ae6efb9fb6d7f1fed484daab49667d762bc0799 Mon Sep 17 00:00:00 2001
From: Ben Olive <ben.olive@salesloft.com>
Date: Mon, 28 Aug 2023 18:00:33 -0400
Subject: [PATCH 4/4] Re-add testall stub

---
 .github/workflows/tcr.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/tcr.yml b/.github/workflows/tcr.yml
index 5805d81..361ccaa 100644
--- a/.github/workflows/tcr.yml
+++ b/.github/workflows/tcr.yml
@@ -28,3 +28,13 @@ jobs:
         run: ruby --version
       - name: Run Tests
         run: bundle exec rspec
+
+  testall:
+    if: ${{ always() }}
+    runs-on: ubuntu-latest
+    name: Test (matrix)
+    needs: [test]
+    steps:
+      - name: Check status of all test runs
+        if: ${{ needs.test.result != 'success' }}
+        run: exit 1