Release/v3.1.3

.envrc

@@ -19,8 +19,8 @@ export K_SOUP_COV_DO=true # Means you want code coverage
 # Available formats are html, xml, rcov, lcov, json, tty
 export K_SOUP_COV_COMMAND_NAME="RSpec Coverage"
 export K_SOUP_COV_FORMATTERS="html,tty"
-export K_SOUP_COV_MIN_BRANCH=80 # Means you want to enforce X% branch coverage
-export K_SOUP_COV_MIN_LINE=91 # Means you want to enforce X% line coverage
+export K_SOUP_COV_MIN_BRANCH=76 # Means you want to enforce X% branch coverage
+export K_SOUP_COV_MIN_LINE=90 # Means you want to enforce X% line coverage
 export K_SOUP_COV_MIN_HARD=true # Means you want the build to fail if the coverage thresholds are not met
 export K_SOUP_COV_MULTI_FORMATTERS=true
 export MAX_ROWS=1 # Setting for simplecov-console gem for tty output, limits to the worst N rows of bad coverage

.github/disabled/truffle.yml

@@ -26,7 +26,7 @@
 #
 #jobs:
 #  test:
-#    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal }}${{ matrix.name_extra || '' }}
+#    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
 #    if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
 #    runs-on: ubuntu-22.04
 #    continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -38,23 +38,23 @@
 #          # NOTE: truffleruby does not support upgrading rubygems.
 #          # truffleruby-22.3 (targets Ruby 3.0 compatibility)
 #          - ruby: "truffleruby-22.3"
-#            appraisal: "couch-1.17"
+#            appraisal_name: "couch-1.17"
 #            exec_cmd: "rake spec:orm:couch_potato"
 #            gemfile: "Appraisal.root"
 #            rubygems: default
 #            bundler: default
 #
 #          # truffleruby-23.0 (targets Ruby 3.1 compatibility)
 #          - ruby: "truffleruby-23.0"
-#            appraisal: "couch-1.17"
+#            appraisal_name: "couch-1.17"
 #            exec_cmd: "rake spec:orm:couch_potato"
 #            gemfile: "Appraisal.root"
 #            rubygems: default
 #            bundler: default
 #
 #          # truffleruby-23.1 (targets Ruby 3.2 compatibility)
 #          - ruby: "truffleruby-23.1"
-#            appraisal: "couch-1.17"
+#            appraisal_name: "couch-1.17"
 #            exec_cmd: "rake spec:orm:couch_potato"
 #            gemfile: "Appraisal.root"
 #            rubygems: default
@@ -91,7 +91,7 @@
 #      # NOTE: This does not use the main Gemfile at all.
 #      - name: Install Root Appraisal
 #        run: bundle
-#      - name: Appraisal for ${{ matrix.appraisal }}
-#        run: bundle exec appraisal ${{ matrix.appraisal }} bundle
+#      - name: Appraisal for ${{ matrix.appraisal_name }}
+#        run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle
 #      - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
-#        run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
+#        run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle exec ${{ matrix.exec_cmd }}

.github/workflows/ancient-svc-adapters.yml

@@ -0,0 +1,110 @@
+name: MRI 2.4, 2.5 (Ancient) Svc Adapters
+
+permissions:
+  contents: read
+
+env:
+  K_SOUP_COV_DO: false
+
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - '!*' # Do not execute on tags
+  pull_request:
+    branches:
+      - '*'
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+# Cancels all previous workflow runs for the same branch that have not yet completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name.
+  group: "${{ github.workflow }}-${{ github.ref }}"
+  cancel-in-progress: true
+
+jobs:
+  test:
+    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
+    if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
+    runs-on: ubuntu-22.04
+    continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
+    env: # $BUNDLE_GEMFILE must be set at job level, so it is set for all steps
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}.gemfile
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # Ruby 2.4
+          - ruby: "2.4"
+            appraisal_name: "couch-1.17-r2.4"
+            exec_cmd: "rake spec:orm:couch_potato"
+            gemfile: "Appraisal.root"
+            rubygems: "3.3.27"
+            bundler: "2.3.27"
+
+          - ruby: "2.4"
+            appraisal_name: "mongoid-7.3-b4.12"
+            exec_cmd: "rake spec:orm:mongoid"
+            gemfile: "Appraisal.root"
+            rubygems: "3.3.27"
+            bundler: "2.3.27"
+
+          # Ruby 2.5
+          - ruby: "2.5"
+            appraisal_name: "couch-1.17-r2.5"
+            exec_cmd: "rake spec:orm:couch_potato"
+            gemfile: "Appraisal.root"
+            rubygems: "3.3.27"
+            bundler: "2.3.27"
+
+          - ruby: "2.5"
+            appraisal_name: "mongoid-7.4-b4.15"
+            exec_cmd: "rake spec:orm:mongoid"
+            gemfile: "Appraisal.root"
+            rubygems: "3.3.27"
+            bundler: "2.3.27"
+
+    steps:
+      ### COUCHDB
+      - name: Start CouchDB
+        uses: iamssen/couchdb-github-action@master
+        if: "endsWith(matrix.exec_cmd, 'couch_potato')"
+        with:
+          couchdb-version: "3.4.1"
+
+      ### MONGODB
+      - name: Start MongoDB
+        uses: supercharge/[email protected]
+        if: "endsWith(matrix.exec_cmd, 'mongoid')"
+        with:
+          mongodb-version: "8.0"
+
+      ### SMOKE-TEST
+      - name: Smoke CouchDB
+        if: "endsWith(matrix.exec_cmd, 'couch_potato')"
+        run: |
+          curl -f http://127.0.0.1:5984/
+          curl -X POST -H "Content-Type: application/json; charset=utf-8" -d '{"name": "admin", "password": "password"}' http://127.0.0.1:5984/_session
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Ruby & RubyGems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          rubygems: ${{ matrix.rubygems }}
+          bundler: ${{ matrix.bundler }}
+          bundler-cache: false
+
+      # Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e. Appraisal.root)
+      # We need to do this first to get appraisal installed.
+      # NOTE: This does not use the main Gemfile at all.
+      - name: Install Root Appraisal
+        run: bundle
+      - name: Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
+        run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle
+      - name: Run ${{ matrix.exec_cmd }} on ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
+        run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle exec ${{ matrix.exec_cmd }}

