Merge branch 'main' into system-hardening

.github/workflows/build.yml

@@ -17,54 +17,92 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 3.1.2
-          - 3.0.4
-          - 2.7.6
-          - 2.6.10
-          - 2.5.8
+          - '3.2'
+          - '3.1'
+          - '3.0'
+          - '2.7'
+          - '2.6'
+          - '2.5'
         gemfile:
           - rack_3
           - rack_2
           - rack_1
+          - rails_7_1
           - rails_7_0
           - rails_6_1
           - rails_6_0
           - rails_5_2
-          - rails_4_2
           - dalli3
           - dalli2
           - redis_5
           - redis_4
           - connection_pool_dalli
-          - active_support_redis_cache_store
-          - active_support_redis_cache_store_pooled
+          - active_support_7_1_redis_cache_store
+          - active_support_7_1_redis_cache_store_pooled
+          - active_support_7_0_redis_cache_store
+          - active_support_7_0_redis_cache_store_pooled
+          - active_support_6_redis_cache_store
+          - active_support_6_redis_cache_store_pooled
+          - active_support_5_redis_cache_store
+          - active_support_5_redis_cache_store_pooled
           - redis_store
-          - active_support_redis_store
         exclude:
           - gemfile: rack_1
-            ruby: 3.1.2
+            ruby: '3.2'
           - gemfile: rails_5_2
-            ruby: 3.1.2
-          - gemfile: rails_4_2
-            ruby: 3.1.2
+            ruby: '3.2'
+          - gemfile: active_support_5_redis_cache_store
+            ruby: '3.2'
+          - gemfile: active_support_5_redis_cache_store_pooled
+            ruby: '3.2'
           - gemfile: dalli2
-            ruby: 3.1.2
+            ruby: '3.2'
           - gemfile: rack_1
-            ruby: 3.0.4
+            ruby: '3.1'
           - gemfile: rails_5_2
-            ruby: 3.0.4
-          - gemfile: rails_4_2
-            ruby: 3.0.4
+            ruby: '3.1'
+          - gemfile: active_support_5_redis_cache_store
+            ruby: '3.1'
+          - gemfile: active_support_5_redis_cache_store_pooled
+            ruby: '3.1'
           - gemfile: dalli2
-            ruby: 3.0.4
+            ruby: '3.1'
           - gemfile: rack_1
-            ruby: 2.7.6
-          - gemfile: rails_4_2
-            ruby: 2.7.6
+            ruby: '3.0'
+          - gemfile: rails_5_2
+            ruby: '3.0'
+          - gemfile: active_support_5_redis_cache_store
+            ruby: '3.0'
+          - gemfile: active_support_5_redis_cache_store_pooled
+            ruby: '3.0'
+          - gemfile: dalli2
+            ruby: '3.0'
+          - gemfile: rack_1
+            ruby: '2.7'
           - gemfile: rails_7_0
-            ruby: 2.6.10
+            ruby: '2.6'
           - gemfile: rails_7_0
-            ruby: 2.5.8
+            ruby: '2.5'
+          - gemfile: active_support_7_0_redis_cache_store
+            ruby: '2.6'
+          - gemfile: active_support_7_0_redis_cache_store
+            ruby: '2.5'
+          - gemfile: active_support_7_0_redis_cache_store_pooled
+            ruby: '2.6'
+          - gemfile: active_support_7_0_redis_cache_store_pooled
+            ruby: '2.5'
+          - gemfile: rails_7_1
+            ruby: '2.6'
+          - gemfile: rails_7_1
+            ruby: '2.5'
+          - gemfile: active_support_7_1_redis_cache_store
+            ruby: '2.6'
+          - gemfile: active_support_7_1_redis_cache_store
+            ruby: '2.5'
+          - gemfile: active_support_7_1_redis_cache_store_pooled
+            ruby: '2.6'
+          - gemfile: active_support_7_1_redis_cache_store_pooled
+            ruby: '2.5'
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:

.rubocop.yml

@@ -1,5 +1,7 @@
 require:
+  - rubocop-minitest
   - rubocop-performance
+  - rubocop-rake
 
 inherit_mode:
   merge:
@@ -56,7 +58,6 @@ Security:
 
 Style/BlockDelimiters:
   Enabled: true
-  IgnoredMethods: [] # Workaround rubocop bug: https://github.com/rubocop-hq/rubocop/issues/6179
 
 Style/ClassAndModuleChildren:
   Enabled: true

Appraisals

@@ -21,6 +21,10 @@ appraise "rack_1" do
   gem "rack-test", ">= 0.6"
 end
 
+appraise 'rails_7-1' do
+  gem 'railties', '~> 7.1.0'
+end
+
 appraise 'rails_7-0' do
   gem 'railties', '~> 7.0.0'
 end
@@ -37,14 +41,6 @@ appraise 'rails_5-2' do
   gem 'railties', '~> 5.2.0'
 end
 
