schema_dev 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec4c4b34d4c065f5027f7b4edf76af56b328d10194ba6e4b6ec13d6b0ffdc4bf
-  data.tar.gz: dc39ed695a1fa9df914cbaa0aa4163d4bade79237e80ab306238bee5605755d2
+  metadata.gz: 50cc2bddf7346d81775cd66fdec8d2dfff9755110a28808c1b344c884e9804d0
+  data.tar.gz: e0df8587750447828fd2fddf9ed634b878dfb4b3c2422bef056936ddd74abd2f
 SHA512:
-  metadata.gz: af15e3126328563021a8662d2a0c9180f6978a6095de9471ac2627bfbb0cf64ba47773f48f3c3c4fe21f1871511b0c249c83a9f87801651b1fef7fd367647bf3
-  data.tar.gz: 4f2d82816b77a658f41d5afb34f8f9f4401a58a739f1b1fc05ddc1a3b5d8ef304613363f30a2d3ed14da17cf15fb991d5febf5bb5c3ae4b0ad28cc568977058c
+  metadata.gz: 883156b6f5408b599766606a33cfca654b7406d5e61f02694fc5629d3481eb8f2a08c2a3be4d59bf520cf85f213368234f68d3c1a5f2594bf66bbd5869526a76
+  data.tar.gz: fc0712880c7aff4f22814ba109abdbddf052897b1d769aff604d8bb5d2708e1b75f89fbe00f7a4280943dbcaa2de387b213d4698a05a2e1269fc6607d4736fa7

data/.github/workflows/prs.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 
 concurrency:
-  group: ${{ github.head_ref }}
+  group: "ci-${{ github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -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'

data/.gitignore

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

data/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

data/README.md

@@ -136,6 +136,8 @@ Which defines the rake task `create_databases` and also a task for github action
 
 Release notes for schema_dev versions:
 
+* **4.2.0** - Add AR 7.0, and Ruby 3.1 support. Also add more shared rspec filters
+* **4.1.1** - Fix github actions generated files for concurrency detection
 * **4.1.0** - Switch to GitHub actions instead of travis CI
 * **4.0.0** - Drop support for AR < 5.2 and add AR 6.0 and 6.1
 * **3.13.1** - Adjust travis.yml generation to work with mysql again

data/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"

data/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"

data/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"

data/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"

data/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

data/lib/schema_dev/config.rb

@@ -17,7 +17,11 @@ module SchemaDev
     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 @@ module SchemaDev
       @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?

data/lib/schema_dev/github_actions.rb

@@ -27,7 +27,7 @@ module SchemaDev
         pull_request: nil,
       },
       concurrency: {
-        group:                '${{ github.head_ref }}',
+        group:                'ci-${{ github.ref }}',
         'cancel-in-progress': true,
       }
     }.freeze

data/lib/schema_dev/rspec/db.rb

@@ -14,12 +14,30 @@ module SchemaDev
         connect
         RSpec.configure do |config|
           config.include Helpers
-          config.filter_run_excluding postgresql: :only unless Helpers.postgresql?
-          config.filter_run_excluding postgresql: :skip if Helpers.postgresql?
+          config.filter_run_excluding postgresql: -> (v) {
+            if Helpers.postgresql?
+              case v
+              when String
+                version = ActiveRecord::Base.connection.select_value("SHOW server_version").match(/(\d+\.\d+)/)[1]
+                postgresql_version = Gem::Version.new(version)
+                test = Gem::Requirement.new(v)
+                !test.satisfied_by?(postgresql_version)
+              else
+                v == :skip
+              end
+            else
+              v == :only
+            end
+          }
           config.filter_run_excluding mysql: :only unless Helpers.mysql?
           config.filter_run_excluding mysql: :skip if Helpers.mysql?
           config.filter_run_excluding sqlite3: :only unless Helpers.sqlite3?
           config.filter_run_excluding sqlite3: :skip if Helpers.sqlite3?
