Restore core and ORM CI task split

pboling · pboling · commit 4bf5bd92340d · 2026-06-03T10:19:13.000-06:00
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -48,7 +48,7 @@ jobs:
           # Coverage
           - ruby: "ruby"
             appraisal: "coverage"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: latest
             bundler: latest
 
diff --git a/.github/workflows/current.yml b/.github/workflows/current.yml
@@ -39,7 +39,7 @@ jobs:
           # Ruby 4.0
           - ruby: "ruby"
             appraisal: "current"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: latest
             bundler: latest
 
diff --git a/.github/workflows/dep-heads.yml b/.github/workflows/dep-heads.yml
@@ -42,21 +42,21 @@ jobs:
           # Ruby 3.4
           - ruby: "ruby"
             appraisal: "dep-heads"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: latest
             bundler: latest
 
           # truffleruby-24.1 (targets Ruby 3.3 compatibility)
           - ruby: "truffleruby"
             appraisal: "dep-heads"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
           # jruby-10.0 (targets Ruby 3.4 compatibility)
           - ruby: "jruby"
             appraisal: "dep-heads"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
             experimental: true
diff --git a/.github/workflows/heads.yml b/.github/workflows/heads.yml
@@ -41,21 +41,21 @@ jobs:
           # ruby-head
           - ruby: "ruby-head"
             appraisal: "head"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
           # truffleruby-head
           - ruby: "truffleruby-head"
             appraisal: "head"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
           # jruby-head
           - ruby: "jruby-head"
             appraisal: "head"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
diff --git a/.github/workflows/jruby-9.2.yml b/.github/workflows/jruby-9.2.yml
@@ -39,7 +39,7 @@ jobs:
           # jruby-9.2 (targets Ruby 2.5 compatibility)
           - ruby: "jruby-9.2"
             appraisal: "ruby-2-5"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
diff --git a/.github/workflows/jruby-9.3.yml b/.github/workflows/jruby-9.3.yml
@@ -39,7 +39,7 @@ jobs:
           # jruby-9.3 (targets Ruby 2.6 compatibility)
           - ruby: "jruby-9.3"
             appraisal: "ruby-2-6"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: "3.4.22"
             bundler: "2.4.22"
 
diff --git a/.github/workflows/jruby-9.4.yml b/.github/workflows/jruby-9.4.yml
@@ -39,7 +39,7 @@ jobs:
           # jruby-9.4 (targets Ruby 3.1 compatibility)
           - ruby: "jruby-9.4"
             appraisal: "ruby-3-1"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: "3.6.9"
             bundler: "2.6.9"
 
diff --git a/.github/workflows/jruby.yml b/.github/workflows/jruby.yml
@@ -39,7 +39,7 @@ jobs:
           # jruby-10.0 (targets Ruby 3.4 compatibility)
           - ruby: "jruby"
             appraisal: "current"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
             experimental: true
diff --git a/.github/workflows/ruby-2.4.yml b/.github/workflows/ruby-2.4.yml
@@ -36,7 +36,7 @@ jobs:
           # Ruby 2.4
           - ruby: "ruby-2.4"
             appraisal: "ruby-2-4"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: "3.3.27"
             bundler: "2.3.27"
 
diff --git a/.github/workflows/ruby-2.5.yml b/.github/workflows/ruby-2.5.yml
@@ -36,7 +36,7 @@ jobs:
           # Ruby 2.5
           - ruby: "ruby-2.5"
             appraisal: "ruby-2-5"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: "3.3.27"
             bundler: "2.3.27"
 
diff --git a/.github/workflows/ruby-2.6.yml b/.github/workflows/ruby-2.6.yml
@@ -36,7 +36,7 @@ jobs:
           # Ruby 2.6
           - ruby: "ruby-2.6"
             appraisal: "ruby-2-6"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: '3.4.22'
             bundler: '2.4.22'
 
diff --git a/.github/workflows/ruby-2.7.yml b/.github/workflows/ruby-2.7.yml
@@ -36,7 +36,7 @@ jobs:
           # Ruby 2.7
           - ruby: "ruby-2.7"
             appraisal: "ruby-2-7"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: '3.4.22'
             bundler: '2.4.22'
 
diff --git a/.github/workflows/ruby-3.0.yml b/.github/workflows/ruby-3.0.yml
@@ -39,7 +39,7 @@ jobs:
           # Ruby 3.0
           - ruby: "ruby-3.0"
             appraisal: "ruby-3-0"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: '3.5.23'
             bundler: '2.5.23'
 
diff --git a/.github/workflows/ruby-3.1.yml b/.github/workflows/ruby-3.1.yml
@@ -39,7 +39,7 @@ jobs:
           # Ruby 3.1
           - ruby: "ruby-3.1"
             appraisal: "ruby-3-1"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: '3.6.9'
             bundler: '2.6.9'
 
diff --git a/.github/workflows/ruby-3.2.yml b/.github/workflows/ruby-3.2.yml
@@ -36,7 +36,7 @@ jobs:
           # Ruby 3.2
           - ruby: "ruby-3.2"
             appraisal: "ruby-3-2"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: latest
             bundler: latest
 