.github/workflows/ancient.yml

@@ -1,4 +1,10 @@
-name: MRI 2.4, 2.5 (EOL)
+name: MRI 2.4, 2.5 (Ancient)
+
+permissions:
+  contents: read
+
+env:
+  K_SOUP_COV_DO: false
 
 on:
   push:
@@ -20,7 +26,7 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal }}${{ matrix.name_extra || '' }}
+    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
     if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
     runs-on: ubuntu-22.04
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -30,65 +36,41 @@ jobs:
       fail-fast: false
       matrix:
         include:
-#          # Ruby 2.4
-#          - ruby: "2.4"
-#            appraisal: "ar-5-2"
-#            exec_cmd: "rake spec:orm:active_record"
-#            gemfile: "Appraisal.root"
-#            rubygems: "3.3.27"
-#            bundler: "2.3.27"
-#          - ruby: "2.4"
-#            appraisal: "couch-1.17"
-#            exec_cmd: "rake spec:orm:couch_potato"
-#            gemfile: "Appraisal.root"
-#            rubygems: "3.3.27"
-#            bundler: "2.3.27"
-#          - ruby: "2.4"
-#            appraisal: "mongoid-7.3"
-#            exec_cmd: "rake spec:orm:mongoid"
-#            gemfile: "Appraisal.root"
-#            rubygems: "3.3.27"
-#            bundler: "2.3.27"
-#          - ruby: "2.4"
-#            appraisal: "sequel-5.86"
-#            exec_cmd: "rake spec:orm:sequel"
-#            gemfile: "Appraisal.root"
-#            rubygems: "3.3.27"
-#            bundler: "2.3.27"
-
-          # Ruby 2.5
-          - ruby: "2.5"
-            appraisal: "ar-5-2"
+          # Ruby 2.4
+          - ruby: "2.4"
+            appraisal_name: "ar-5-2-r2.4"
             exec_cmd: "rake spec:orm:active_record"
             gemfile: "Appraisal.root"
             rubygems: "3.3.27"
             bundler: "2.3.27"
-          - ruby: "2.5"
-            appraisal: "ar-6-0"
-            exec_cmd: "rake spec:orm:active_record"
+          - ruby: "2.4"
+            appraisal_name: "sequel-5.86-r2.4"
+            exec_cmd: "rake spec:orm:sequel"
             gemfile: "Appraisal.root"
             rubygems: "3.3.27"
             bundler: "2.3.27"
+
+          # Ruby 2.5
           - ruby: "2.5"
-            appraisal: "ar-6-1"
+            appraisal_name: "ar-5-2-r2"
             exec_cmd: "rake spec:orm:active_record"
             gemfile: "Appraisal.root"
             rubygems: "3.3.27"
             bundler: "2.3.27"
           - ruby: "2.5"
-            appraisal: "couch-1.17"
-            exec_cmd: "rake spec:orm:couch_potato"
+            appraisal_name: "ar-6-0"
+            exec_cmd: "rake spec:orm:active_record"
             gemfile: "Appraisal.root"
             rubygems: "3.3.27"
             bundler: "2.3.27"
           - ruby: "2.5"
-            appraisal: "mongoid-7.4"
-            exec_cmd: "rake spec:orm:mongoid"
+            appraisal_name: "ar-6-1-r2"
+            exec_cmd: "rake spec:orm:active_record"
             gemfile: "Appraisal.root"
             rubygems: "3.3.27"
             bundler: "2.3.27"
           - ruby: "2.5"
