Merge branch 'master' into block-reload-config

Author: pkuczynski

.github/workflows/tests.yml

@@ -1,5 +1,9 @@
 name: tests
 
+permissions:
+  contents: read
+  pull-requests: write
+
 on:
   push:
     branches: [ master ]

.gitignore

@@ -1,7 +1,6 @@
 .idea
 .bundle
-gemfiles/*.lock
-gemfiles/bin
+gemfiles
 log
 pkg
 spec/app/**/db/*.sqlite*

Appraisals

@@ -1,58 +1,93 @@
-# Rails 5.x, 6.0 requires Ruby < 3
-if RUBY_ENGINE == 'ruby' && RUBY_VERSION <= '3.0'
+max_ruby_version = ->(version) {
+  RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) <= Gem::Version.new(version)
+}
+
+min_ruby_version = ->(version) {
+  RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(version)
+}
+
+# Rails 5.x, 6.0 require Ruby < 3
+if max_ruby_version.call('3.0')
   appraise 'rails-5.2' do
     gem 'activerecord-jdbcsqlite3-adapter', '~> 52.5', platform: :jruby
     gem 'bootsnap', '~> 1.4'
-    gem 'rails', '5.2.8.1'
+    gem 'rails', '~> 5.2.0'
     gem 'rspec-rails', '~> 3.7'
     gem 'sqlite3', '< 1.4.0', platform: :ruby
   end
 
   appraise 'rails-6.0' do
     gem 'activerecord-jdbcsqlite3-adapter', '~> 60.1', platform: :jruby
     gem 'bootsnap', '~> 1.4'
-    gem 'rails', '6.0.6.1'
+    gem 'rails', '~> 6.0.0'
     gem 'rspec-rails', '~> 3.7'
-    gem 'sqlite3', '~> 1.4.0', platform: :ruby
+    gem 'sqlite3', '~> 1', platform: :ruby
   end
 end
 
-# Test rails 6.1 with psych >= 4
 appraise 'rails-6.1' do
   gem 'activerecord-jdbcsqlite3-adapter', '~> 61.1', platform: :jruby
   gem 'bootsnap', '>= 1.4.4'
-  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 'drb', '~> 2.2' if min_ruby_version.call('3.4')
+  gem 'mutex_m', '~> 0.2.0' if min_ruby_version.call('3.4')
   gem 'psych', '>= 4'
+  gem 'rails', '~> 6.1.0'
+  gem 'rspec-rails', '~> 5.0'
+  gem 'sqlite3', '~> 1', platform: :ruby
 end
 
-# Temporarily exclude Truffleruby and JRuby from testing in Rails 7.x until they fix the issues upstream.
-# See https://github.com/rubyconfig/config/pull/344#issuecomment-1766209753
-# if (RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.7') || RUBY_ENGINE != 'ruby'
-if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.7'
+# Rails 7.0 require Ruby > 2.7
+if min_ruby_version.call('2.7') || RUBY_ENGINE != 'ruby'
   appraise 'rails-7.0' do
     gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1', platform: :jruby
-    gem 'sqlite3', '~> 1.6.4', platform: :ruby
     gem 'bootsnap', '>= 1.4.4'
-    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 'drb', '~> 2.2' if min_ruby_version.call('3.4')
+    gem 'mutex_m', '~> 0.2.0' if min_ruby_version.call('3.4')
     gem 'psych', '>= 4'
+    gem 'rails', '~> 7.0.0'
+    gem 'rspec-rails', '~> 7.0'
+    gem 'sprockets-rails', '~> 3.5.2'
+    gem 'sqlite3', '~> 1', platform: :ruby
   end
+end
 
+# Rails 7.1 require Ruby > 2.7
+if min_ruby_version.call('2.7')
   appraise 'rails-7.1' do
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1', platform: :jruby
-    gem 'sqlite3', '~> 1.6.6', platform: :ruby
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0', platform: :jruby
+    gem 'bootsnap', '>= 1.16.0'
+    gem 'psych', '>= 4'
+    gem 'rails', '~> 7.1.0'
+    gem 'rspec-rails', '~> 7.0'
+    gem 'sprockets-rails', '~> 3.5.2'
+    gem 'sqlite3', '~> 1', platform: :ruby
+  end
+
+end
+
+# Rails 7.2 requires Ruby > 3.1
+if min_ruby_version.call('3.1.0')
+  appraise 'rails-7.2' do
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0', platform: :jruby
+    gem 'bootsnap', '>= 1.16.0'
+    gem 'psych', '>= 4'
+    gem 'rails', '~> 7.2.0'
+    gem 'rspec-rails', '~> 7.0'
+    gem 'sprockets-rails', '~> 3.5.2'
+    gem 'sqlite3', '~> 1', platform: :ruby
+  end
+end
+
+# Rails 8.0 requires Ruby > 3.2
+if min_ruby_version.call('3.2.0')
+  appraise 'rails-8.0' do
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 71.0', platform: :jruby
     gem 'bootsnap', '>= 1.16.0'
-    gem 'rails', '7.1.5.1'
-    gem 'rspec-rails', '~> 6.0.3'
-    gem 'sprockets-rails', '~> 3.4.2'
+    gem 'kamal', '~> 2.7.0'
+    gem 'rails', '~> 8.0.0'
+    gem 'rspec-rails', '~> 8.0'
     gem 'psych', '>= 4'
+    gem 'sqlite3', '>= 2.1', platform: :ruby
   end
 end
 

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 5.6.1
+
+* fix(security): replace IO.read with File.read [#378](https://github.com/rubyconfig/config/pull/378)
+
+## 5.6.0
+
+* Added `extra_sources` in initializer ([#366](https://github.com/rubyconfig/config/pull/366))
+
 ## 5.5.2
 
 * Fix warning: ostruct was loaded from the standard library with Ruby 3.3.5 and 3.4+ ([#363](https://github.com/rubyconfig/config/pull/363))

README.md

@@ -162,6 +162,22 @@ Example production environment config file:
 #{Rails.root}/config/environments/production.yml
 ```
 
+### Extra sources
+
+You can load extra sources during initialization by setting the `extra_sources` configuration option.
+
+```ruby
+Config.setup do |config|
+  config.extra_sources = [
+    'path/to/extra_source.yml',          # String: loads extra_source.yml
+    { api_key: ENV['API_KEY'] },         # Hash: direct hash source
+    MyCustomSource.new,                  # Object: custom source object that responds to `load`
+  ]
+end
+```
+
+This will also overwrite the same config entries from the main file.
+
 ### Developer specific config files
 
 If you want to have local settings, specific to your machine or development environment, you can use the following files, which are automatically `.gitignore` :

config.gemspec

@@ -40,8 +40,14 @@ Gem::Specification.new do |s|
   # Default RSpec run will test against latest Rails app
   unless ENV['APPRAISAL_INITIALIZED'] || ENV['GITHUB_ACTIONS']
     gems_to_install = /gem "(.*?)", "(.*?)"(?!, platform: (?!\[:ruby\]))/
-    File.read(Dir['gemfiles/rails*.gemfile'].sort.last).scan(gems_to_install) do |name, version|
-      s.add_development_dependency name, version
+
+    if Dir.exist?('gemfiles')
+      rails_gemfiles = Dir['gemfiles/rails*.gemfile'].sort
+      unless rails_gemfiles.empty?
+        File.read(rails_gemfiles.last).scan(gems_to_install) do |name, version|
+          s.add_development_dependency name, version
+        end
+      end
     end
   end