+          config.filter_run_excluding rails: -> (v) {
+            rails_version = Gem::Version.new(ActiveRecord::VERSION::STRING)
+            test = Gem::Requirement.new(v)
+            !test.satisfied_by?(rails_version)
+          }
         end
       end
 

data/lib/schema_dev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SchemaDev
-  VERSION = '4.1.0'
+  VERSION = '4.2.0'
 end

data/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'

data/spec/schema_dev/config_spec.rb

@@ -57,4 +57,17 @@ describe SchemaDev::Config do
       { ruby: '2.1.5', activerecord: '4.1', db: 'postgresql' },
     ]
   end
+
+  it 'excludes variations that are not possible' do
+    config = get_config(ruby: %w[2.6 2.7 3.0], activerecord: %w[5.2 6.0 7.0], db: %w[sqlite3])
+    expect(config.matrix).to contain_exactly(
+      { ruby: '2.6', activerecord: '5.2', db: 'sqlite3' },
+      { ruby: '2.6', activerecord: '6.0', db: 'sqlite3' },
+      { ruby: '2.7', activerecord: '5.2', db: 'sqlite3' },
+      { ruby: '2.7', activerecord: '6.0', db: 'sqlite3' },
+      { ruby: '2.7', activerecord: '7.0', db: 'sqlite3' },
+      { ruby: '3.0', activerecord: '6.0', db: 'sqlite3' },
+      { ruby: '3.0', activerecord: '7.0', db: 'sqlite3' },
+    )
+  end
 end

data/spec/schema_dev/github_actions_spec.rb

@@ -31,7 +31,7 @@ describe SchemaDev::GithubActions do
             - master
           pull_request:
         concurrency:
-          group: "${{ github.head_ref }}"
+          group: ci-${{ github.ref }}
           cancel-in-progress: true
         jobs:
           test:
@@ -99,7 +99,7 @@ describe SchemaDev::GithubActions do
             - master
           pull_request:
         concurrency:
-          group: "${{ github.head_ref }}"
+          group: ci-${{ github.ref }}
           cancel-in-progress: true
         jobs:
           test:
@@ -152,6 +152,78 @@ describe SchemaDev::GithubActions do
     end
   end
 
