Add ruby 3.1 and activesupport 7.0 support

Author: urkle

.github/workflows/prs.yml

@@ -16,14 +16,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0']
+        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        activesupport: ['5.2', '6.0', '6.1', '7.0']
+        exclude:
+          - ruby: '2.5'
+            activesupport: '7.0'
+          - ruby: '2.6'
+            activesupport: '7.0'
+          - ruby: '3.0'
+            activesupport: '5.2'
+          - ruby: '3.1'
+            activesupport: '5.2'
+    env:
+      BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/Gemfile.activesupport-${{ matrix.activesupport }}"
     steps:
       - uses: actions/checkout@v2
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby-version }}
+          ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
 
       - name: 'Run bundle update'
@@ -36,7 +48,7 @@ jobs:
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          flag-name: run-${{ matrix.ruby-version }}
+          flag-name: run-${{ matrix.ruby }}-${{ matrix.activesupport }}
           parallel: true
   finish:
     needs: 'test'

.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/gemfiles/*.lock
 /_yardoc/
 /coverage/
 /doc/

Gemfile

@@ -5,4 +5,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in schema_dev.gemspec
 gemspec
 
-gem 'byebug'
+gemfile_local = File.expand_path '../Gemfile.local', __FILE__
+eval File.read(gemfile_local), binding, gemfile_local if File.exist? gemfile_local

gemfiles/Gemfile.activesupport-5.2

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 5.2.0.beta0", "< 5.3"

gemfiles/Gemfile.activesupport-6.0

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.0", "< 6.1"

gemfiles/Gemfile.activesupport-6.1

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.1", "< 6.2"

gemfiles/Gemfile.activesupport-7.0

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 7.0", "< 7.1"

gemfiles/Gemfile.base

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec path: File.expand_path('..', __FILE__)
+
+File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

lib/schema_dev/config.rb

@@ -17,7 +17,11 @@ def self._reset
     end
 
     def self.read
-      new(**YAML.safe_load(Pathname.new(CONFIG_FILE).read, [Symbol]).symbolize_keys)
+      if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('3.1')
+        new(**YAML.safe_load(Pathname.new(CONFIG_FILE).read, permitted_classes: [Symbol], symbolize_names: true))
+      else
+        new(**YAML.safe_load(Pathname.new(CONFIG_FILE).read, [Symbol], symbolize_names: true))
+      end
     end
 
     def self.load
@@ -30,11 +34,21 @@ def initialize(ruby:, activerecord:, db:, dbversions: nil, exclude: nil, notify:
       @db = Array.wrap(db)
       @dbversions = (dbversions || {}).symbolize_keys
       @exclude = Array.wrap(exclude).map(&:symbolize_keys).map { |tuple| Tuple.new(**tuple.transform_values(&:to_s)) }
-      if @activerecord.include?('5.2')
-        ruby3 = ::Gem::Version.new('3.0')
+      @activerecord.each do |ar_version|
+        ar_check = ::Gem::Version.new(ar_version)
+
+        if ar_check < ::Gem::Version.new('6.0')
+          ruby3 = ::Gem::Version.new('3.0')
+
+          @ruby.select { |e| ::Gem::Version.new(e) >= ruby3 }.each do |v|
+            @exclude << Tuple.new(ruby: v, activerecord: ar_version)
+          end
+        elsif ar_check >= ::Gem::Version.new('7.0')
+          ruby27 = ::Gem::Version.new('2.7')
 
-        @ruby.select { |e| ::Gem::Version.new(e) >= ruby3 }.each do |v|
-          @exclude << Tuple.new(ruby: v, activerecord: '5.2')
+          @ruby.select { |e| ::Gem::Version.new(e) < ruby27 }.each do |v|
+            @exclude << Tuple.new(ruby: v, activerecord: ar_version)
+          end
         end
       end
       unless notify.nil?

schema_dev.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.5.0'
 
-  gem.add_dependency 'activesupport', '>= 5.2', '< 6.2'
+  gem.add_dependency 'activesupport', '>= 5.2', '< 7.1'
   gem.add_dependency 'faraday', '~> 1.0'
   gem.add_dependency 'simplecov'
   gem.add_dependency 'simplecov-lcov', '~> 0.8.0'