From 3537120f41102cb29c7512cb923c476ba78faec5 Mon Sep 17 00:00:00 2001 From: "Andrew W. Lee" Date: Tue, 14 Jun 2022 16:38:03 -0700 Subject: [PATCH 1/5] Run `rubocop --auto-gen-config` --- .rubocop_todo.yml | 136 +++++++++++++++------------------------------- 1 file changed, 45 insertions(+), 91 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 76684755..2c2aafcc 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,13 +1,21 @@ # This configuration was generated by -# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 42` -# on 2021-04-10 09:49:03 UTC using RuboCop version 1.12.1. +# `rubocop --auto-gen-config` +# on 2022-06-14 23:37:23 UTC using RuboCop version 1.30.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. +# Offense count: 1 +# This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: Include. +# Include: **/*.gemspec +Gemspec/DeprecatedAttributeAssignment: + Exclude: + - 'http.gemspec' + # Offense count: 53 -# Cop supports --auto-correct. +# This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle. # SupportedStyles: leading, trailing Layout/DotPosition: @@ -22,29 +30,13 @@ Layout/DotPosition: - 'spec/lib/http_spec.rb' - 'spec/support/http_handling_shared.rb' -# Offense count: 174 -# Cop supports --auto-correct. +# Offense count: 176 +# This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces. # SupportedStyles: space, no_space, compact # SupportedStylesForEmptyBraces: space, no_space Layout/SpaceInsideHashLiteralBraces: - Exclude: - - 'lib/http/chainable.rb' - - 'spec/lib/http/client_spec.rb' - - 'spec/lib/http/features/auto_inflate_spec.rb' - - 'spec/lib/http/features/instrumentation_spec.rb' - - 'spec/lib/http/features/logging_spec.rb' - - 'spec/lib/http/headers_spec.rb' - - 'spec/lib/http/options/features_spec.rb' - - 'spec/lib/http/options/merge_spec.rb' - - 'spec/lib/http/options/new_spec.rb' - - 'spec/lib/http/redirector_spec.rb' - - 'spec/lib/http/request_spec.rb' - - 'spec/lib/http/response_spec.rb' - - 'spec/lib/http_spec.rb' - - 'spec/support/dummy_server/servlet.rb' - - 'spec/support/http_handling_shared.rb' - - 'spec/support/ssl_helper.rb' + Enabled: false # Offense count: 4 Lint/MissingSuper: @@ -55,85 +47,43 @@ Lint/MissingSuper: - 'lib/http/features/normalize_uri.rb' # Offense count: 8 -# Configuration parameters: IgnoredMethods, CountRepeatedAttributes, Max. +# Configuration parameters: IgnoredMethods, CountRepeatedAttributes. Metrics/AbcSize: - Exclude: - - 'lib/http/chainable.rb' - - 'lib/http/client.rb' - - 'lib/http/connection.rb' - - 'lib/http/features/auto_deflate.rb' - - 'lib/http/redirector.rb' - - 'lib/http/request.rb' - - 'lib/http/response.rb' + Max: 33 -# Offense count: 66 -# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods. +# Offense count: 69 +# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. # IgnoredMethods: refine Metrics/BlockLength: - Exclude: - - '**/*.gemspec' - - 'spec/lib/http/client_spec.rb' - - 'spec/lib/http/connection_spec.rb' - - 'spec/lib/http/content_type_spec.rb' - - 'spec/lib/http/features/auto_deflate_spec.rb' - - 'spec/lib/http/features/auto_inflate_spec.rb' - - 'spec/lib/http/features/instrumentation_spec.rb' - - 'spec/lib/http/features/logging_spec.rb' - - 'spec/lib/http/headers/mixin_spec.rb' - - 'spec/lib/http/headers_spec.rb' - - 'spec/lib/http/options/merge_spec.rb' - - 'spec/lib/http/redirector_spec.rb' - - 'spec/lib/http/request/body_spec.rb' - - 'spec/lib/http/request/writer_spec.rb' - - 'spec/lib/http/request_spec.rb' - - 'spec/lib/http/response/body_spec.rb' - - 'spec/lib/http/response/parser_spec.rb' - - 'spec/lib/http/response/status_spec.rb' - - 'spec/lib/http/response_spec.rb' - - 'spec/lib/http_spec.rb' - - 'spec/support/http_handling_shared.rb' + Max: 435 # Offense count: 4 -# Configuration parameters: CountComments, Max, CountAsOne. +# Configuration parameters: CountComments, CountAsOne. Metrics/ClassLength: - Exclude: - - 'lib/http/client.rb' - - 'lib/http/connection.rb' - - 'lib/http/headers.rb' - - 'lib/http/request.rb' + Max: 128 # Offense count: 2 -# Configuration parameters: IgnoredMethods, Max. +# Configuration parameters: IgnoredMethods. Metrics/CyclomaticComplexity: - Exclude: - - 'lib/http/chainable.rb' - - 'lib/http/client.rb' + Max: 8 -# Offense count: 19 -# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods. +# Offense count: 18 +# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods. Metrics/MethodLength: - Exclude: - - 'lib/http/chainable.rb' - - 'lib/http/client.rb' - - 'lib/http/connection.rb' - - 'lib/http/features/auto_deflate.rb' - - 'lib/http/features/auto_inflate.rb' - - 'lib/http/headers.rb' - - 'lib/http/options.rb' - - 'lib/http/redirector.rb' - - 'lib/http/request.rb' - - 'lib/http/response.rb' - - 'lib/http/response/body.rb' - - 'lib/http/timeout/global.rb' + Max: 24 # Offense count: 1 -# Configuration parameters: CountComments, Max, CountAsOne. +# Configuration parameters: CountComments, CountAsOne. Metrics/ModuleLength: + Max: 110 + +# Offense count: 1 +Security/CompoundHash: Exclude: - - 'lib/http/chainable.rb' + - 'lib/http/uri.rb' # Offense count: 2 -# Cop supports --auto-correct. +# This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle. # SupportedStyles: separated, grouped Style/AccessorGrouping: @@ -141,7 +91,7 @@ Style/AccessorGrouping: - 'lib/http/request.rb' # Offense count: 4 -# Cop supports --auto-correct. +# This cop supports safe autocorrection (--autocorrect). Style/EmptyCaseCondition: Exclude: - 'lib/http/client.rb' @@ -150,7 +100,7 @@ Style/EmptyCaseCondition: - 'lib/http/response/status.rb' # Offense count: 5 -# Cop supports --auto-correct. +# This cop supports safe autocorrection (--autocorrect). Style/Encoding: Exclude: - 'spec/lib/http/client_spec.rb' @@ -159,8 +109,14 @@ Style/Encoding: - 'spec/lib/http_spec.rb' - 'spec/support/dummy_server/servlet.rb' +# Offense count: 2 +# This cop supports safe autocorrection (--autocorrect). +Style/IfUnlessModifier: + Exclude: + - 'lib/http/connection.rb' + # Offense count: 17 -# Configuration parameters: SuspiciousParamNames. +# Configuration parameters: SuspiciousParamNames, Allowlist. # SuspiciousParamNames: options, opts, args, params, parameters Style/OptionHash: Exclude: @@ -183,10 +139,8 @@ Style/OptionalBooleanParameter: - 'lib/http/uri.rb' # Offense count: 3 -# Cop supports --auto-correct. -# Configuration parameters: AutoCorrect, Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# This cop supports safe autocorrection (--autocorrect). +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns. # URISchemes: http, https Layout/LineLength: - Exclude: - - 'lib/http/chainable.rb' - - 'spec/lib/http/options/proxy_spec.rb' + Max: 143 From 3f4f7b2e31381b48fc5a92edf98692288c97bcc0 Mon Sep 17 00:00:00 2001 From: "Andrew W. Lee" Date: Tue, 14 Jun 2022 16:46:25 -0700 Subject: [PATCH 2/5] Add debug step to lint step --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fab8f8d2..e68f8fce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,6 +59,9 @@ jobs: ruby-version: 2.5 bundler-cache: true + - name: Display rubocop version + run: bundle exec rubocop -V + - name: bundle exec rubocop run: bundle exec rubocop --format progress --color From 81103436699b495399fd4bcca9b6e51b3b71f56e Mon Sep 17 00:00:00 2001 From: "Andrew W. Lee" Date: Tue, 14 Jun 2022 16:48:56 -0700 Subject: [PATCH 3/5] Revert "Add debug step to lint step" This reverts commit 3f4f7b2e31381b48fc5a92edf98692288c97bcc0. --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e68f8fce..fab8f8d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,9 +59,6 @@ jobs: ruby-version: 2.5 bundler-cache: true - - name: Display rubocop version - run: bundle exec rubocop -V - - name: bundle exec rubocop run: bundle exec rubocop --format progress --color From d526fdff6aa4207375d3993f2902d26ed11d01bd Mon Sep 17 00:00:00 2001 From: "Andrew W. Lee" Date: Tue, 14 Jun 2022 16:50:31 -0700 Subject: [PATCH 4/5] Pin Rubocop version to last Ruby 2.5 version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 05a8dcf9..ad78c510 100644 --- a/Gemfile +++ b/Gemfile @@ -27,7 +27,7 @@ group :test do gem "backports" - gem "rubocop", "~> 1.21" + gem "rubocop", "~> 1.28.2" gem "rubocop-performance" gem "rubocop-rake" gem "rubocop-rspec" From c82ea46d5c2a9cba06d821819731e2691366fa52 Mon Sep 17 00:00:00 2001 From: "Andrew W. Lee" Date: Tue, 14 Jun 2022 16:50:58 -0700 Subject: [PATCH 5/5] Run `rubocop --auto-gen-config` --- .rubocop_todo.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 2c2aafcc..dc8d5ba2 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,21 +1,13 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2022-06-14 23:37:23 UTC using RuboCop version 1.30.1. +# on 2022-06-14 23:50:50 UTC using RuboCop version 1.28.2. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 1 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: Include. -# Include: **/*.gemspec -Gemspec/DeprecatedAttributeAssignment: - Exclude: - - 'http.gemspec' - # Offense count: 53 -# This cop supports safe autocorrection (--autocorrect). +# This cop supports safe auto-correction (--auto-correct). # Configuration parameters: EnforcedStyle. # SupportedStyles: leading, trailing Layout/DotPosition: @@ -31,7 +23,7 @@ Layout/DotPosition: - 'spec/support/http_handling_shared.rb' # Offense count: 176 -# This cop supports safe autocorrection (--autocorrect). +# This cop supports safe auto-correction (--auto-correct). # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces. # SupportedStyles: space, no_space, compact # SupportedStylesForEmptyBraces: space, no_space @@ -83,7 +75,7 @@ Security/CompoundHash: - 'lib/http/uri.rb' # Offense count: 2 -# This cop supports safe autocorrection (--autocorrect). +# This cop supports safe auto-correction (--auto-correct). # Configuration parameters: EnforcedStyle. # SupportedStyles: separated, grouped Style/AccessorGrouping: @@ -91,7 +83,7 @@ Style/AccessorGrouping: - 'lib/http/request.rb' # Offense count: 4 -# This cop supports safe autocorrection (--autocorrect). +# This cop supports safe auto-correction (--auto-correct). Style/EmptyCaseCondition: Exclude: - 'lib/http/client.rb' @@ -100,7 +92,7 @@ Style/EmptyCaseCondition: - 'lib/http/response/status.rb' # Offense count: 5 -# This cop supports safe autocorrection (--autocorrect). +# This cop supports safe auto-correction (--auto-correct). Style/Encoding: Exclude: - 'spec/lib/http/client_spec.rb' @@ -109,8 +101,15 @@ Style/Encoding: - 'spec/lib/http_spec.rb' - 'spec/support/dummy_server/servlet.rb' +# Offense count: 1 +# This cop supports safe auto-correction (--auto-correct). +# Configuration parameters: AllowedVars. +Style/FetchEnvVar: + Exclude: + - 'spec/spec_helper.rb' + # Offense count: 2 -# This cop supports safe autocorrection (--autocorrect). +# This cop supports safe auto-correction (--auto-correct). Style/IfUnlessModifier: Exclude: - 'lib/http/connection.rb' @@ -139,7 +138,7 @@ Style/OptionalBooleanParameter: - 'lib/http/uri.rb' # Offense count: 3 -# This cop supports safe autocorrection (--autocorrect). +# This cop supports safe auto-correction (--auto-correct). # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns. # URISchemes: http, https Layout/LineLength: