👷 Update test harness

Author: pboling

.idea/workspace.xml

@@ -79,10 +79,10 @@
     [394, 33, 2, "RSpec/BeEq: Prefer `be` over `eq`.", 5860785],
     [417, 33, 2, "RSpec/BeEq: Prefer `be` over `eq`.", 5860785]
   ],
-  "spec/support/integration_helpers.rb:2190510053": [
-    [50, 7, 6, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2771267058],
-    [122, 7, 11, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 3188878486],
-    [126, 7, 15, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 847829822]
+  "spec/support/integration_helpers.rb:1249500677": [
+    [45, 7, 6, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2771267058],
+    [117, 7, 11, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 3188878486],
+    [121, 7, 15, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 847829822]
   ],
   "spec/support/shared_contexts/instance_with_instance_methods.rb:664047042": [
     [65, 7, 58, "RSpec/ReceiveMessages: Use `receive_messages` instead of multiple stubs on lines [66].", 2575742549],

.rubocop_gradual.lock

@@ -20,10 +20,10 @@
 #    - Broken workflow indicates that a new contributor will have a bad time
 #
 appraise "unlocked_deps" do
-  gem "sequel", "~> 5.86", ">= 5.86.0"
-  gem "rom-sql", "~> 3.7"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
   eval_gemfile "modular/rails/r3/v8.1.gemfile"
+  eval_gemfile "modular/rom-sql/r3/v3.7.gemfile"
+  eval_gemfile "modular/sequel/r3/v5.86.gemfile"
   eval_gemfile "modular/coverage.gemfile"
   eval_gemfile "modular/documentation.gemfile"
   eval_gemfile "modular/style.gemfile"
@@ -58,6 +58,7 @@ appraise "dep-heads" do
   eval_gemfile "modular/rack/vHEAD.gemfile"
   eval_gemfile "modular/rails/vHEAD.gemfile"
   eval_gemfile "modular/roda/vHEAD.gemfile"
+  eval_gemfile "modular/sequel/vHEAD.gemfile"
   eval_gemfile "modular/sinatra/vHEAD.gemfile"
 end
 
@@ -421,6 +422,8 @@ appraise "mongoid-8.1-r3" do
   # eval_gemfile "modular/activerecord/r3/v7.1.gemfile" # favor the dependency on rails instead
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
   eval_gemfile "modular/rails/r3/v7.1.gemfile"
+  eval_gemfile "modular/rom-sql/r3/v3.7.gemfile"
+  eval_gemfile "modular/sequel/r3/v5.86.gemfile"
   eval_gemfile "modular/integration.gemfile"
   eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
 end
@@ -496,9 +499,9 @@ appraise "mongoid-9.0-r3" do
   gem "mongoid-rspec", "~> 4.2"
   eval_gemfile "modular/bson/r3/v5.1.gemfile"
 
+  eval_gemfile "modular/rack/r3/v3.2.gemfile"
   eval_gemfile "modular/rails/r3/v7.1.gemfile"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
-  eval_gemfile "modular/rack/r3/v3.2.gemfile"
   eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
   eval_gemfile "modular/integration.gemfile"
   gem "ostruct", "~> 0.6", ">= 0.6.1" # Ruby >= 2.5
@@ -553,7 +556,6 @@ end
 #   - Ruby 3.4
 #   - JRuby 10.0
 appraise "rom-r3" do
-  gem "rom-sql", "~> 3.7"
   eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
   eval_gemfile "modular/rack/r3/v3.2.gemfile"
@@ -565,43 +567,47 @@ end
 # Test Matrix:
 #   - Ruby 2.4
 appraise "sequel-5.86-r2.4" do
-  gem "sequel", "~> 5.86", ">= 5.86.0"
   eval_gemfile "modular/activerecord/r2.4/v5.2.gemfile"
   eval_gemfile "modular/omniauth/r2/v2.0.gemfile"
   eval_gemfile "modular/rack/r2/v1.6.gemfile"
+  eval_gemfile "modular/rom-sql/r3/v3.7.gemfile"
+  eval_gemfile "modular/sequel/r3/v5.86.gemfile"
   eval_gemfile "modular/x_std_libs/r2.4/libs.gemfile"
 end
 
 # Compatibility: Ruby >= 1.9.2
 # Test Matrix:
 #   - Ruby 2.5
 appraise "sequel-5.86-r2.5" do
-  gem "sequel", "~> 5.86", ">= 5.86.0"
   eval_gemfile "modular/activerecord/r2/v6.0.gemfile"
   eval_gemfile "modular/omniauth/r2/v2.1.gemfile"
   eval_gemfile "modular/rack/r2/v3.2.gemfile"
+  eval_gemfile "modular/rom-sql/r3/v3.7.gemfile"
+  eval_gemfile "modular/sequel/r3/v5.86.gemfile"
   eval_gemfile "modular/x_std_libs/r2.6/libs.gemfile"
 end
 
 # Compatibility: Ruby >= 1.9.2
 # Test Matrix:
 #   - Ruby 2.6
 appraise "sequel-5.86-r2.6" do
-  gem "sequel", "~> 5.86", ">= 5.86.0"
   eval_gemfile "modular/activerecord/r2/v6.1.gemfile"
   eval_gemfile "modular/omniauth/r2/v2.1.gemfile"
   eval_gemfile "modular/rack/r2/v3.2.gemfile"
+  eval_gemfile "modular/rom-sql/r3/v3.7.gemfile"
+  eval_gemfile "modular/sequel/r3/v5.86.gemfile"
   eval_gemfile "modular/x_std_libs/r2.6/libs.gemfile"
 end
 
 # Compatibility: Ruby >= 1.9.2
 # Test Matrix:
 #   - Ruby 2.7
 appraise "sequel-5.86-r2.7" do
-  gem "sequel", "~> 5.86", ">= 5.86.0"
   eval_gemfile "modular/activerecord/r2/v7.1.gemfile"
   eval_gemfile "modular/omniauth/r2/v2.1.gemfile"
   eval_gemfile "modular/rack/r2/v3.2.gemfile"
+  eval_gemfile "modular/rom-sql/r3/v3.7.gemfile"
+  eval_gemfile "modular/sequel/r3/v5.86.gemfile"
   eval_gemfile "modular/x_std_libs/r2/libs.gemfile"
 end
 
@@ -610,10 +616,11 @@ end
 #   - Ruby 3.0
 #   - Ruby 3.1
 appraise "sequel-5.86-r3.1" do
-  gem "sequel", "~> 5.86", ">= 5.86.0"
   eval_gemfile "modular/activerecord/r3/v7.1.gemfile"
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
   eval_gemfile "modular/rack/r3/v3.2.gemfile"
+  eval_gemfile "modular/rom-sql/r3/v3.7.gemfile"
+  eval_gemfile "modular/sequel/r3/v5.86.gemfile"
   eval_gemfile "modular/x_std_libs/r3.1/libs.gemfile"
 end
 
@@ -624,7 +631,6 @@ end
 #   - Ruby 3.4
 #   - JRuby 10.0
 appraise "sequel-5.86-r3" do
-  gem "sequel", "~> 5.86", ">= 5.86.0"
   # eval_gemfile "modular/activerecord/r3/v7.1.gemfile" # favor the dependency on rails instead
   eval_gemfile "modular/omniauth/r3/v2.1.gemfile"
   eval_gemfile "modular/rails/r3/v7.1.gemfile"
@@ -641,8 +647,6 @@ end
 # Only run coverage on the latest version of Ruby
 appraise "coverage" do
   gem "couch_potato", "~> 1.17"
-  gem "rom-sql", "~> 3.7"
-  gem "sequel", "~> 5.86", ">= 5.86.0"
   gem "mongoid", "~> 9.0", ">= 9.0.3"
   gem "mongoid-rspec", "~> 4.2"
   # eval_gemfile "modular/activerecord/r3/v8.0.gemfile" # favor the dependency on rails instead

Appraisals

@@ -38,9 +38,7 @@ gem "couch_potato", "~> 1.17", require: false
 gem "mongoid", ">= 7", require: false
 gem "mongoid-rspec", "~> 4.2", require: false
 gem "nobrainer", "~> 0.44", require: false
-gem "sequel", "~> 5.86", require: false
 gem "sqlite3", ">= 1", require: false
-gem "rom-sql", "~> 3.7", require: false
 
 ### Local dev tools
 # gem "growl"

Gemfile

@@ -3,8 +3,6 @@
 source "https://gem.coop"
 
 gem "couch_potato", "~> 1.17"
-gem "rom-sql", "~> 3.7"
-gem "sequel", "~> 5.86", ">= 5.86.0"
 gem "mongoid", "~> 9.0", ">= 9.0.3"
 gem "mongoid-rspec", "~> 4.2"
 gem "ostruct", "~> 0.6", ">= 0.6.1"

gemfiles/coverage.gemfile

@@ -16,4 +16,6 @@ eval_gemfile("modular/rails/vHEAD.gemfile")
 
 eval_gemfile("modular/roda/vHEAD.gemfile")
 
+eval_gemfile("modular/sequel/vHEAD.gemfile")
+
 eval_gemfile("modular/sinatra/vHEAD.gemfile")

gemfiles/dep_heads.gemfile

@@ -4,12 +4,15 @@
 # All marked as require: false to allow selective loading in tests
 # Rails not included because Rails integration tests run against
 #   whatever version the appraisal specifies; loaded by Combustion
+gem "sequel", "~> 5.86", ">= 5.86.0"
 
 eval_gemfile("combustion/r3/v1.5.gemfile")
 eval_gemfile("hanami/r3/v2.2.gemfile")
+eval_gemfile("rack/r3/v3.2.gemfile")
 eval_gemfile("roda/r3/v3.85.gemfile")
+eval_gemfile("rom-sql/r3/v3.7.gemfile")
+eval_gemfile("sequel/r3/v5.86.gemfile")
 eval_gemfile("sinatra/r3/v4.2.gemfile")
-eval_gemfile("rack/r3/v3.2.gemfile")
 
 # Testing utilities
 gem "rack-test", "~> 2.1"

gemfiles/modular/integration.gemfile

@@ -0,0 +1 @@
+gem "rom-sql", "~> 3.7", require: false

gemfiles/modular/rom-sql/r3/v3.7.gemfile

@@ -0,0 +1 @@
+gem "rom-sql", github: "rom-rb/rom-sql", branch: "main", require: false

gemfiles/modular/rom-sql/vHEAD.gemfile

@@ -0,0 +1 @@
+gem "sequel", "~> 5.86", ">= 5.86.0", require: false