From ae3e3e5012e61bc576b4f0fa31bfabc722fc71ad Mon Sep 17 00:00:00 2001 From: Robert-Anthony Lee-Faison <108823963+leefaisonr@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:09:32 -0400 Subject: [PATCH 1/2] Ensure versions of Capistrano match (#139) * Ensure versions of Capistrano match Co-authored-by: Bess Sadler * Pin capistrano version to what is expected on tower Co-authored-by: Bess Sadler --------- Co-authored-by: Bess Sadler --- Gemfile | 2 +- Gemfile.lock | 11 ++++++----- config/deploy.rb | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 3e1a1a6..605d825 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ end group :development do gem "byebug" - gem "capistrano", "~> 3.10", require: false + gem "capistrano", "3.17.2", require: false gem "capistrano-passenger", require: false gem "capistrano-rails", "~> 1.6", require: false # Use console on exceptions pages [https://github.com/rails/web-console] diff --git a/Gemfile.lock b/Gemfile.lock index 552e178..31dd690 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,7 +77,7 @@ 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) ast (2.4.2) attr_extras (7.1.0) @@ -107,7 +107,7 @@ GEM msgpack (~> 1.2) builder (3.2.4) byebug (11.1.3) - capistrano (3.18.0) + capistrano (3.17.2) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -263,7 +263,7 @@ GEM net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.4.0.1) net-protocol - net-ssh (7.2.1) + net-ssh (7.2.3) nio4r (2.7.0) nokogiri (1.16.2-aarch64-linux) racc (~> 1.4) @@ -413,7 +413,8 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - sshkit (1.22.0) + sshkit (1.22.1) + base64 mutex_m net-scp (>= 1.1.2) net-sftp (>= 2.1.2) @@ -478,7 +479,7 @@ DEPENDENCIES bixby bootsnap byebug - capistrano (~> 3.10) + capistrano (= 3.17.2) capistrano-passenger capistrano-rails (~> 1.6) capybara diff --git a/config/deploy.rb b/config/deploy.rb index c568ffa..b92a6bc 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true # config valid for current version and patch releases of Capistrano -lock "~> 3.18.0" +lock "3.17.2" set :application, "orcid_princeton" set :repo_url, "https://github.com/pulibrary/orcid_princeton.git" From c6b652c300f2a94c2c535841931f1a8809b718d8 Mon Sep 17 00:00:00 2001 From: Robert-Anthony Lee-Faison <108823963+leefaisonr@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:20:25 -0400 Subject: [PATCH 2/2] Update oauth2 (#137) * Update oauth2 to supported version * rubocop corrections * Regenerate Gemfile.lock Co-authored-by: Bess Sadler --------- Co-authored-by: Bess Sadler --- Gemfile | 1 + Gemfile.lock | 84 +++++++++++++++++++++++++++++----------------------- 2 files changed, 48 insertions(+), 37 deletions(-) diff --git a/Gemfile b/Gemfile index 605d825..d1caebb 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ gem "health-monitor-rails" gem "honeybadger" gem "isni" gem "jbuilder" +gem "oauth2", "~> 2.0.x" gem "omniauth-orcid" gem "pg" gem "puma", "5.6.8" diff --git a/Gemfile.lock b/Gemfile.lock index 31dd690..330a263 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,10 +81,10 @@ GEM sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) attr_extras (7.1.0) - axe-core-api (4.8.2) + axe-core-api (4.9.0) dumb_delegator virtus - axe-core-rspec (4.8.2) + axe-core-rspec (4.9.0) axe-core-api dumb_delegator virtus @@ -95,7 +95,7 @@ GEM base64 (0.2.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.0) - bigdecimal (3.1.6) + bigdecimal (3.1.7) bindex (0.8.1) bixby (5.0.2) rubocop (= 1.28.2) @@ -128,7 +128,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - cocina-models (0.95.0) + cocina-models (0.96.0) activesupport deprecation dry-struct (~> 1.0) @@ -155,14 +155,14 @@ GEM database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) date (3.3.4) - debug (1.9.1) + debug (1.9.2) irb (~> 1.10) reline (>= 0.3.8) deprecation (1.1.0) activesupport descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.9.2) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -208,20 +208,20 @@ GEM faraday-net_http (>= 2.0, < 3.2) faraday-net_http (3.1.0) net-http - faraday-retry (2.2.0) + faraday-retry (2.2.1) faraday (~> 2.0) ffaker (2.23.0) globalid (1.2.1) activesupport (>= 6.1) hashie (5.0.0) - health-monitor-rails (11.3.0) + health-monitor-rails (12.1.0) railties (>= 6.1) - honeybadger (5.5.1) - i18n (1.14.1) + honeybadger (5.8.0) + i18n (1.14.4) concurrent-ruby (~> 1.0) ice_nine (0.11.2) io-console (0.7.2) - irb (1.11.2) + irb (1.12.0) rdoc reline (>= 0.4.2) isni (1.2) @@ -243,7 +243,7 @@ GEM marcel (1.0.4) matrix (0.4.2) mini_mime (1.1.5) - minitest (5.22.2) + minitest (5.22.3) msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) @@ -261,24 +261,29 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol net-ssh (7.2.3) - nio4r (2.7.0) - nokogiri (1.16.2-aarch64-linux) + nio4r (2.7.1) + nokogiri (1.16.4-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.2-arm64-darwin) + nokogiri (1.16.4-arm-linux) racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) + nokogiri (1.16.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.4-x86-linux) racc (~> 1.4) - oauth2 (1.4.11) + nokogiri (1.16.4-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.16.4-x86_64-linux) + racc (~> 1.4) + oauth2 (2.0.9) faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -286,9 +291,9 @@ GEM addressable (~> 2.3) nokogiri (~> 1.5) omniauth (~> 1.2) - omniauth-oauth2 (1.5.0) - oauth2 (~> 1.1) - omniauth (~> 1.2) + omniauth-oauth2 (1.7.3) + oauth2 (>= 1.4, < 3) + omniauth (>= 1.9, < 3) omniauth-orcid (2.1.1) omniauth-oauth2 (~> 1.3) ruby_dig (~> 0.0.2) @@ -306,7 +311,7 @@ GEM pg (1.5.6) psych (5.1.2) stringio - public_suffix (5.0.4) + public_suffix (5.0.5) puma (5.6.8) nio4r (~> 2.0) racc (1.7.3) @@ -350,11 +355,11 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) rdoc (6.6.3.1) psych (>= 4.0.0) regexp_parser (2.9.0) - reline (0.4.3) + reline (0.5.2) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) @@ -368,14 +373,14 @@ GEM rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.1) + rspec-rails (6.1.2) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.12) - rspec-expectations (~> 3.12) - rspec-mocks (~> 3.12) - rspec-support (~> 3.12) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) rspec-support (3.13.1) rss (0.3.0) rexml @@ -388,7 +393,7 @@ GEM rubocop-ast (>= 1.17.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.31.1) + rubocop-ast (1.31.2) parser (>= 3.3.0.4) rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) @@ -402,7 +407,7 @@ GEM ruby-progressbar (1.13.0) ruby_dig (0.0.2) rubyzip (2.3.2) - selenium-webdriver (4.18.1) + selenium-webdriver (4.19.0) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -413,6 +418,9 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) sshkit (1.22.1) base64 mutex_m @@ -438,6 +446,7 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) uri (0.13.0) + version_gem (1.1.4) virtus (2.0.0) axiom-types (~> 0.1) coercible (~> 1.0) @@ -467,10 +476,10 @@ GEM PLATFORMS aarch64-linux - arm64-darwin-22 - arm64-darwin-23 - x86_64-darwin-22 - x86_64-darwin-23 + arm-linux + arm64-darwin + x86-linux + x86_64-darwin x86_64-linux DEPENDENCIES @@ -493,6 +502,7 @@ DEPENDENCIES honeybadger isni jbuilder + oauth2 (~> 2.0.x) omniauth-cas (~> 2.0.0) omniauth-orcid pg