Support rails.7.2 & update CI to run on Ruby 3 x Rails 6 & 7 (#2)

mohammed-io · swiknaba · web-flow · commit 8b854c23dd9f · 2024-10-11T20:57:18.000+02:00
* Support Rails 7.2 * Bumped ruby version requirement to 3.0.0 * Rubocop Ruby target as well * remove redundant sort * Update Rakefile * Update test/rails_test.rb * chore: update CI to run on Ruby 3 x Rails 6 & 7 (#3) * chore: add appraisal * update CI to run on ruby/rails matrix * continue on error * no need for dark magic rails test? * Fixed rubocop * don't use deprecated OpenStruct * exclude ruby head / rails 6.1 --------- Co-authored-by: Lud <lud@reinmiedl.com>
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,15 +7,29 @@ on:
   pull_request:
 
 jobs:
-  rspec:
+  tests:
+    name: "RSpec @ Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}"
     runs-on: ubuntu-latest
+    continue-on-error: true
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
     strategy:
       matrix:
         ruby:
-          - "3.0.7"
-          - "3.1.5"
+          - "3.1"
+          - "3.3"
+          - "head"
+        rails:
+          - "6.1"
+          - "7.1"
+          - "7.2"
+        exclude:
+            - ruby: "3.3"
+              rails: "6.1"
+            - ruby: "head"
+              rails: "6.1"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -24,15 +38,20 @@ jobs:
     - name: Run rspec
       run: bundle exec rake test
 
-  rubocop:
+  linters:
+    name: "Rubocop @ Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}"
     runs-on: ubuntu-latest
+    continue-on-error: true
+    env:
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
     strategy:
       matrix:
         ruby:
-          - "3.0.7"
-          - "3.1.5"
+          - "head"
+        rails:
+          - "7.2"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@
 /tmp/
 Gemfile.lock
 *.gem
+.ruby-version
+gemfiles/*.lock
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,6 +1,6 @@
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
 
 Style/ClassAndModuleChildren:
   Exclude:
@@ -23,10 +23,6 @@ Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 Style/AccessorGrouping:
   EnforcedStyle: separated
-Style/OpenStructUse:
-  Exclude:
-    - test/*_test.rb
-    - test/**/*_test.rb
 
 Layout/LineLength:
   Exclude:
diff --git a/Appraisals b/Appraisals
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+SUPPORTED_RAILS_VERSIONS = %w[
+  6.1
+  7.1
+  7.2
+].freeze
+
+SUPPORTED_RAILS_VERSIONS.each do |version|
+  appraise "rails-#{version}" do
+    gem 'rails', "~> #{version}"
+  end
+end
diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in diffcrypt.gemspec
 gemspec
 
+gem 'appraisal'
 gem 'minitest', '~> 5.0'
 gem 'minitest-reporters', '~> 1.6.0'
 gem 'rake', '~> 13.2'
diff --git a/Rakefile b/Rakefile
@@ -11,4 +11,4 @@ end
 task default: :test
 
 path = File.expand_path(__dir__)
-Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").sort.each { |f| load f }
+Dir.glob("#{path}/lib/diffcrypt/tasks/**/*.rake").each { load(_1) }
diff --git a/diffcrypt.gemspec b/diffcrypt.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Diffable encrypted configuration files that can be safely committed into a git repository'
   spec.homepage      = 'https://github.com/diffcrypt/diffcrypt-ruby'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables = %w[diffcrypt]
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.2'
+  spec.add_runtime_dependency 'activesupport', '>= 6.0', '< 7.3'
   spec.add_runtime_dependency 'thor', '>= 0.20', '< 2'
   spec.metadata['rubygems_mfa_required'] = 'true'
 end
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'appraisal'
+gem 'minitest', '~> 5.0'
+gem 'minitest-reporters', '~> 1.6.0'
+gem 'rails', '~> 6.1'
+gem 'rake', '~> 13.2'
+gem 'rubocop', '~> 1.25.1'
+gem 'simplecov', '~> 0.22.0', require: false
+gem 'simplecov-lcov', '< 0.9'
+
+gemspec path: '../'
diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'appraisal'
+gem 'minitest', '~> 5.0'
+gem 'minitest-reporters', '~> 1.6.0'
+gem 'rails', '~> 7.1'
+gem 'rake', '~> 13.2'
+gem 'rubocop', '~> 1.25.1'
+gem 'simplecov', '~> 0.22.0', require: false
+gem 'simplecov-lcov', '< 0.9'
+
+gemspec path: '../'
diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'appraisal'
+gem 'minitest', '~> 5.0'
+gem 'minitest-reporters', '~> 1.6.0'
+gem 'rails', '~> 7.2'
+gem 'rake', '~> 13.2'
+gem 'rubocop', '~> 1.25.1'
+gem 'simplecov', '~> 0.22.0', require: false
+gem 'simplecov-lcov', '< 0.9'
+
+gemspec path: '../'
diff --git a/test/diffcrypt/rails/application_helper_test.rb b/test/diffcrypt/rails/application_helper_test.rb
@@ -7,10 +7,10 @@
 class MockApplication
   include Diffcrypt::Rails::ApplicationHelper
 
+  Config = Struct.new(:require_master_key)
+
   def config
-    OpenStruct.new(
-      require_master_key: true,
-    )
+    Config.new(true)
   end
 end
 
diff --git a/test/rails_test.rb b/test/rails_test.rb
