fix(deps): support Rails 7 syntax (#29)

* fix(deps): support Rails 7 syntax * chore: update HumanEnum gem version to 1.1.0 * docs: 📝 document public methods * ci(deps): 👷 enable test matrix for multiple Rails versions * ci(deps): ⬆️ update actions/checkout to v4 * ci: 👷 run specs and upload test coverage in the same job With the new version matrix setup, multiple uploads to the same artifact could fail, even with `overwrite: true`.
rafasoares · May 24, 2024 · 400c625 · 400c625
1 parent dcbc2aa
commit 400c625
Show file tree

Hide file tree

Showing 20 changed files with 796 additions and 99 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,7 +21,7 @@ jobs:
     needs: tests
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: ruby/setup-ruby@v1
       with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,11 +13,20 @@ jobs:
     name: Run specs
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        ruby: ['3.0', '3.1', '3.2', '3.3']
+        rails: ['6.1', '7.0', '7.1']
+
+    env:
+      BUNDLE_LOCKFILE: rails-${{ matrix.rails }}
+
     steps:
     - uses: actions/checkout@v4
 
     - uses: ruby/setup-ruby@v1
       with:
+        ruby-version: ${{ matrix.ruby }}
         rubygems: latest
         bundler-cache: true
 
@@ -26,24 +35,26 @@ jobs:
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
       run: bin/rspec
 
-    - uses: actions/upload-artifact@v4
-      with:
-        name: code-coverage
-        path: coverage
-
   coverage:
     name: Report code coverage
     needs: test
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/download-artifact@v4
+    - uses: ruby/setup-ruby@v1
       with:
-        name: code-coverage
-        path: coverage
+        rubygems: latest
+        bundler-cache: true
 
     - uses: paambaati/codeclimate-action@v6
+      with:
+        coverageCommand: bin/rspec
       env:
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: code-coverage
+        path: coverage
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-3.2.4
+ruby-3.3.1
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "conventionalCommits.scopes": [
+    "deps"
+  ]
+}
diff --git a/Gemfile b/Gemfile
@@ -2,9 +2,29 @@
 
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in human_enum.gemspec
 gemspec
 
+plugin 'bundler-multilock', '~> 1.3'
+return unless Plugin.installed?('bundler-multilock')
+
+Plugin.send(:load_plugin, 'bundler-multilock')
+
+lockfile do
+  gem 'activerecord', '~> 7.1' # rubocop:disable Bundler/DuplicatedGem
+end
+
+lockfile 'rails-6.1' do
+  gem 'activerecord', '~> 6.1.0' # rubocop:disable Bundler/DuplicatedGem
+end
+
+lockfile 'rails-7.0' do
+  gem 'activerecord', '~> 7.0.0' # rubocop:disable Bundler/DuplicatedGem
+end
+
+lockfile 'rails-7.1' do
+  gem 'activerecord', '~> 7.1.0' # rubocop:disable Bundler/DuplicatedGem
+end
+
 gem 'rake', '~> 13.0'
 
 gem 'sqlite3', '~> 1.4'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,29 +1,37 @@
 PATH
   remote: .
   specs:
-    human_enum (1.0.0)
-      activerecord (>= 6.1, < 7)
+    human_enum (1.1.0)
+      activerecord (>= 6.1, < 8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.7.7)
-      activesupport (= 6.1.7.7)
-    activerecord (6.1.7.7)
-      activemodel (= 6.1.7.7)
-      activesupport (= 6.1.7.7)
-    activesupport (6.1.7.7)
+    activemodel (7.1.3.3)
+      activesupport (= 7.1.3.3)
+    activerecord (7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
+      timeout (>= 0.4.0)
+    activesupport (7.1.3.3)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     base64 (0.1.1)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     diff-lcs (1.5.1)
     docile (1.4.0)
+    drb (2.2.1)
     ffi (1.16.3)
     formatador (1.1.0)
     guard (2.18.1)
@@ -52,7 +60,8 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.10)
     method_source (1.1.0)
-    minitest (5.22.3)
+    minitest (5.23.1)
+    mutex_m (0.2.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -61,19 +70,20 @@ GEM
     parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
-    prism (0.27.0)
+    prism (0.29.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.3)
+    racc (1.8.0)
     rack (3.0.11)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
+    regexp_parser (2.9.2)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -108,7 +118,7 @@ GEM
     rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.24.1)
+    rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
@@ -122,9 +132,9 @@ GEM
       rubocop-rspec_rails (~> 2.28)
     rubocop-rspec_rails (2.28.3)
       rubocop (~> 1.40)
-    ruby-lsp (0.16.6)
+    ruby-lsp (0.16.7)
       language_server-protocol (~> 3.17.0)
-      prism (>= 0.23.0, < 0.28)
+      prism (>= 0.29.0, < 0.30)
       sorbet-runtime (>= 0.5.10782)
     ruby-lsp-rails (0.3.6)
       ruby-lsp (>= 0.16.5, < 0.17.0)
@@ -139,20 +149,30 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    sorbet-runtime (0.5.11371)
+    sorbet-runtime (0.5.11391)
+    sqlite3 (1.7.3-aarch64-linux)
+    sqlite3 (1.7.3-arm-linux)
+    sqlite3 (1.7.3-arm64-darwin)
+    sqlite3 (1.7.3-x86-linux)
     sqlite3 (1.7.3-x86_64-darwin)
     sqlite3 (1.7.3-x86_64-linux)
+    strscan (3.1.0)
     thor (1.3.1)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    zeitwerk (2.6.13)
 
 PLATFORMS
-  x86_64-darwin-22
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
+  activerecord (~> 7.1)
   guard (~> 2.18)
   guard-rspec (~> 4.7)
   guard-rubocop (~> 1.5)
@@ -170,4 +190,4 @@ DEPENDENCIES
   sqlite3 (~> 1.4)
 
 BUNDLED WITH
-   2.4.19
+   2.5.10