+  context 'when AR 7.0 is included with Ruby < 2.7' do
+    let(:config) do
+      {
+        ruby: [2.5, 2.7],
+        activerecord: [6.0, 7.0],
+        db: %w[sqlite3]
+      }
+    end
+
+    it 'automatically excludes Ruby < 2.7 for AR 7.0' do
+      is_expected.to eq described_class::HEADER + <<~YAML
+        ---
+        name: CI PR Builds
+        'on':
+          push:
+            branches:
+            - master
+          pull_request:
+        concurrency:
+          group: ci-${{ github.ref }}
+          cancel-in-progress: true
+        jobs:
+          test:
+            runs-on: ubuntu-latest
+            strategy:
+              fail-fast: false
+              matrix:
+                ruby:
+                - '2.5'
+                - '2.7'
+                activerecord:
+                - '6.0'
+                - '7.0'
+                db:
+                - sqlite3
+                exclude:
+                - ruby: '2.5'
+                  activerecord: '7.0'
+            env:
+              BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
+            steps:
+            - uses: actions/checkout@v2
+            - name: Set up Ruby
+              uses: ruby/setup-ruby@v1
+              with:
+                ruby-version: "${{ matrix.ruby }}"
+                bundler-cache: true
+            - name: Run bundle update
+              run: bundle update
+            - name: Run tests
+              run: bundle exec rake spec
+            - name: Coveralls Parallel
+              if: "${{ !env.ACT }}"
+              uses: coverallsapp/github-action@master
+              with:
+                github-token: "${{ secrets.GITHUB_TOKEN }}"
+                flag-name: run-${{ matrix.ruby }}-${{ matrix.activerecord }}-${{ matrix.db }}-${{ matrix.dbversion }}
+                parallel: true
+          finish:
+            needs: test
+            runs-on: ubuntu-latest
+            steps:
+            - name: Coveralls Finished
+              if: "${{ !env.ACT }}"
+              uses: coverallsapp/github-action@master
+              with:
+                github-token: "${{ secrets.GITHUB_TOKEN }}"
+                parallel-finished: true
+      YAML
+    end
+  end
+
   context 'when notify is passed' do
     let(:config) do
       {
@@ -180,7 +252,7 @@ describe SchemaDev::GithubActions do
             - master
           pull_request:
         concurrency:
-          group: "${{ github.head_ref }}"
+          group: ci-${{ github.ref }}
           cancel-in-progress: true
         jobs:
           test:
@@ -247,7 +319,7 @@ describe SchemaDev::GithubActions do
             - master
           pull_request:
         concurrency:
-          group: "${{ github.head_ref }}"
+          group: ci-${{ github.ref }}
           cancel-in-progress: true
         jobs:
           test:
@@ -360,7 +432,7 @@ describe SchemaDev::GithubActions do
             - master
           pull_request:
         concurrency:
-          group: "${{ github.head_ref }}"
+          group: ci-${{ github.ref }}
           cancel-in-progress: true
         jobs:
           test:
@@ -459,7 +531,7 @@ describe SchemaDev::GithubActions do
             - master
           pull_request:
         concurrency:
-          group: "${{ github.head_ref }}"
+          group: ci-${{ github.ref }}
           cancel-in-progress: true
         jobs:
           test:
@@ -582,7 +654,7 @@ describe SchemaDev::GithubActions do
             - master
           pull_request:
         concurrency:
-          group: "${{ github.head_ref }}"
+          group: ci-${{ github.ref }}
           cancel-in-progress: true
         jobs:
           test:
@@ -699,7 +771,7 @@ describe SchemaDev::GithubActions do
             - master
           pull_request:
         concurrency:
-          group: "${{ github.head_ref }}"
+          group: ci-${{ github.ref }}
           cancel-in-progress: true
         jobs:
           test:

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start unless SimpleCov.running
 
 require 'rspec/given'
 require 'tempfile'

data/templates/gem/spec/spec_helper.rb.erb

@@ -1,6 +1,6 @@
 require 'simplecov'
 require 'simplecov-gem-profile'
-SimpleCov.start "gem"
+SimpleCov.start unless SimpleCov.running
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/templates/gemfiles/activerecord-7.0/Gemfile.base.erb

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

data/templates/gemfiles/activerecord-7.0/Gemfile.mysql2.erb

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/templates/gemfiles/activerecord-7.0/Gemfile.postgresql.erb

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/templates/gemfiles/activerecord-7.0/Gemfile.sqlite3.erb

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_dev
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-13 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,11 @@ files:
 - README.md
 - Rakefile
 - bin/schema_dev
+- gemfiles/Gemfile.activesupport-5.2
+- gemfiles/Gemfile.activesupport-6.0
+- gemfiles/Gemfile.activesupport-6.1
+- gemfiles/Gemfile.activesupport-7.0
+- gemfiles/Gemfile.base
 - lib/schema_dev.rb
 - lib/schema_dev/config.rb
 - lib/schema_dev/executor.rb
@@ -248,6 +253,10 @@ files:
 - templates/gemfiles/activerecord-6.1/Gemfile.mysql2.erb
 - templates/gemfiles/activerecord-6.1/Gemfile.postgresql.erb
 - templates/gemfiles/activerecord-6.1/Gemfile.sqlite3.erb
+- templates/gemfiles/activerecord-7.0/Gemfile.base.erb
+- templates/gemfiles/activerecord-7.0/Gemfile.mysql2.erb
+- templates/gemfiles/activerecord-7.0/Gemfile.postgresql.erb
+- templates/gemfiles/activerecord-7.0/Gemfile.sqlite3.erb
 homepage: https://github.com/SchemaPlus/schema_dev
 licenses:
 - MIT