Merge branch 'master' into block-reload-config

Author: pkuczynski

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       COVERAGE_RUBY_VERSION: 2.6
-      BUNDLE_PATH: vendor/bundle
+      BUNDLE_PATH: ${{ github.workspace }}/vendor/bundle
     strategy:
       fail-fast: false
       matrix:
@@ -23,7 +23,8 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
-          - jruby
+          - 3.4
+          - jruby-9
           - truffleruby
     steps:
       - name: Checkout
@@ -42,10 +43,6 @@ jobs:
           restore-keys: |
             ruby-${{ matrix.ruby }}-gems-
 
-      - name: Prepare environment
-        run: |
-          sudo apt-get -y install libsqlite3-dev libxslt1-dev
-
       - name: Install
         run: |
           bundle install
@@ -61,3 +58,11 @@ jobs:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         with:
           coverageCommand: bundle exec appraisal rspec
+
+  all-passed:
+    runs-on: ubuntu-latest
+    if: always()
+    needs:
+      - test
+    steps:
+      - run: exit ${{ contains(needs.*.result, 'failure') && 1 || 0 }}

Appraisals

@@ -21,7 +21,9 @@ end
 appraise 'rails-6.1' do
   gem 'activerecord-jdbcsqlite3-adapter', '~> 61.1', platform: :jruby
   gem 'bootsnap', '>= 1.4.4'
-  gem 'rails', '6.1.7.6'
+  gem 'drb', '~> 2.2' if RUBY_VERSION >= '3.4'
+  gem 'mutex_m', '~> 0.2.0' if RUBY_VERSION >= '3.4'
+  gem 'rails', '6.1.7.10'
   gem 'rspec-rails', '~> 5.0'
   gem 'sqlite3', '~> 1.4', platform: :ruby
   gem 'psych', '>= 4'
@@ -35,7 +37,9 @@ if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.7'
     gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1', platform: :jruby
     gem 'sqlite3', '~> 1.6.4', platform: :ruby
     gem 'bootsnap', '>= 1.4.4'
-    gem 'rails', '7.0.8'
+    gem 'drb', '~> 2.2' if RUBY_VERSION >= '3.4'
+    gem 'mutex_m', '~> 0.2.0' if RUBY_VERSION >= '3.4'
+    gem 'rails', '7.0.8.7'
     gem 'rspec-rails', '~> 6.0.3'
     gem 'sprockets-rails', '~> 3.4.2'
     gem 'psych', '>= 4'
@@ -45,7 +49,7 @@ if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.7'
     gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1', platform: :jruby
     gem 'sqlite3', '~> 1.6.6', platform: :ruby
     gem 'bootsnap', '>= 1.16.0'
-    gem 'rails', '7.1.0'
+    gem 'rails', '7.1.5.1'
     gem 'rspec-rails', '~> 6.0.3'
     gem 'sprockets-rails', '~> 3.4.2'
     gem 'psych', '>= 4'

config.gemspec

@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
   s.add_dependency 'ostruct'
 
-  s.add_development_dependency 'dry-validation', *Config::DryValidationRequirements::VERSIONS
   s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
 
   # Testing
   s.add_development_dependency 'appraisal', '~> 2.5', '>= 2.5.0'
+  s.add_development_dependency 'dry-validation', *Config::DryValidationRequirements::VERSIONS
   s.add_development_dependency 'rspec', '~> 3.9', '>= 3.9.0'
 
   # Default RSpec run will test against latest Rails app

gemfiles/rails_6.1.gemfile

@@ -4,7 +4,9 @@ source "https://rubygems.org"
 
 gem "activerecord-jdbcsqlite3-adapter", "~> 61.1", platform: :jruby
 gem "bootsnap", ">= 1.4.4"
-gem "rails", "6.1.7.6"
+gem "drb", "~> 2.2"
+gem "mutex_m", "~> 0.2.0"
+gem "rails", "6.1.7.10"
 gem "rspec-rails", "~> 5.0"
 gem "sqlite3", "~> 1.4", platform: :ruby
 gem "psych", ">= 4"

gemfiles/rails_7.0.gemfile

@@ -5,7 +5,9 @@ source "https://rubygems.org"
 gem "activerecord-jdbcsqlite3-adapter", "~> 70.1", platform: :jruby
 gem "sqlite3", "~> 1.6.4", platform: :ruby
 gem "bootsnap", ">= 1.4.4"
-gem "rails", "7.0.8"
+gem "drb", "~> 2.2"
+gem "mutex_m", "~> 0.2.0"
+gem "rails", "7.0.8.7"
 gem "rspec-rails", "~> 6.0.3"
 gem "sprockets-rails", "~> 3.4.2"
 gem "psych", ">= 4"

gemfiles/rails_7.1.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "activerecord-jdbcsqlite3-adapter", "~> 70.1", platform: :jruby
 gem "sqlite3", "~> 1.6.6", platform: :ruby
 gem "bootsnap", ">= 1.16.0"
-gem "rails", "7.1.0"
+gem "rails", "7.1.5.1"
 gem "rspec-rails", "~> 6.0.3"
 gem "sprockets-rails", "~> 3.4.2"
 gem "psych", ">= 4"

lib/config/dry_validation_requirements.rb

@@ -14,9 +14,7 @@ def self.load_dry_validation!
           raise LoadError
         end
       rescue LoadError
-        raise ::Config::Error, 'Could not find a dry-validation version' \
-          ' matching requirements' \
-          " (#{VERSIONS.map(&:inspect) * ','})"
+        raise ::Config::Error, "Could not find a dry-validation version matching requirements (#{VERSIONS.map(&:inspect) * ','})"
       end
 
       require 'dry/validation'

spec/app/rails_5.2/Gemfile

@@ -5,7 +5,7 @@ gem 'rails', '~> 5.2.2'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 4.3.8'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets

spec/spec_helper.rb

@@ -33,6 +33,7 @@
 case app_framework
 when 'rails'
   # Load Rails
+  require 'logger'
   require_relative "app/#{app_name}/config/environment"
 
   APP_RAKEFILE = File.expand_path("../app/#{app_name}/Rakefile", __FILE__)

spec/validation_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'dry-validation'
+require 'dry/validation'
 
 describe Config do
   context 'validation' do