chore: Update Ruby and Rails test matrix

jgraichen · Sep 4, 2023 · 7968d80 · 7968d80
1 parent 37cd2e4
commit 7968d80
Show file tree

Hide file tree

Showing 19 changed files with 72 additions and 173 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,28 +8,13 @@ jobs:
     strategy:
       matrix:
         ruby:
+          - "3.2"
+          - "3.1"
           - "3.0"
           - "2.7"
-          - "2.6"
-          - "2.5"
         gemfile:
-          - rails_5.0.gemfile
-          - rails_5.1.gemfile
-          - rails_5.2.gemfile
-          - rails_6.0.gemfile
           - rails_6.1.gemfile
           - rails_7.0.gemfile
-        exclude:
-          - ruby: "3.0"
-            gemfile: rails_5.0.gemfile
-          - ruby: "3.0"
-            gemfile: rails_5.1.gemfile
-          - ruby: "3.0"
-            gemfile: rails_5.2.gemfile
-          - ruby: "2.5"
-            gemfile: rails_7.0.gemfile
-          - ruby: "2.6"
-            gemfile: rails_7.0.gemfile
       fail-fast: False
 
     env:
@@ -66,7 +51,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: 3.2
           bundler-cache: True
 
       - run: bundle exec rubocop --parallel --color
diff --git a/.markdownlint.yaml b/.markdownlint.yaml
@@ -0,0 +1,22 @@
+# markdownlint config
+
+# The CHANGELOG contains duplicated headers by design
+MD024: false
+
+# MD013/line-length: disable line length for all. We prefer lines as
+# long as paragraph with in-editor line breaks.
+MD013: false
+
+# MD033/no-inline-html: allow often need tags
+MD033:
+  allowed_elements:
+    - figure
+    - figcaption
+
+# MD046/code-block-style: code block style conflicting with
+# admonitions...
+MD046: false
+
+# MD048/code-fence-style: code fence style
+MD048:
+  style: backtick
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,5 @@
 inherit_gem:
