From 910d527be01e7892068e577dec6a91f084adbdcb Mon Sep 17 00:00:00 2001 From: Tim Morgan Date: Thu, 16 May 2024 17:42:02 -0700 Subject: [PATCH] Ruby 3.3.3; gem and package updates --- .github/workflows/ci.yml | 2 +- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 182 +++++++++++++------------- README.md | 6 +- config/deploy.rb | 2 +- spec/requests/password_resets_spec.rb | 2 +- spec/requests/pilot/flights_spec.rb | 4 +- spec/requests/registrations_spec.rb | 4 +- 9 files changed, 104 insertions(+), 102 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af11a04..77c9aa2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: bundler-cache: true - name: Run Rubocop run: | - gem install rubocop-rails rubocop-rspec rubocop-performance rubocop-md rubocop-rake + gem install rubocop-rails rubocop-rspec rubocop-performance rubocop-md rubocop-rake rubocop-graphql rubocop-rspec_rails rubocop-sidekiq rubocop-yard git clone https://gist.github.com/65e21b9e8b0d1db285dcb4fc627b98fa.git .rubocop cp .rubocop/.rubocop.yml .rubocop-ruby.yml git clone https://gist.github.com/14cfa24d53c12bf385871e9b93b95c37.git .rubocop-rspec diff --git a/.ruby-version b/.ruby-version index 15a2799..619b537 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.0 +3.3.3 diff --git a/Gemfile b/Gemfile index 17b25c7..3bf6995 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.3.0" +ruby "3.3.3" # CORE gem "puma" diff --git a/Gemfile.lock b/Gemfile.lock index 8a5a75a..cc75964 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,35 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + actioncable (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailbox (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.2) - actionpack (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailer (7.1.3.4) + actionpack (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionpack (7.1.3.4) + actionview (= 7.1.3.4) + activesupport (= 7.1.3.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -37,35 +37,35 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.2) - actionpack (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actiontext (7.1.3.4) + actionpack (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) + actionview (7.1.3.4) + activesupport (= 7.1.3.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3.2) - activesupport (= 7.1.3.2) + activejob (7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.3.6) - activemodel (7.1.3.2) - activesupport (= 7.1.3.2) - activerecord (7.1.3.2) - activemodel (= 7.1.3.2) - activesupport (= 7.1.3.2) + activemodel (7.1.3.4) + activesupport (= 7.1.3.4) + activerecord (7.1.3.4) + activemodel (= 7.1.3.4) + activesupport (= 7.1.3.4) timeout (>= 0.4.0) - activestorage (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activesupport (= 7.1.3.2) + activestorage (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activesupport (= 7.1.3.4) marcel (~> 1.0) - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -77,18 +77,19 @@ GEM tzinfo (~> 2.0) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.5.1) + airbrussh (1.5.2) sshkit (>= 1.6.1, != 1.7.0) base64 (0.2.0) bcrypt (3.1.20) - bcrypt_pbkdf (1.1.0) - bigdecimal (3.1.7) + bcrypt_pbkdf (1.1.1) + bcrypt_pbkdf (1.1.1-arm64-darwin) + bigdecimal (3.1.8) binding_of_caller (1.0.1) debug_inspector (>= 1.2.0) - bugsnag (6.26.4) + bugsnag (6.27.1) concurrent-ruby (~> 1.0) bugsnag-capistrano (2.1.0) - builder (3.2.4) + builder (3.3.0) capistrano (3.18.1) airbrussh (>= 1.0.0) i18n @@ -110,7 +111,7 @@ GEM capistrano (>= 3.9.0) capistrano-bundler sidekiq (>= 6.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) crack (1.0.0) bigdecimal @@ -124,7 +125,7 @@ GEM database_cleaner-core (2.0.1) date (3.3.4) debug_inspector (1.2.0) - devise (4.9.3) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -145,7 +146,7 @@ GEM concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) ed25519 (1.3.0) - erubi (1.12.0) + erubi (1.13.0) factory_bot (6.4.6) activesupport (>= 5.0.0) factory_bot_rails (6.4.3) @@ -155,17 +156,17 @@ GEM globalid (1.2.1) activesupport (>= 6.1) hashdiff (1.1.0) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.12.0) - rdoc + irb (1.13.2) + rdoc (>= 4.0.0) reline (>= 0.4.2) - jbuilder (2.11.5) + jbuilder (2.12.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) json_expressions (0.9.0) - jwt (2.8.1) + jwt (2.8.2) base64 loofah (2.22.0) crass (~> 1.0.2) @@ -177,13 +178,12 @@ GEM net-smtp marcel (1.0.4) mini_mime (1.1.5) - minitest (5.22.3) + minitest (5.24.0) mutex_m (0.2.0) - net-imap (0.4.10) + net-imap (0.4.13) date net-protocol net-pop (0.1.2) - net-protocol net-protocol (0.2.2) timeout net-scp (4.0.0) @@ -193,20 +193,20 @@ GEM net-smtp (0.5.0) net-protocol net-ssh (7.2.3) - nio4r (2.7.1) - nokogiri (1.16.3-arm64-darwin) + nio4r (2.7.3) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.3-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pg (1.5.6) psych (5.1.2) stringio - public_suffix (5.0.5) + public_suffix (5.1.1) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) - rack (3.0.10) + racc (1.8.0) + rack (3.1.3) rack-cors (2.0.2) rack (>= 2.0.0) rack-session (2.0.0) @@ -216,20 +216,20 @@ GEM rackup (2.1.0) rack (>= 3) webrick (~> 1.8) - rails (7.1.3.2) - actioncable (= 7.1.3.2) - actionmailbox (= 7.1.3.2) - actionmailer (= 7.1.3.2) - actionpack (= 7.1.3.2) - actiontext (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activemodel (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + rails (7.1.3.4) + actioncable (= 7.1.3.4) + actionmailbox (= 7.1.3.4) + actionmailer (= 7.1.3.4) + actionpack (= 7.1.3.4) + actiontext (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activemodel (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) bundler (>= 1.15.0) - railties (= 7.1.3.2) + railties (= 7.1.3.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -241,34 +241,35 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + railties (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) irb rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rake (13.2.1) - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) redcarpet (3.6.0) - redis (5.1.0) - redis-client (>= 0.17.0) - redis-client (0.21.1) + redis (5.2.0) + redis-client (>= 0.22.0) + redis-client (0.22.2) connection_pool - reline (0.5.0) + reline (0.5.9) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.6) + rexml (3.3.0) + strscan rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-rails (6.1.2) @@ -280,18 +281,19 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - sidekiq (7.2.2) + sidekiq (7.2.4) concurrent-ruby (< 2) connection_pool (>= 2.3.0) rack (>= 2.2.4) redis-client (>= 0.19.0) - sshkit (1.22.1) + sshkit (1.22.2) base64 mutex_m net-scp (>= 1.1.2) net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) - stringio (3.1.0) + stringio (3.1.1) + strscan (3.1.0) thor (1.3.1) timeout (0.4.1) tzinfo (2.0.6) @@ -303,7 +305,7 @@ GEM dry-configurable (>= 0.13, < 2) jwt (~> 2.1) warden (~> 1.2) - webmock (3.23.0) + webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -312,7 +314,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) yard (0.9.36) - zeitwerk (2.6.13) + zeitwerk (2.6.16) PLATFORMS arm64-darwin-22 @@ -353,7 +355,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 3.3.0p0 + ruby 3.3.3p89 BUNDLED WITH - 2.5.7 + 2.5.13 diff --git a/README.md b/README.md index 23b1bae..fa8ab8d 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,10 @@ To run the server in development mode, you can create a `Procfile` with contents such as: ``` -backend: cd Backend && rvm 3.3.0@flyweight exec rails server +backend: cd Backend && rvm 3.3.3@flyweight exec rails server frontend: cd Frontend && yarn dev -jobs: cd Backend && rvm 3.3.0@flyweight exec bundle exec sidekiq -C config/sidekiq.yml -cable: cd Backend && rvm 3.3.0@flyweight exec ./bin/cable +jobs: cd Backend && rvm 3.3.3@flyweight exec bundle exec sidekiq -C config/sidekiq.yml +cable: cd Backend && rvm 3.3.3@flyweight exec ./bin/cable ``` Install the `foreman` gem to run the Procfile. diff --git a/config/deploy.rb b/config/deploy.rb index 5e0ca9f..4c3cdc8 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -20,7 +20,7 @@ append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "node_modules", "public/packs", "public/assets" -set :rvm_ruby_version, "3.3.0@#{fetch :application}" +set :rvm_ruby_version, "3.3.2@#{fetch :application}" set :sidekiq_config, "config/sidekiq.yml" diff --git a/spec/requests/password_resets_spec.rb b/spec/requests/password_resets_spec.rb index e37e456..6c400f8 100644 --- a/spec/requests/password_resets_spec.rb +++ b/spec/requests/password_resets_spec.rb @@ -51,7 +51,7 @@ password_confirmation: "different" } } - expect(response).to have_http_status(:unprocessable_entity) + expect(response).to have_http_status(:unprocessable_content) expect(response.body).to match_json_expression(errors: { password_confirmation: [String] }) diff --git a/spec/requests/pilot/flights_spec.rb b/spec/requests/pilot/flights_spec.rb index 7b1745b..2379c76 100644 --- a/spec/requests/pilot/flights_spec.rb +++ b/spec/requests/pilot/flights_spec.rb @@ -77,7 +77,7 @@ post collection_path, params: {flight: flight_params.merge(date: " ")} - expect(response).to have_http_status(:unprocessable_entity) + expect(response).to have_http_status(:unprocessable_content) expect(response.body).to match_json_expression(errors: {date: [String]}) end end @@ -134,7 +134,7 @@ post collection_path, params: {flight: flight_params.merge(date: " ")} - expect(response).to have_http_status(:unprocessable_entity) + expect(response).to have_http_status(:unprocessable_content) expect(response.body).to match_json_expression(errors: {date: [String]}) end end diff --git a/spec/requests/registrations_spec.rb b/spec/requests/registrations_spec.rb index 577eb4c..f061682 100644 --- a/spec/requests/registrations_spec.rb +++ b/spec/requests/registrations_spec.rb @@ -23,7 +23,7 @@ it "handles validation errors" do post collection_path, params: {pilot: pilot_params.merge(name: " ")} - expect(response).to have_http_status(:unprocessable_entity) + expect(response).to have_http_status(:unprocessable_content) expect(response.body).to match_json_expression(errors: { name: [String] }) @@ -79,7 +79,7 @@ it "handles validation errors" do put collection_path, params: {pilot: pilot_params.merge(email: " ")} - expect(response).to have_http_status(:unprocessable_entity) + expect(response).to have_http_status(:unprocessable_content) expect(response.body).to match_json_expression(errors: { email: [String] })