From 78e853180c7ca5e43a84a4591c698d0e54fe4a35 Mon Sep 17 00:00:00 2001 From: Mattias Pfeiffer Date: Thu, 24 Oct 2024 13:13:00 +0200 Subject: [PATCH 1/2] Add Rails 8 support --- Gemfile | 7 +- Gemfile.activerecord-6.0.lock | 101 +++++++++---------- Gemfile.activerecord-6.1.lock | 129 ++++++++++++------------ Gemfile.activerecord-7.0.lock | 129 ++++++++++++------------ Gemfile.activerecord-7.1.lock | 184 ++++++++++++++++++++++++++++++++++ Gemfile.lock | 176 ++++++++++++++++---------------- Jenkinsfile | 2 +- outrigger.gemspec | 4 +- 8 files changed, 462 insertions(+), 270 deletions(-) create mode 100644 Gemfile.activerecord-7.1.lock diff --git a/Gemfile b/Gemfile index b65e67d..c5d687e 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,12 @@ lockfile 'activerecord-7.0' do gem 'railties', '~> 7.0.0' end -lockfile do +lockfile 'activerecord-7.1' do gem 'activerecord', '~> 7.1.0' gem 'railties', '~> 7.1.0' end + +lockfile do + gem 'activerecord', '~> 8.0.0.rc1' + gem 'railties', '~> 8.0.0.rc1' +end diff --git a/Gemfile.activerecord-6.0.lock b/Gemfile.activerecord-6.0.lock index dff5d48..69a0a37 100644 --- a/Gemfile.activerecord-6.0.lock +++ b/Gemfile.activerecord-6.0.lock @@ -2,8 +2,8 @@ PATH remote: . specs: outrigger (3.0.2) - activerecord (>= 6.0, < 7.2) - railties (>= 6.0, < 7.2) + activerecord (>= 6.0, <= 8.0) + railties (>= 6.0, <= 8.0) GEM remote: https://rubygems.org/ @@ -33,35 +33,34 @@ GEM tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) ast (2.4.2) - base64 (0.1.1) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) crass (1.0.6) - diff-lcs (1.5.0) - docile (1.4.0) - erubi (1.12.0) - i18n (1.14.1) + diff-lcs (1.5.1) + docile (1.4.1) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.3) language_server-protocol (3.17.0.3) - loofah (2.21.3) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.20.0) - nokogiri (1.15.4-arm64-darwin) + method_source (1.1.0) + minitest (5.25.1) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) - parser (3.2.2.4) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc - racc (1.7.1) - rack (2.2.8) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -78,59 +77,59 @@ GEM rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.1.1) - rake (13.0.6) - regexp_parser (2.8.1) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rake (13.2.1) + regexp_parser (2.9.2) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rubocop (1.56.4) - base64 (~> 0.1.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.31.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - thor (1.2.2) + thor (1.3.2) thread_safe (0.3.6) tzinfo (1.2.11) thread_safe (~> 0.1) - unicode-display_width (2.5.0) - zeitwerk (2.6.12) + unicode-display_width (2.6.0) + zeitwerk (2.7.1) PLATFORMS arm64-darwin diff --git a/Gemfile.activerecord-6.1.lock b/Gemfile.activerecord-6.1.lock index 29e3ff7..c9f6a72 100644 --- a/Gemfile.activerecord-6.1.lock +++ b/Gemfile.activerecord-6.1.lock @@ -2,66 +2,65 @@ PATH remote: . specs: outrigger (3.0.2) - activerecord (>= 6.0, < 7.2) - railties (>= 6.0, < 7.2) + activerecord (>= 6.0, <= 8.0) + railties (>= 6.0, <= 8.0) GEM remote: https://rubygems.org/ specs: - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionpack (6.1.7.10) + actionview (= 6.1.7.10) + activesupport (= 6.1.7.10) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (6.1.7.10) + activesupport (= 6.1.7.10) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activesupport (6.1.7.6) + activemodel (6.1.7.10) + activesupport (= 6.1.7.10) + activerecord (6.1.7.10) + activemodel (= 6.1.7.10) + activesupport (= 6.1.7.10) + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) ast (2.4.2) - base64 (0.1.1) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) crass (1.0.6) - diff-lcs (1.5.0) - docile (1.4.0) - erubi (1.12.0) - i18n (1.14.1) + diff-lcs (1.5.1) + docile (1.4.1) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.3) language_server-protocol (3.17.0.3) - loofah (2.21.3) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.20.0) - nokogiri (1.15.4-arm64-darwin) + method_source (1.1.0) + minitest (5.25.1) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) - parser (3.2.2.4) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc - racc (1.7.1) - rack (2.2.8) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -71,65 +70,65 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + railties (6.1.7.10) + actionpack (= 6.1.7.10) + activesupport (= 6.1.7.10) method_source rake (>= 12.2) thor (~> 1.0) rainbow (3.1.1) - rake (13.0.6) - regexp_parser (2.8.1) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rake (13.2.1) + regexp_parser (2.9.2) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rubocop (1.56.4) - base64 (~> 0.1.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.31.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - thor (1.2.2) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - zeitwerk (2.6.12) + unicode-display_width (2.6.0) + zeitwerk (2.7.1) PLATFORMS arm64-darwin diff --git a/Gemfile.activerecord-7.0.lock b/Gemfile.activerecord-7.0.lock index a81186c..5251f20 100644 --- a/Gemfile.activerecord-7.0.lock +++ b/Gemfile.activerecord-7.0.lock @@ -2,65 +2,64 @@ PATH remote: . specs: outrigger (3.0.2) - activerecord (>= 6.0, < 7.2) - railties (>= 6.0, < 7.2) + activerecord (>= 6.0, <= 8.0) + railties (>= 6.0, <= 8.0) GEM remote: https://rubygems.org/ specs: - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.6) + actionview (= 7.0.8.6) + activesupport (= 7.0.8.6) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.6) + activesupport (= 7.0.8.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activesupport (7.0.8) + activemodel (7.0.8.6) + activesupport (= 7.0.8.6) + activerecord (7.0.8.6) + activemodel (= 7.0.8.6) + activesupport (= 7.0.8.6) + activesupport (7.0.8.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) ast (2.4.2) - base64 (0.1.1) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) crass (1.0.6) - diff-lcs (1.5.0) - docile (1.4.0) - erubi (1.12.0) - i18n (1.14.1) + diff-lcs (1.5.1) + docile (1.4.1) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.6.3) + json (2.7.3) language_server-protocol (3.17.0.3) - loofah (2.21.3) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - method_source (1.0.0) - minitest (5.20.0) - nokogiri (1.15.4-arm64-darwin) + method_source (1.1.0) + minitest (5.25.1) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) - parser (3.2.2.4) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc - racc (1.7.1) - rack (2.2.8) + racc (1.8.1) + rack (2.2.10) rack-test (2.1.0) rack (>= 1.3) rails-dom-testing (2.2.0) @@ -70,66 +69,66 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.6) + actionpack (= 7.0.8.6) + activesupport (= 7.0.8.6) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.0.6) - regexp_parser (2.8.1) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rake (13.2.1) + regexp_parser (2.9.2) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rubocop (1.56.4) - base64 (~> 0.1.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.31.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - thor (1.2.2) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - zeitwerk (2.6.12) + unicode-display_width (2.6.0) + zeitwerk (2.7.1) PLATFORMS arm64-darwin diff --git a/Gemfile.activerecord-7.1.lock b/Gemfile.activerecord-7.1.lock new file mode 100644 index 0000000..f348f24 --- /dev/null +++ b/Gemfile.activerecord-7.1.lock @@ -0,0 +1,184 @@ +PATH + remote: . + specs: + outrigger (3.0.2) + activerecord (>= 6.0, <= 8.0) + railties (>= 6.0, <= 8.0) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (7.1.4) + actionview (= 7.1.4) + activesupport (= 7.1.4) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actionview (7.1.4) + activesupport (= 7.1.4) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activemodel (7.1.4) + activesupport (= 7.1.4) + activerecord (7.1.4) + activemodel (= 7.1.4) + activesupport (= 7.1.4) + timeout (>= 0.4.0) + activesupport (7.1.4) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.8) + builder (3.3.0) + byebug (11.1.3) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) + crass (1.0.6) + diff-lcs (1.5.1) + docile (1.4.1) + drb (2.2.1) + erubi (1.13.0) + i18n (1.14.6) + concurrent-ruby (~> 1.0) + io-console (0.7.2) + irb (1.14.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + json (2.7.3) + language_server-protocol (3.17.0.3) + loofah (2.22.0) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + minitest (5.25.1) + mutex_m (0.2.0) + nokogiri (1.16.7-arm64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.7-x86_64-linux) + racc (~> 1.4) + parallel (1.26.3) + parser (3.3.5.0) + ast (~> 2.4.1) + racc + psych (5.1.2) + stringio + racc (1.8.1) + rack (3.1.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.1.4) + actionpack (= 7.1.4) + activesupport (= 7.1.4) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rainbow (3.1.1) + rake (13.2.1) + rdoc (6.7.0) + psych (>= 4.0.0) + regexp_parser (2.9.2) + reline (0.5.10) + io-console (~> 0.5) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rubocop (1.67.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) + parallel (~> 1.10) + parser (>= 3.3.0.2) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) + rubocop-rake (0.6.0) + rubocop (~> 1.0) + rubocop-rspec (2.31.0) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) + ruby-progressbar (1.13.0) + simplecov (0.22.0) + docile (~> 1.1) + simplecov-html (~> 0.11) + simplecov_json_formatter (~> 0.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) + stringio (3.1.1) + thor (1.3.2) + timeout (0.4.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (2.6.0) + webrick (1.8.2) + zeitwerk (2.7.1) + +PLATFORMS + arm64-darwin + x86_64-darwin + x86_64-linux + +DEPENDENCIES + activerecord (~> 7.1.0) + bundler (~> 2.2) + byebug (~> 11.1) + outrigger! + railties (~> 7.1.0) + rake (~> 13.0) + rspec (~> 3.7) + rubocop (~> 1.20) + rubocop-rake (~> 0.6) + rubocop-rspec (~> 2.4) + simplecov (~> 0.21) + +BUNDLED WITH + 2.4.20 diff --git a/Gemfile.lock b/Gemfile.lock index 8703d58..5dda807 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,83 +2,87 @@ PATH remote: . specs: outrigger (3.0.2) - activerecord (>= 6.0, < 7.2) - railties (>= 6.0, < 7.2) + activerecord (>= 6.0, <= 8.0) + railties (>= 6.0, <= 8.0) GEM remote: https://rubygems.org/ specs: - actionpack (7.1.0) - actionview (= 7.1.0) - activesupport (= 7.1.0) + actionpack (8.0.0.rc1) + actionview (= 8.0.0.rc1) + activesupport (= 8.0.0.rc1) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.0) - activesupport (= 7.1.0) + useragent (~> 0.16) + actionview (8.0.0.rc1) + activesupport (= 8.0.0.rc1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activemodel (7.1.0) - activesupport (= 7.1.0) - activerecord (7.1.0) - activemodel (= 7.1.0) - activesupport (= 7.1.0) + activemodel (8.0.0.rc1) + activesupport (= 8.0.0.rc1) + activerecord (8.0.0.rc1) + activemodel (= 8.0.0.rc1) + activesupport (= 8.0.0.rc1) timeout (>= 0.4.0) - activesupport (7.1.0) + activesupport (8.0.0.rc1) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) ast (2.4.2) - base64 (0.1.1) - bigdecimal (3.1.4) - builder (3.2.4) + base64 (0.2.0) + benchmark (0.3.0) + bigdecimal (3.1.8) + builder (3.3.0) byebug (11.1.3) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) - diff-lcs (1.5.0) - docile (1.4.0) - drb (2.1.1) - ruby2_keywords - erubi (1.12.0) - i18n (1.14.1) + diff-lcs (1.5.1) + docile (1.4.1) + drb (2.2.1) + erubi (1.13.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.8.1) - rdoc - reline (>= 0.3.8) - json (2.6.3) + io-console (0.7.2) + irb (1.14.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + json (2.7.3) language_server-protocol (3.17.0.3) - loofah (2.21.3) + logger (1.6.1) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - minitest (5.20.0) - mutex_m (0.1.2) - nokogiri (1.15.4-arm64-darwin) + minitest (5.25.1) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.4-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) - parallel (1.23.0) - parser (3.2.2.4) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc - psych (5.1.0) + psych (5.1.2) stringio - racc (1.7.1) - rack (3.0.8) + racc (1.8.1) + rack (3.1.8) rack-session (2.0.0) rack (>= 3.0.0) rack-test (2.1.0) @@ -93,75 +97,77 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.0) - actionpack (= 7.1.0) - activesupport (= 7.1.0) - irb + railties (8.0.0.rc1) + actionpack (= 8.0.0.rc1) + activesupport (= 8.0.0.rc1) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.0.6) - rdoc (6.5.0) + rake (13.2.1) + rdoc (6.7.0) psych (>= 4.0.0) - regexp_parser (2.8.1) - reline (0.3.9) + regexp_parser (2.9.2) + reline (0.5.10) io-console (~> 0.5) - rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) - rubocop (1.56.4) - base64 (~> 0.1.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) + rubocop (1.67.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.3) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.29.0) - parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.24.0) - rubocop (~> 1.33) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.24.1) - rubocop (~> 1.33) + rubocop-rspec (2.31.0) + rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) ruby-progressbar (1.13.0) - ruby2_keywords (0.0.5) + securerandom (0.3.1) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) - stringio (3.0.8) - thor (1.2.2) - timeout (0.4.0) + stringio (3.1.1) + thor (1.3.2) + timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - webrick (1.8.1) - zeitwerk (2.6.12) + unicode-display_width (2.6.0) + uri (0.13.1) + useragent (0.16.10) + webrick (1.8.2) + zeitwerk (2.7.1) PLATFORMS arm64-darwin @@ -169,11 +175,11 @@ PLATFORMS x86_64-linux DEPENDENCIES - activerecord (~> 7.1.0) + activerecord (~> 8.0.0.rc1) bundler (~> 2.2) byebug (~> 11.1) outrigger! - railties (~> 7.1.0) + railties (~> 8.0.0.rc1) rake (~> 13.0) rspec (~> 3.7) rubocop (~> 1.20) diff --git a/Jenkinsfile b/Jenkinsfile index 074d3a5..3ed9201 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,7 @@ pipeline { } axis { name 'LOCKFILE' - values 'activerecord-6.0', 'activerecord-6.1', 'activerecord-7.0', 'Gemfile.lock' + values 'activerecord-6.0', 'activerecord-6.1', 'activerecord-7.0', 'activerecord-7.1', 'Gemfile.lock' } } stages { diff --git a/outrigger.gemspec b/outrigger.gemspec index be53586..5f5f0c4 100644 --- a/outrigger.gemspec +++ b/outrigger.gemspec @@ -18,8 +18,8 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 2.6' - s.add_dependency 'activerecord', '>= 6.0', '< 7.2' - s.add_dependency 'railties', '>= 6.0', '< 7.2' + s.add_dependency 'activerecord', '>= 6.0', '<= 8.0' + s.add_dependency 'railties', '>= 6.0', '<= 8.0' s.add_development_dependency 'bundler', '~> 2.2' s.add_development_dependency 'byebug', '~> 11.1' From 1a578fa60eceec2f0b9806ff10c14940564a1b46 Mon Sep 17 00:00:00 2001 From: Mattias Pfeiffer Date: Mon, 11 Nov 2024 14:27:10 +0100 Subject: [PATCH 2/2] Add support for Rails 8 and 7.2 via `Outrigger.migration_context` --- lib/outrigger.rb | 8 ++++++++ lib/tasks/outrigger.rake | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/outrigger.rb b/lib/outrigger.rb index 24bb22d..62f80bf 100644 --- a/lib/outrigger.rb +++ b/lib/outrigger.rb @@ -16,5 +16,13 @@ def filter(*tags) tags = tags.flatten.map(&:to_sym) proc { |migration| (tags - migration.tags).empty? } end + + def migration_context + if ActiveRecord.version < Gem::Version.new('7.2') + ActiveRecord::Base.connection.migration_context + else + ActiveRecord::Base.connection_pool.migration_context + end + end end end diff --git a/lib/tasks/outrigger.rake b/lib/tasks/outrigger.rake index a8aa135..02c1a44 100644 --- a/lib/tasks/outrigger.rake +++ b/lib/tasks/outrigger.rake @@ -5,7 +5,8 @@ namespace :db do desc 'Run migrations for a Tag' task tagged: %i[environment load_config] do |_t, args| puts("Migrating Tags: #{args.extras}") - ActiveRecord::Base.connection.migration_context.migrate(nil, &Outrigger.filter(args.extras)) + + Outrigger.migration_context.migrate(nil, &Outrigger.filter(args.extras)) end end end