-            appraisal: "sequel-5.86"
+            appraisal_name: "sequel-5.86-r2.5"
             exec_cmd: "rake spec:orm:sequel"
             gemfile: "Appraisal.root"
             rubygems: "3.3.27"
@@ -132,7 +114,7 @@ jobs:
       # NOTE: This does not use the main Gemfile at all.
       - name: Install Root Appraisal
         run: bundle
-      - name: Appraisal for ${{ matrix.appraisal }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} bundle
-      - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
+      - name: Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
+        run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle
+      - name: Run ${{ matrix.exec_cmd }} on ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
+        run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle exec ${{ matrix.exec_cmd }}

.github/workflows/coverage.yml

@@ -1,10 +1,15 @@
 name: Test Coverage
 
+permissions:
+  contents: read
+  pull-requests: write
+  id-token: write
+
 env:
-  K_SOUP_COV_MIN_BRANCH: 79
-  K_SOUP_COV_MIN_LINE: 92
+  K_SOUP_COV_MIN_BRANCH: 76
+  K_SOUP_COV_MIN_LINE: 90
   K_SOUP_COV_MIN_HARD: true
-  K_SOUP_COV_FORMATTERS: "html,rcov,lcov,json,tty"
+  K_SOUP_COV_FORMATTERS: "html,xml,rcov,lcov,json,tty"
   K_SOUP_COV_DO: true
   K_SOUP_COV_MULTI_FORMATTERS: true
   K_SOUP_COV_COMMAND_NAME: "RSpec Coverage"
@@ -21,9 +26,6 @@ on:
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
-permissions:
-  contents: read
-
 # Cancels all previous workflow runs for the same branch that have not yet completed.
 concurrency:
   # The concurrency group contains the workflow name and the branch name.
@@ -44,7 +46,7 @@ jobs:
         include:
           # Coverage
           - ruby: "ruby"
-            appraisal: "coverage"
+            appraisal_name: "coverage"
             exec_cmd: "rake spec:orm:all"
             gemfile: "Appraisal.root"
             rubygems: latest
@@ -82,14 +84,38 @@ jobs:
 
       # Raw `bundle` will use the BUNDLE_GEMFILE set to matrix.gemfile (i.e. Appraisal.root)
       # We need to do this first to get appraisal installed.
-      # NOTE: This does not use the main Gemfile at all.
+      # NOTE: This does not use the primary Gemfile at all.
       - name: Install Root Appraisal
         run: bundle
-      - name: Appraisal for ${{ matrix.appraisal }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} bundle
-      - name: Tests for ${{ matrix.ruby }}@current via ${{ matrix.exec_cmd }}
-        run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}
+      - name: Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
+        run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle
+      - name: Run ${{ matrix.exec_cmd }} on ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
+        run: bundle exec appraisal ${{ matrix.appraisal_name }} bundle exec ${{ matrix.exec_cmd }}
 
+      # Do SaaS coverage uploads first
+      - name: Upload coverage to Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+        continue-on-error: ${{ matrix.experimental != 'false' }}
+
+      - name: Upload coverage to QLTY
+        uses: qltysh/qlty-action/coverage@main
+        with:
+          token: ${{secrets.QLTY_COVERAGE_TOKEN}}
+          files: coverage/.resultset.json
+        continue-on-error: ${{ matrix.experimental != 'false' }}
+
+      # Build will fail here if coverage upload fails
+      #   which will hopefully be noticed for the lack of code coverage comments
+      - name: Upload coverage to CodeCov
+        uses: codecov/codecov-action@v5
+        with:
+          use_oidc: true
+          fail_ci_if_error: true # optional (default = false)
+          verbose: true # optional (default = false)
+
+      # Then PR comments
       - name: Code Coverage Summary Report
         uses: irongut/[email protected]
         if: ${{ github.event_name == 'pull_request' }}
@@ -102,7 +128,7 @@ jobs:
           hide_complexity: true
           indicators: true
           output: both
-          thresholds: '100 100'
+          thresholds: '90 76'
         continue-on-error: ${{ matrix.experimental != 'false' }}
 
       - name: Add Coverage PR Comment
@@ -112,16 +138,3 @@ jobs:
           recreate: true
           path: code-coverage-results.md
         continue-on-error: ${{ matrix.experimental != 'false' }}
-
-      - name: Upload coverage to Coveralls
-        uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-        continue-on-error: ${{ matrix.experimental != 'false' }}
-
-      - name: Upload coverage to CodeCov
-        uses: codecov/codecov-action@v5
-        with:
-          fail_ci_if_error: true # optional (default = false)
-          token: ${{ secrets.CODECOV_TOKEN }}
-          verbose: true # optional (default = false)