-appraise 'rails_4-2' do
-  gem 'railties', '~> 4.2.0'
-
-  # Override rack-test version constraint by making it more loose
-  # so it's compatible with actionpack 4.2.x
-  gem "rack-test", ">= 0.6"
-end
-
 appraise 'dalli2' do
   gem 'dalli', '~> 2.0'
 end
@@ -66,22 +62,50 @@ appraise "connection_pool_dalli" do
   gem "dalli", "~> 3.0"
 end
 
-appraise "active_support_redis_cache_store" do
+appraise "active_support_7-1_redis_cache_store" do
+  gem "activesupport", "~> 7.1.0"
+  gem "redis", "~> 5.0"
+end
+
+appraise "active_support_7-1_redis_cache_store_pooled" do
+  gem "activesupport", "~> 7.1.0"
+  gem "connection_pool", "~> 2.2"
+  gem "redis", "~> 5.0"
+end
+
+appraise "active_support_7-0_redis_cache_store" do
+  gem "activesupport", "~> 7.0.0"
+  gem "redis", "~> 5.0"
+end
+
+appraise "active_support_7-0_redis_cache_store_pooled" do
+  gem "activesupport", "~> 7.0.0"
+  gem "connection_pool", "~> 2.2"
+  gem "redis", "~> 5.0"
+end
+
+appraise "active_support_6_redis_cache_store" do
   gem "activesupport", "~> 6.1.0"
   gem "redis", "~> 5.0"
 end
 
-appraise "active_support_redis_cache_store_pooled" do
+appraise "active_support_6_redis_cache_store_pooled" do
   gem "activesupport", "~> 6.1.0"
   gem "connection_pool", "~> 2.2"
   gem "redis", "~> 5.0"
 end
 
-appraise "redis_store" do
-  gem "redis-store", "~> 1.5"
+appraise "active_support_5_redis_cache_store" do
+  gem "activesupport", "~> 5.2.0"
+  gem "redis", "~> 5.0"
 end
 
-appraise "active_support_redis_store" do
-  gem "redis-activesupport", "~> 5.0"
-  gem 'redis-store', '1.9.1' # remove after https://github.com/redis-store/redis-store/issues/358 is resolved
+appraise "active_support_5_redis_cache_store_pooled" do
+  gem "activesupport", "~> 5.2.0"
+  gem "connection_pool", "~> 2.2"
+  gem "redis", "~> 5.0"
+end
+
+appraise "redis_store" do
+  gem "redis-store", "~> 1.5"
 end

gemfiles/active_support_5_redis_cache_store.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.2.0"
+gem "redis", "~> 5.0"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
+gemspec path: "../"

gemfiles/active_support_5_redis_cache_store_pooled.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.2.0"
+gem "connection_pool", "~> 2.2"
+gem "redis", "~> 5.0"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
+gemspec path: "../"

gemfiles/active_support_redis_cache_store.gemfile → gemfiles/active_support_6_redis_cache_store.gemfile

@@ -5,4 +5,9 @@ source "https://rubygems.org"
 gem "activesupport", "~> 6.1.0"
 gem "redis", "~> 5.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"

gemfiles/active_support_redis_cache_store_pooled.gemfile → gemfiles/active_support_6_redis_cache_store_pooled.gemfile

@@ -6,4 +6,9 @@ gem "activesupport", "~> 6.1.0"
 gem "connection_pool", "~> 2.2"
 gem "redis", "~> 5.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"

gemfiles/active_support_7_0_redis_cache_store.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.0.0"
+gem "redis", "~> 5.0"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
+gemspec path: "../"

gemfiles/active_support_7_0_redis_cache_store_pooled.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.0.0"
+gem "connection_pool", "~> 2.2"
+gem "redis", "~> 5.0"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
+gemspec path: "../"

gemfiles/active_support_7_1_redis_cache_store.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.1.0"
+gem "redis", "~> 5.0"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
+gemspec path: "../"

gemfiles/active_support_7_1_redis_cache_store_pooled.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.1.0"
+gem "connection_pool", "~> 2.2"
+gem "redis", "~> 5.0"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
+gemspec path: "../"

gemfiles/connection_pool_dalli.gemfile

@@ -5,4 +5,9 @@ source "https://rubygems.org"
 gem "connection_pool", "~> 2.2"
 gem "dalli", "~> 3.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"

gemfiles/dalli2.gemfile

@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "dalli", "~> 2.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"

gemfiles/dalli3.gemfile

@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "dalli", "~> 3.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"

gemfiles/rack_1.gemfile

@@ -7,4 +7,9 @@ gem "activesupport", ">= 4.2"
 gem "rack", "~> 1.6"
 gem "rack-test", ">= 0.6"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"

gemfiles/rack_2.gemfile

@@ -3,6 +3,10 @@
 source "https://rubygems.org"
 
 gem "rack", "~> 2.0"
-gem "railties"
+
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
 
 gemspec path: "../"

gemfiles/rack_3.gemfile

@@ -4,4 +4,9 @@ source "https://rubygems.org"
 
 gem "rack", "~> 3.0"
 
+group :maintenance, optional: true do
+  gem "bake"
+  gem "bake-gem"
+end
+
 gemspec path: "../"