From 211b3263dc0ce0d67abb4f9cff6d3d7a9324220f Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 22 Jan 2025 14:36:23 +0100 Subject: [PATCH 1/2] Bump pronto-rubocop from 0.11.5 to 0.11.6 Bumps [pronto-rubocop](https://github.com/mmozuras/pronto-rubocop) from 0.11.5 to 0.11.6. - [Release notes](https://github.com/mmozuras/pronto-rubocop/releases) - [Commits](prontolabs/pronto-rubocop@v0.11.5...v0.11.6) NOTE: Keeping the current version of the rugged gem instead of upgrading seems to solve the issue, as mentioned in prontolabs/pronto#447. --- Gemfile | 2 +- Gemfile.lock | 42 ++++++++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Gemfile b/Gemfile index 8aacd2710..6789d5745 100644 --- a/Gemfile +++ b/Gemfile @@ -98,7 +98,7 @@ group :development do gem "pronto", "~> 0.11.2", require: false gem "pronto-erb_lint", "~> 0.1.6", require: false gem "pronto-eslint", "~> 0.11.1", require: false - gem "pronto-rubocop", "~> 0.11.5", require: false + gem "pronto-rubocop", "~> 0.11.6", require: false gem "pronto-stylelint", "~> 0.10.3", require: false gem "rubocop", "~> 1.66.1", require: false gem "rubocop-capybara", "~> 2.21.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3b1841b23..23242ca72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,7 +105,7 @@ GEM erubi (~> 1.4) parser (>= 2.4) smart_properties - bigdecimal (3.1.8) + bigdecimal (3.1.9) bindex (0.8.1) bing_translator (6.2.0) json @@ -171,6 +171,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.3.4) crass (1.0.6) + csv (3.3.2) daemons (1.4.1) dalli (3.2.8) date (3.4.1) @@ -221,12 +222,12 @@ GEM railties (>= 5.0.0) faker (3.4.2) i18n (>= 1.8.11, < 2) - faraday (2.12.0) - faraday-net_http (>= 2.0, < 3.4) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) json logger - faraday-net_http (3.3.0) - net-http + faraday-net_http (3.4.0) + net-http (>= 0.5.0) ffi (1.17.0) fiber-storage (1.0.0) file_validators (3.0.0) @@ -239,7 +240,7 @@ GEM activemodel (>= 4.1, < 7.1) activesupport (>= 4.1, < 7.1) railties (>= 4.1, < 7.1) - gitlab (4.19.0) + gitlab (4.20.1) httparty (~> 0.20) terminal-table (>= 1.5.1) globalid (1.2.1) @@ -268,7 +269,8 @@ GEM hashie (5.0.0) highline (2.0.3) htmlentities (4.3.4) - httparty (0.21.0) + httparty (0.22.0) + csv mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) httpi (4.0.4) @@ -297,7 +299,7 @@ GEM irb (1.12.0) rdoc reline (>= 0.4.2) - json (2.7.3) + json (2.9.1) jwt (2.9.3) base64 kaminari (1.2.2) @@ -328,7 +330,7 @@ GEM letter_opener (~> 1.9) railties (>= 6.1) rexml - logger (1.6.1) + logger (1.6.5) loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -362,7 +364,7 @@ GEM multi_xml (0.7.1) bigdecimal (~> 3.1) mutex_m (0.2.0) - net-http (0.4.1) + net-http (0.6.0) uri net-imap (0.5.4) date @@ -393,7 +395,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - octokit (7.2.0) + octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) omniauth (2.1.2) @@ -425,7 +427,7 @@ GEM parallel (1.26.3) paranoia (3.0.0) activerecord (>= 6, < 8.1) - parser (3.3.6.0) + parser (3.3.7.0) ast (~> 2.4.1) racc pdf-reader (2.12.0) @@ -438,10 +440,10 @@ GEM pg_search (2.3.7) activerecord (>= 6.1) activesupport (>= 6.1) - pronto (0.11.2) + pronto (0.11.3) gitlab (>= 4.4.0, < 5.0) httparty (>= 0.13.7, < 1.0) - octokit (>= 4.7.0, < 8.0) + octokit (>= 4.7.0, < 10.0) rainbow (>= 2.2, < 4.0) rexml (>= 3.2.5, < 4.0) rugged (>= 0.23.0, < 2.0) @@ -452,7 +454,7 @@ GEM pronto-eslint (0.11.1) eslintrb (~> 2.0, >= 2.0.0) pronto (~> 0.11.0) - pronto-rubocop (0.11.5) + pronto-rubocop (0.11.6) pronto (~> 0.11.0) rubocop (>= 0.63.1, < 2.0) pronto-stylelint (0.10.3) @@ -513,7 +515,7 @@ GEM recipient_interceptor (0.3.2) mail redcarpet (3.6.0) - regexp_parser (2.9.2) + regexp_parser (2.10.0) reline (0.5.1) io-console (~> 0.5) request_store (1.7.0) @@ -521,7 +523,7 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.3.9) + rexml (3.4.0) rinku (2.0.6) ros-apartment (2.11.0) activerecord (>= 5.0.0, < 7.1) @@ -555,7 +557,7 @@ GEM rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.32.3) + rubocop-ast (1.37.0) parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) @@ -668,7 +670,7 @@ GEM uglifier (4.2.1) execjs (>= 0.3.0, < 3) unicode-display_width (2.6.0) - uri (0.13.1) + uri (1.0.2) uuidtools (2.2.0) version_gem (1.1.4) view_component (3.11.0) @@ -765,7 +767,7 @@ DEPENDENCIES pronto (~> 0.11.2) pronto-erb_lint (~> 0.1.6) pronto-eslint (~> 0.11.1) - pronto-rubocop (~> 0.11.5) + pronto-rubocop (~> 0.11.6) pronto-stylelint (~> 0.10.3) puma (~> 5.6.9) rails (= 7.0.8.7) From d8381204f178e24922b3885a71388d4f7f41e702 Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 22 Jan 2025 15:57:04 +0100 Subject: [PATCH 2/2] Add faraday-retry gem In order to remove an information text related to Faraday every time we execute `pronto run`: > To use retry middleware with Faraday v2.0+, install faraday-retry gem --- Gemfile | 1 + Gemfile.lock | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 6789d5745..d8544afe0 100644 --- a/Gemfile +++ b/Gemfile @@ -94,6 +94,7 @@ group :development do gem "capistrano3-delayed-job", "~> 1.7.6" gem "capistrano3-puma", "~> 5.2.0" gem "erb_lint", "~> 0.6.0", require: false + gem "faraday-retry", "~> 2.2.1", require: false gem "mdl", "~> 0.13.0", require: false gem "pronto", "~> 0.11.2", require: false gem "pronto-erb_lint", "~> 0.1.6", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 23242ca72..1bbb2f4cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -228,6 +228,8 @@ GEM logger faraday-net_http (3.4.0) net-http (>= 0.5.0) + faraday-retry (2.2.1) + faraday (~> 2.0) ffi (1.17.0) fiber-storage (1.0.0) file_validators (3.0.0) @@ -738,6 +740,7 @@ DEPENDENCIES exiftool_vendored (~> 12.97.0) factory_bot_rails (~> 6.4.3) faker (~> 3.4.2) + faraday-retry (~> 2.2.1) file_validators (~> 3.0.0) font-awesome-sass (~> 5.15.1) foundation_rails_helper (~> 4.0.1)