From da2ca834fbf812ac3226bb3bda3bd01f974bd884 Mon Sep 17 00:00:00 2001 From: Dmitry Babenko Date: Fri, 21 Jul 2023 19:28:42 +0300 Subject: [PATCH] Upgrade ruby, gems and workflows --- .github/workflows/main.yml | 4 +- .github/workflows/publish-gpr.yml | 4 +- .github/workflows/publish-rubygems.yml | 4 +- .rubocop.yml | 7 +- .ruby-version | 2 +- Gemfile | 10 +- Gemfile.lock | 249 +++++++++++++------------ auxiliary_rails.gemspec | 20 +- 8 files changed, 152 insertions(+), 148 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8fd6ee0..a4a1be8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,9 @@ jobs: strategy: matrix: ruby: - - '2.7.6' + - '2.7' + - '3.1' + - '3.2' steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/publish-gpr.yml b/.github/workflows/publish-gpr.yml index 2a5c6c2..6b8b701 100644 --- a/.github/workflows/publish-gpr.yml +++ b/.github/workflows/publish-gpr.yml @@ -16,10 +16,8 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Ruby 2.6 + - name: Set up Ruby uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - name: Publish to GPR run: | diff --git a/.github/workflows/publish-rubygems.yml b/.github/workflows/publish-rubygems.yml index 755cf84..80b191e 100644 --- a/.github/workflows/publish-rubygems.yml +++ b/.github/workflows/publish-rubygems.yml @@ -16,10 +16,8 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Ruby 2.6 + - name: Set up Ruby uses: actions/setup-ruby@v1 - with: - ruby-version: 2.6.x - name: Publish to RubyGems run: | diff --git a/.rubocop.yml b/.rubocop.yml index f801dce..e42e65d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,6 +3,7 @@ inherit_from: require: - rubocop-performance + - rubocop-rake - rubocop-rspec AllCops: @@ -25,12 +26,6 @@ Layout/LineEndStringConcatenationIndentation: Layout/MultilineMethodCallIndentation: EnforcedStyle: indented -#################### Metrics ############################## - -Metrics/BlockLength: - IgnoredMethods: - - describe - #################### RSpec ################################ RSpec/ExampleLength: diff --git a/.ruby-version b/.ruby-version index a4dd9db..be94e6f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.4 +3.2.2 diff --git a/Gemfile b/Gemfile index 04bfe68..744f88e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,12 @@ source 'https://rubygems.org' -# Specify your gem's dependencies in auxiliary_rails.gemspec gemspec + +gem 'bundler', '~> 2.0' +gem 'pry' +gem 'rake' +gem 'rspec', '~> 3.8' +gem 'rubocop', '~> 1.54' +gem 'rubocop-performance' +gem 'rubocop-rake' +gem 'rubocop-rspec' diff --git a/Gemfile.lock b/Gemfile.lock index 62b3d81..77d077c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,67 +11,67 @@ PATH GEM remote: https://rubygems.org/ specs: - actioncable (7.0.3.1) - actionpack (= 7.0.3.1) - activesupport (= 7.0.3.1) + actioncable (7.0.6) + actionpack (= 7.0.6) + activesupport (= 7.0.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.3.1) - actionpack (= 7.0.3.1) - activejob (= 7.0.3.1) - activerecord (= 7.0.3.1) - activestorage (= 7.0.3.1) - activesupport (= 7.0.3.1) + actionmailbox (7.0.6) + actionpack (= 7.0.6) + activejob (= 7.0.6) + activerecord (= 7.0.6) + activestorage (= 7.0.6) + activesupport (= 7.0.6) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.3.1) - actionpack (= 7.0.3.1) - actionview (= 7.0.3.1) - activejob (= 7.0.3.1) - activesupport (= 7.0.3.1) + actionmailer (7.0.6) + actionpack (= 7.0.6) + actionview (= 7.0.6) + activejob (= 7.0.6) + activesupport (= 7.0.6) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.3.1) - actionview (= 7.0.3.1) - activesupport (= 7.0.3.1) - rack (~> 2.0, >= 2.2.0) + actionpack (7.0.6) + actionview (= 7.0.6) + activesupport (= 7.0.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) - actiontext (7.0.3.1) - actionpack (= 7.0.3.1) - activerecord (= 7.0.3.1) - activestorage (= 7.0.3.1) - activesupport (= 7.0.3.1) + actiontext (7.0.6) + actionpack (= 7.0.6) + activerecord (= 7.0.6) + activestorage (= 7.0.6) + activesupport (= 7.0.6) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.3.1) - activesupport (= 7.0.3.1) + actionview (7.0.6) + activesupport (= 7.0.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.3.1) - activesupport (= 7.0.3.1) + activejob (7.0.6) + activesupport (= 7.0.6) globalid (>= 0.3.6) - activemodel (7.0.3.1) - activesupport (= 7.0.3.1) - activerecord (7.0.3.1) - activemodel (= 7.0.3.1) - activesupport (= 7.0.3.1) - activestorage (7.0.3.1) - actionpack (= 7.0.3.1) - activejob (= 7.0.3.1) - activerecord (= 7.0.3.1) - activesupport (= 7.0.3.1) + activemodel (7.0.6) + activesupport (= 7.0.6) + activerecord (7.0.6) + activemodel (= 7.0.6) + activesupport (= 7.0.6) + activestorage (7.0.6) + actionpack (= 7.0.6) + activejob (= 7.0.6) + activerecord (= 7.0.6) + activesupport (= 7.0.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.3.1) + activesupport (7.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -79,131 +79,142 @@ GEM ast (2.4.2) builder (3.2.4) coderay (1.1.3) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) crass (1.0.6) + date (3.3.3) diff-lcs (1.5.0) - digest (3.1.0) - dry-core (0.8.1) + dry-core (1.0.0) concurrent-ruby (~> 1.0) + zeitwerk (~> 2.6) dry-initializer (3.1.1) dry-initializer-rails (3.1.1) dry-initializer (>= 2.4, < 4) rails (> 3.0) - erubi (1.11.0) - globalid (1.0.0) + erubi (1.12.0) + globalid (1.1.0) activesupport (>= 5.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - loofah (2.18.0) + json (2.6.3) + language_server-protocol (3.17.0.3) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.2) - mini_portile2 (2.8.0) - minitest (5.16.3) - net-imap (0.2.3) - digest + mini_portile2 (2.8.4) + minitest (5.18.1) + net-imap (0.3.6) + date net-protocol - strscan - net-pop (0.1.1) - digest + net-pop (0.1.2) net-protocol + net-protocol (0.2.1) timeout - net-protocol (0.1.3) - timeout - net-smtp (0.3.1) - digest + net-smtp (0.3.3) net-protocol - timeout - nio4r (2.5.8) - nokogiri (1.13.8) - mini_portile2 (~> 2.8.0) + nio4r (2.5.9) + nokogiri (1.15.3) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - parallel (1.22.1) - parser (3.1.2.1) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) - pry (0.14.1) + racc + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - racc (1.6.0) - rack (2.2.4) - rack-test (2.0.2) + racc (1.7.1) + rack (2.2.7) + rack-test (2.1.0) rack (>= 1.3) - rails (7.0.3.1) - actioncable (= 7.0.3.1) - actionmailbox (= 7.0.3.1) - actionmailer (= 7.0.3.1) - actionpack (= 7.0.3.1) - actiontext (= 7.0.3.1) - actionview (= 7.0.3.1) - activejob (= 7.0.3.1) - activemodel (= 7.0.3.1) - activerecord (= 7.0.3.1) - activestorage (= 7.0.3.1) - activesupport (= 7.0.3.1) + rails (7.0.6) + actioncable (= 7.0.6) + actionmailbox (= 7.0.6) + actionmailer (= 7.0.6) + actionpack (= 7.0.6) + actiontext (= 7.0.6) + actionview (= 7.0.6) + activejob (= 7.0.6) + activemodel (= 7.0.6) + activerecord (= 7.0.6) + activestorage (= 7.0.6) + activesupport (= 7.0.6) bundler (>= 1.15.0) - railties (= 7.0.3.1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + railties (= 7.0.6) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) - railties (7.0.3.1) - actionpack (= 7.0.3.1) - activesupport (= 7.0.3.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.0.6) + actionpack (= 7.0.6) + activesupport (= 7.0.6) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) - regexp_parser (2.5.0) + regexp_parser (2.8.1) rexml (3.2.5) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + 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) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - rubocop (1.20.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.1) + rubocop (1.54.2) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.9.1, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.21.0) - parser (>= 3.1.1.0) - rubocop-performance (1.14.3) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) + rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) + rubocop-performance (1.18.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rake (0.6.0) rubocop (~> 1.0) - rubocop-rspec (2.11.1) - rubocop (~> 1.19) - ruby-progressbar (1.11.0) - strscan (3.0.4) - thor (1.2.1) - timeout (0.3.0) - tzinfo (2.0.5) + rubocop-rspec (2.22.0) + rubocop (~> 1.33) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + ruby-progressbar (1.13.0) + thor (1.2.2) + timeout (0.4.0) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.2.0) + unicode-display_width (2.4.2) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.0) + zeitwerk (2.6.8) PLATFORMS ruby @@ -214,10 +225,10 @@ DEPENDENCIES pry rake rspec (~> 3.8) - rubocop (= 1.20.0) + rubocop (~> 1.54) rubocop-performance rubocop-rake rubocop-rspec BUNDLED WITH - 2.2.33 + 2.4.17 diff --git a/auxiliary_rails.gemspec b/auxiliary_rails.gemspec index 1e8996a..4aad1a7 100644 --- a/auxiliary_rails.gemspec +++ b/auxiliary_rails.gemspec @@ -22,6 +22,7 @@ Gem::Specification.new do |spec| raise 'RubyGems 2.0 or newer is required' unless spec.respond_to?(:metadata) spec.metadata['homepage_uri'] = spec.homepage + spec.metadata['rubygems_mfa_required'] = 'true' spec.metadata['source_code_uri'] = spec.homepage spec.metadata['changelog_uri'] = "#{spec.homepage}/releases" @@ -35,18 +36,9 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.5' - spec.add_development_dependency 'bundler', '~> 2.0' - spec.add_development_dependency 'pry' - spec.add_development_dependency 'rake' - spec.add_development_dependency 'rspec', '~> 3.8' - spec.add_development_dependency 'rubocop', '1.20.0' - spec.add_development_dependency 'rubocop-performance' - spec.add_development_dependency 'rubocop-rake' - spec.add_development_dependency 'rubocop-rspec' - - spec.add_runtime_dependency 'dry-core' - spec.add_runtime_dependency 'dry-initializer' - spec.add_runtime_dependency 'dry-initializer-rails' - spec.add_runtime_dependency 'rails', '>= 5.2' - spec.add_runtime_dependency 'thor' + spec.add_dependency 'dry-core' + spec.add_dependency 'dry-initializer' + spec.add_dependency 'dry-initializer-rails' + spec.add_dependency 'rails', '>= 5.2' + spec.add_dependency 'thor' end