-  my-rubocop: default.yml
+  rubocop-config: default.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
diff --git a/.vscode/ltex.dictionary.en-US.txt b/.vscode/ltex.dictionary.en-US.txt
@@ -0,0 +1 @@
+Changelog
diff --git a/Appraisals b/Appraisals
@@ -1,33 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-5.0' do
-  gem 'activesupport', '~> 5.0.0'
-  gem 'activemodel', '~> 5.0.0'
-  gem 'actionpack', '~> 5.0.0'
-  gem 'railties', '~> 5.0.0', require: 'rails'
-end
-
-appraise 'rails-5.1' do
-  gem 'activesupport', '~> 5.1.0'
-  gem 'activemodel', '~> 5.1.0'
-  gem 'actionpack', '~> 5.1.0'
-  gem 'railties', '~> 5.1.0', require: 'rails'
-end
-
-appraise 'rails-5.2' do
-  gem 'activesupport', '~> 5.2.0'
-  gem 'activemodel', '~> 5.2.0'
-  gem 'actionpack', '~> 5.2.0'
-  gem 'railties', '~> 5.2.0', require: 'rails'
-end
-
-appraise 'rails-6.0' do
-  gem 'activesupport', '~> 6.0.0'
-  gem 'activemodel', '~> 6.0.0'
-  gem 'actionpack', '~> 6.0.0'
-  gem 'railties', '~> 6.0.0', require: 'rails'
-end
-
 appraise 'rails-6.1' do
   gem 'activesupport', '~> 6.1.0'
   gem 'activemodel', '~> 6.1.0'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,83 +3,97 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Changelog](http://keepachangelog.com/).
 
-
-
 ## Unreleased
+
 ---
 
 ### New
 
+- Add Ruby 3.1 and 3.2 to test matrix
+
 ### Changes
 
+- Drop Ruby < 2.7 from test matrix
+- Drop Rails < 6.1 from test matrix
+
 ### Fixes
 
 ### Breaks
 
-
 ## 2.6.0 - (2021-12-16)
+
 ---
 
 ### New
-* Support for Rails 7
 
+- Support for Rails 7
 
 ## 2.5.0 - (2020-12-13)
+
 ---
 
 ### New
-* Add support for Rails 6.1
 
+- Add support for Rails 6.1
 
 ## 2.4.0
+
 ---
 
-* Add support for Rails 6.0
+- Add support for Rails 6.0
 
 ## 2.3.0
+
 ---
 
-* Newly written visitor and formatter to improve performance (#3)
-* Nested groups are expanded into a list of groups
+- Newly written visitor and formatter to improve performance (#3)
+- Nested groups are expanded into a list of groups
 
 ## 2.2.0
+
 ---
 
-* Add support to Rails 5.2 to gemspec
+- Add support to Rails 5.2 to gemspec
 
 ## 2.1.0
+
 ---
 
-* Add emulation for Rails' routing behavior with original script name
+- Add emulation for Rails' routing behavior with original script name
 
 ## 2.0.0
+
 ---
 
-* Add support for Rails 5.1
-* Drop support for Rails < 4.2
+- Add support for Rails 5.1
+- Drop support for Rails < 4.2
 
 ## 1.1.1
+
 ---
 
-* Fix full URL generation to not use `root_url` helper to avoid depending on that and to improve compatibility with e.g. rails engines.
+- Fix full URL generation to not use `root_url` helper to avoid depending on that and to improve compatibility with e.g. rails engines.
 
 ## 1.1.0
+
 ---
 
-* Added support for Rails 5.0
+- Added support for Rails 5.0
 
 ## 1.0.0
+
 ---
 
-* No changes just bumping version to a production release
+- No changes just bumping version to a production release
 
 ## 0.3.0
+
 ---
 
-* Added Rails 4.2 support
+- Added Rails 4.2 support
 
 ## 0.2.0
----
 
-* Added `_path_rfc6570` and `_url_rfc6570` helpers (#2)
+---
 
+- Added `_path_rfc6570` and `_url_rfc6570` helpers (#2)
diff --git a/Gemfile b/Gemfile
@@ -8,9 +8,9 @@ gem 'codecov', require: false
 gem 'rspec', '~> 3.0'
 gem 'rspec-rails'
 
-gem 'my-rubocop', github: 'jgraichen/my-rubocop'
 gem 'rake'
 gem 'rake-release', '~> 1.0'
+gem 'rubocop-config', github: 'jgraichen/rubocop-config', ref: 'v11', require: false
 
 group :development do
   gem 'appraisal'

diff --git a/benchmarks/bench_ips_rfc6570_full.rb b/benchmarks/bench_ips_rfc6570_full.rb
@@ -9,11 +9,11 @@
 
 Benchmark.ips do |x|
   x.report('old') do
-    ::Rails::RFC6570.build_url_template(ctx, route, path_only: false)
+    Rails::RFC6570.build_url_template(ctx, route, path_only: false)
   end
 
   x.report('new') do
-    ::Rails::RFC6570.build_url_template(ctx, route, path_only: false)
+    Rails::RFC6570.build_url_template(ctx, route, path_only: false)
   end
 
   x.hold! '/tmp/benchmark-ips-rfc6570-full.log'

diff --git a/benchmarks/bench_ips_rfc6570_path.rb b/benchmarks/bench_ips_rfc6570_path.rb
@@ -9,11 +9,11 @@
 
 Benchmark.ips do |x|
   x.report('old') do
-    ::Rails::RFC6570.build_url_template(ctx, route, path_only: true)
+    Rails::RFC6570.build_url_template(ctx, route, path_only: true)
   end
 
   x.report('new') do
-    ::Rails::RFC6570.build_url_template(ctx, route, path_only: true)
+    Rails::RFC6570.build_url_template(ctx, route, path_only: true)
   end
 
   x.hold! '/tmp/benchmark-ips-rfc6570-path.log'

diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile
diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile
diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -5,9 +5,9 @@ source "https://rubygems.org"
 gem "codecov", require: false
 gem "rspec", "~> 3.0"
 gem "rspec-rails"
-gem "my-rubocop", github: "jgraichen/my-rubocop"
 gem "rake"
 gem "rake-release", "~> 1.0"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11", require: false
 gem "activesupport", "~> 6.1.0"
 gem "activemodel", "~> 6.1.0"
 gem "actionpack", "~> 6.1.0"

diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -5,9 +5,9 @@ source "https://rubygems.org"
 gem "codecov", require: false
 gem "rspec", "~> 3.0"
 gem "rspec-rails"
-gem "my-rubocop", github: "jgraichen/my-rubocop"
 gem "rake"
 gem "rake-release", "~> 1.0"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11", require: false
 gem "activesupport", "~> 7.0.0"
 gem "activemodel", "~> 7.0.0"
 gem "actionpack", "~> 7.0.0"

diff --git a/gemfiles/rails_head.gemfile b/gemfiles/rails_head.gemfile
@@ -5,9 +5,9 @@ source "https://rubygems.org"
 gem "codecov", require: false
 gem "rspec", "~> 3.0"
 gem "rspec-rails"
-gem "my-rubocop", github: "jgraichen/my-rubocop"
 gem "rake"
 gem "rake-release", "~> 1.0"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11", require: false
 gem "activesupport", github: "rails/rails"
 gem "activemodel", github: "rails/rails"
 gem "actionpack", github: "rails/rails"