diff --git a/.github/workflows/ruby-3.3.yml b/.github/workflows/ruby-3.3.yml
@@ -36,7 +36,7 @@ jobs:
           # Ruby 3.3
           - ruby: "ruby-3.3"
             appraisal: "ruby-3-3"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: latest
             bundler: latest
 
diff --git a/.github/workflows/ruby-3.4.yml b/.github/workflows/ruby-3.4.yml
@@ -36,7 +36,7 @@ jobs:
           # Ruby 3.4
           - ruby: "ruby-3.4"
             appraisal: "ruby-3-4"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: latest
             bundler: latest
 
diff --git a/.github/workflows/truffle.yml b/.github/workflows/truffle.yml
@@ -40,7 +40,7 @@ jobs:
           # truffleruby-33.0 (targets Ruby 3.3 compatibility)
           - ruby: "truffleruby"
             appraisal: "current"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
diff --git a/.github/workflows/truffleruby-22.3.yml b/.github/workflows/truffleruby-22.3.yml
@@ -40,7 +40,7 @@ jobs:
           # truffleruby-22.3 (targets Ruby 3.0 compatibility)
           - ruby: "truffleruby-22.3"
             appraisal: "ruby-3-0"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
diff --git a/.github/workflows/truffleruby-23.0.yml b/.github/workflows/truffleruby-23.0.yml
@@ -40,7 +40,7 @@ jobs:
           # truffleruby-23.0 (targets Ruby 3.0 compatibility)
           - ruby: "truffleruby-23.0"
             appraisal: "ruby-3-0"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
diff --git a/.github/workflows/truffleruby-23.1.yml b/.github/workflows/truffleruby-23.1.yml
@@ -40,7 +40,7 @@ jobs:
           # truffleruby-23.1 (targets Ruby 3.2 compatibility)
           - ruby: "truffleruby-23.1"
             appraisal: "ruby-3-2"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
diff --git a/.github/workflows/truffleruby-24.2.yml b/.github/workflows/truffleruby-24.2.yml
@@ -40,7 +40,7 @@ jobs:
           # truffleruby-24.2 (targets Ruby 3.3 compatibility)
           - ruby: "truffleruby-24.2"
             appraisal: "ruby-3-3"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
diff --git a/.github/workflows/truffleruby-25.0.yml b/.github/workflows/truffleruby-25.0.yml
@@ -40,7 +40,7 @@ jobs:
           # truffleruby-25.0 (targets Ruby 3.3 compatibility)
           - ruby: "truffleruby-25.0"
             appraisal: "ruby-3-3"
-            exec_cmd: "kettle-test"
+            exec_cmd: "rake spec:core"
             rubygems: default
             bundler: default
 
diff --git a/Appraisals b/Appraisals
@@ -92,6 +92,7 @@ end
 
 appraise "ruby-3-2" do
   eval_gemfile "modular/x_std_libs/r3/libs.gemfile"
+  gem "json", "< 2.19"
 end
 
 appraise "ruby-3-3" do
diff --git a/Rakefile b/Rakefile
@@ -165,3 +165,51 @@ rescue LoadError
     warn("NOTE: stone_checksums isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
   end
 end
+
+begin
+  require "rspec/core/rake_task"
+
+  %w[test spec spec:core spec:orm:active_record spec:orm:couch_potato spec:orm:mongoid spec:orm:rom spec:orm:sequel spec:orm:nobrainer spec:orm:all].each do |task_name|
+    Rake::Task[task_name].clear if Rake::Task.task_defined?(task_name)
+  end
+
+  model_specs = FileList["spec/omniauth/identity/models/*_spec.rb"]
+  core_specs = FileList["spec/**/*_spec.rb"] - model_specs
+  orm_specs = {
+    active_record: "spec/omniauth/identity/models/active_record_spec.rb",
+    couch_potato: "spec/omniauth/identity/models/couch_potato_module_spec.rb",
+    mongoid: "spec/omniauth/identity/models/mongoid_spec.rb",
+    rom: "spec/omniauth/identity/models/rom_spec.rb",
+    sequel: "spec/omniauth/identity/models/sequel_spec.rb",
+    nobrainer: "spec/omniauth/identity/models/no_brainer_spec.rb",
+  }
+
+  RSpec::Core::RakeTask.new("test") do |task|
+    task.pattern = core_specs
+  end
+
+  namespace :spec do
+    RSpec::Core::RakeTask.new("core") do |task|
+      task.pattern = core_specs
+    end
+
+    namespace :orm do
+      orm_specs.each do |orm, spec_file|
+        RSpec::Core::RakeTask.new(orm) do |task|
+          task.pattern = core_specs + [spec_file]
+        end
+      end
+
+      RSpec::Core::RakeTask.new("all") do |task|
+        task.pattern = FileList["spec/**/*_spec.rb"]
+      end
+    end
+  end
+
+  task(default: :test)
+rescue LoadError
+  desc("spec task stub")
+  task(:spec) do
+    warn("NOTE: rspec isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
+  end
+end
