Verified Commit f2321dbc authored by Vitaly Slobodin's avatar Vitaly Slobodin 🔮
Browse files

Update `gitlab-styles` to v13 to get new Rubocop version 

Update the `gitlab-styles` gem to pull
new Rubocop version that supports Ruby 3.
parent 9a3b30ce

.rubocop.yml

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ inherit_gem: 
    - rubocop-default.yml



AllCops:

  TargetRubyVersion: 2.7

  TargetRubyVersion: 3.2

  NewCops: disable



Style/HashSyntax:

  EnforcedStyle: no_mixed_keys

.rubocop_todo.yml

+269 −73
Original line number Diff line number Diff line 
# This configuration was generated by

# `rubocop --auto-gen-config`

# on 2021-04-18 00:00:00 UTC using RuboCop version 0.93.1.

# on 2024-12-18 15:23:53 UTC using RuboCop version 1.68.0.

# 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: 51

# Cop supports --auto-correct.

CodeReuse/ActiveRecord:

# Offense count: 3

Cop/AvoidReturnFromBlocks:

  Exclude:

    - 'spec/labkit/correlation/grpc/client_interceptor_spec.rb'

    - 'spec/labkit/correlation/grpc/server_interceptor_spec.rb'

    - 'spec/labkit/middleware/rack_spec.rb'

    - 'spec/labkit/middleware/sidekiq/client_spec.rb'

    - 'spec/labkit/middleware/sidekiq/context/server_spec.rb'

    - 'spec/labkit/middleware/sidekiq/server_spec.rb'

    - 'spec/labkit/middleware/sidekiq/tracing/client_spec.rb'

    - 'spec/labkit/middleware/sidekiq/tracing/server_spec.rb'

    - 'spec/labkit/tracing/factory_spec.rb'

    - 'spec/labkit/tracing/grpc/client_interceptor_spec.rb'

    - 'spec/labkit/tracing/grpc/server_interceptor_spec.rb'

    - 'spec/labkit/tracing_spec.rb'

    - 'spec/support/tracing/shared_examples.rb'

    - 'lib/labkit/excon_publisher.rb'

    - 'lib/labkit/httpclient_publisher.rb'

    - 'lib/labkit/net_http_publisher.rb'



# Offense count: 1

# Offense count: 23

# This cop supports safe autocorrection (--autocorrect).

Fips/OpenSSL:

  Exclude:

    - 'lib/labkit/fips.rb'

    - 'spec/labkit/fips_spec.rb'



# Offense count: 4

Fips/SHA1:

  Exclude:

    - 'spec/labkit/fips_spec.rb'



# Offense count: 8

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: Include.

# Include: **/*.gemspec

Gemspec/RequiredRubyVersion:

Gemspec/AddRuntimeDependency:

  Exclude:

    - 'gitlab-labkit.gemspec'



# Offense count: 1

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.

# Include: **/*.gemspec

Gemspec/OrderedDependencies:

  Exclude:

    - 'gitlab-labkit.gemspec'



# Offense count: 6

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: EnforcedStyle, IndentationWidth.

# SupportedStyles: with_first_argument, with_fixed_indentation

Layout/ArgumentAlignment:

  Exclude:

    - 'spec/labkit/context_spec.rb'



# Offense count: 1

# This cop supports unsafe autocorrection (--autocorrect-all).

# Configuration parameters: Categories, ExpectedOrder.

# ExpectedOrder: module_inclusion, constants, public_class_methods, initializer, public_methods, protected_methods, private_methods

Layout/ClassStructure:

  Exclude:

    - 'lib/labkit/tracing/rack_middleware.rb'



# Offense count: 1

# This cop supports safe autocorrection (--autocorrect).

Layout/EmptyLineAfterMagicComment:

  Exclude:

    - 'lib/labkit/logging/json_logger.rb'



# Offense count: 1

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.

# SupportedHashRocketStyles: key, separator, table

# SupportedColonStyles: key, separator, table
@@ -42,11 +74,31 @@ Layout/HashAlignment: 
    - 'spec/labkit/context_spec.rb'



# Offense count: 1

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: EnforcedStyle, IndentationWidth.

# SupportedStyles: aligned, indented

Layout/MultilineOperationIndentation:

  Exclude:

    - 'lib/labkit/logging/json_logger.rb'



# Offense count: 10

Lint/BinaryOperatorWithIdenticalOperands:

  Exclude:

    - 'spec/labkit/tracing/rails/action_view/render_collection_instrumenter_spec.rb'

    - 'spec/labkit/tracing/rails/action_view/render_partial_instrumenter_spec.rb'

    - 'spec/labkit/tracing/rails/active_support/cache_read_instrumenter_spec.rb'

    - 'spec/labkit/tracing/redis/redis_interceptor_helper_spec.rb'

    - 'spec/logging/sanitizer_spec.rb'



# Offense count: 1

# This cop supports unsafe autocorrection (--autocorrect-all).

Lint/BooleanSymbol:

  Exclude:

    - 'spec/labkit/context_spec.rb'



# Offense count: 4

# Configuration parameters: AllowedMethods.

# AllowedMethods: enums

Lint/ConstantDefinitionInBlock:

  Exclude:

    - 'spec/labkit/middleware/sidekiq/client_spec.rb'
@@ -54,52 +106,117 @@ Lint/ConstantDefinitionInBlock: 
    - 'spec/labkit/middleware/sidekiq/context/server_spec.rb'

    - 'spec/labkit/middleware/sidekiq/server_spec.rb'



# Offense count: 4

# Configuration parameters: AllowComments, AllowEmptyLambdas.

Lint/EmptyBlock:

  Exclude:

    - 'spec/labkit/tracing/rack_middleware_spec.rb'

    - 'spec/labkit/tracing_spec.rb'

    - 'spec/support/grpc_service/test_service_impl.rb'



# Offense count: 1

# Cop supports --auto-correct.

# This cop supports unsafe autocorrection (--autocorrect-all).

# Configuration parameters: AllowedMethods.

# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?

# AllowedMethods: instance_of?, kind_of?, is_a?, eql?, respond_to?, equal?, presence, present?

Lint/RedundantSafeNavigation:

  Exclude:

    - 'lib/labkit/tracing.rb'



# Offense count: 1

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: AllowedMethods.

# AllowedMethods: present?, blank?, presence, try, try!

Lint/SafeNavigationConsistency:

  Exclude:

    - 'lib/labkit/tracing.rb'



# Offense count: 11

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: EnforcedStyle.

# SupportedStyles: strict, consistent

Lint/SymbolConversion:

  Exclude:

    - 'lib/labkit/tracing/tracing_utils.rb'

    - 'spec/labkit/logging/json_logger_spec.rb'

    - 'spec/support/tracing/shared_examples.rb'



# Offense count: 1

# Configuration parameters: Methods.

Lint/UnexpectedBlockArity:

  Exclude:

    - 'tools/update-changelog.rb'



# Offense count: 41

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.

Lint/UnusedMethodArgument:

  Exclude:

    - 'lib/labkit/correlation/grpc/client_interceptor.rb'

    - 'lib/labkit/correlation/grpc/server_interceptor.rb'

    - 'lib/labkit/fips.rb'

    - 'lib/labkit/logging/grpc/server_interceptor.rb'

    - 'lib/labkit/logging/json_logger.rb'

    - 'lib/labkit/tracing/grpc/client_interceptor.rb'

    - 'lib/labkit/tracing/grpc/server_interceptor.rb'

    - 'lib/labkit/tracing/rails/active_support/cache_delete_instrumenter.rb'

    - 'lib/labkit/tracing/rails/active_support/cache_fetch_hit_instrumenter.rb'

    - 'lib/labkit/tracing/rails/active_support/cache_generate_instrumenter.rb'

    - 'lib/labkit/tracing/rails/active_support/cache_read_instrumenter.rb'

    - 'lib/labkit/tracing/rails/active_support/cache_write_instrumenter.rb'



# Offense count: 1

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: PreferredName.

Naming/RescuedExceptionsVariableName:

  Exclude:

    - 'lib/labkit/logging/grpc/server_interceptor.rb'



# Offense count: 2

# Offense count: 1

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: EnabledForFlattenWithoutParams.

Performance/FlatMap:

  Exclude:

    - 'tools/update-changelog.rb'



# Offense count: 1

Performance/MethodObjectAsBlock:

  Exclude:

    - 'lib/labkit/context.rb'



# Offense count: 1

# Configuration parameters: Prefixes.

# This cop supports unsafe autocorrection (--autocorrect-all).

RSpec/BeEq:

  Exclude:

    - 'spec/labkit/middleware/sidekiq/context/client_spec.rb'



# Offense count: 8

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: EnforcedStyle.

# SupportedStyles: be, be_nil

RSpec/BeNil:

  Exclude:

    - 'spec/labkit/tracing/rails/action_view_spec.rb'



# Offense count: 3

# Configuration parameters: Prefixes, AllowedPatterns.

# Prefixes: when, with, without

RSpec/ContextWording:

  Exclude:

    - 'spec/labkit/logging/json_logger_spec.rb'

    - 'spec/labkit/middleware/sidekiq/server_spec.rb'



# Offense count: 3

# Cop supports --auto-correct.

# Configuration parameters: SkipBlocks, EnforcedStyle.

# This cop supports unsafe autocorrection (--autocorrect-all).

# Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.

# SupportedStyles: described_class, explicit

RSpec/DescribedClass:

  Exclude:

    - 'spec/labkit/tracing_spec.rb'



# Offense count: 2

# Configuration parameters: CustomTransform, IgnoreMethods, SpecSuffixOnly.

RSpec/FilePath:

  Exclude:

    - 'spec/labkit/httpclient_publisher_spec.rb'

    - 'spec/logging/sanitizer_spec.rb'



# Offense count: 3

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: EnforcedStyle.

# SupportedStyles: single_line_only, single_statement_only, disallow

# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit

RSpec/ImplicitSubject:

  Exclude:

    - 'spec/labkit/correlation/correlation_id_spec.rb'
@@ -113,67 +230,110 @@ RSpec/LeakyConstantDeclaration: 
    - 'spec/labkit/middleware/sidekiq/server_spec.rb'



# Offense count: 2

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: AutoCorrect.

RSpec/LetBeforeExamples:

  Exclude:

    - 'spec/labkit/tracing_spec.rb'



# Offense count: 18

# Offense count: 20

# Configuration parameters: AllowSubject.

RSpec/MultipleMemoizedHelpers:

  Max: 7



# Offense count: 24

# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.

# SupportedStyles: always, named_only

RSpec/NamedSubject:

  Exclude:

    - 'spec/labkit/logging/json_logger_spec.rb'

    - 'spec/labkit/middleware/sidekiq/tracing/client_spec.rb'

    - 'spec/labkit/middleware/sidekiq/tracing/server_spec.rb'

    - 'spec/labkit/tracing/rack_middleware_spec.rb'



# Offense count: 1

RSpec/RemoveConst:

  Exclude:

    - 'spec/labkit/fips_spec.rb'



# Offense count: 15

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: AutoCorrect.

RSpec/ScatteredLet:

  Exclude:

    - 'spec/labkit/excon_publisher_spec.rb'

    - 'spec/labkit/httpclient_publisher_spec.rb'

    - 'spec/labkit/net_http_publisher_spec.rb'



# Offense count: 2

# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.

# Include: **/*_spec.rb

RSpec/SpecFilePathFormat:

  Exclude:

    - 'spec/labkit/httpclient_publisher_spec.rb'

    - 'spec/logging/sanitizer_spec.rb'



# Offense count: 4

# This cop supports unsafe autocorrection (--autocorrect-all).

# Configuration parameters: EnforcedStyle.

# SupportedStyles: constant, string

RSpec/VerifiedDoubleReference:

  Exclude:

    - 'spec/labkit/tracing/redis/redis_interceptor_helper_spec.rb'



# Offense count: 12

# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.

RSpec/VerifiedDoubles:

  Exclude:

    - 'spec/labkit/middleware/rack_spec.rb'

    - 'spec/labkit/middleware/sidekiq/client_spec.rb'

    - 'spec/labkit/middleware/sidekiq/server_spec.rb'

    - 'spec/labkit/middleware/sidekiq/tracing/client_spec.rb'

    - 'spec/labkit/tracing/factory_spec.rb'

    - 'spec/labkit/tracing/rails/action_view_spec.rb'

    - 'spec/labkit/tracing_spec.rb'

    - 'spec/support/tracing/shared_examples.rb'



# Offense count: 1

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: EnforcedStyle.

# SupportedStyles: slashes, arguments

Rails/FilePath:

  Exclude:

    - 'lib/labkit/tracing/rails/action_view.rb'



# Offense count: 1

# This cop supports unsafe autocorrection (--autocorrect-all).

Rails/NegateInclude:

  Exclude:

    - 'spec/labkit/correlation/grpc/client_interceptor_spec.rb'



# Offense count: 3

# Cop supports --auto-correct.

# This cop supports unsafe autocorrection (--autocorrect-all).

# Configuration parameters: Include.

# Include: **/Rakefile, **/*.rake

Rails/RakeEnvironment:

  Exclude:

    - 'lib/capistrano/tasks/**/*.rake'

    - 'Rakefile'



# Offense count: 3

# This cop supports unsafe autocorrection (--autocorrect-all).

# Configuration parameters: EnforcedStyle.

# SupportedStyles: strict, flexible

Rails/TimeZone:

  Exclude:

    - 'lib/labkit/logging/grpc/server_interceptor.rb'

    - 'spec/labkit/logging/json_logger_spec.rb'



# Offense count: 1

# Configuration parameters: AllowedChars.

# AllowedChars: ©

Style/AsciiComments:

  Exclude:

    - 'spec/support/grpc_service/test_service_impl.rb'



# Offense count: 1

# Cop supports --auto-correct.

Style/CaseLikeIf:

  Exclude:

    - 'lib/labkit/excon_publisher.rb'



# Offense count: 23

# Cop supports --auto-correct.

Style/ExplicitBlockArgument:

  Exclude:

    - 'lib/labkit/correlation/grpc/server_interceptor.rb'

    - 'lib/labkit/logging/grpc/server_interceptor.rb'

    - 'lib/labkit/middleware/sidekiq/client.rb'

    - 'lib/labkit/middleware/sidekiq/context/server.rb'

    - 'lib/labkit/middleware/sidekiq/server.rb'

    - 'lib/labkit/middleware/sidekiq/tracing/server.rb'

    - 'lib/labkit/tracing/grpc/client_interceptor.rb'

    - 'lib/labkit/tracing/grpc/server_interceptor.rb'

    - 'lib/labkit/tracing/redis/redis_interceptor_helper.rb'



# Offense count: 8

# Cop supports --auto-correct.

# This cop supports unsafe autocorrection (--autocorrect-all).

# Configuration parameters: EnforcedStyle.

# SupportedStyles: always, always_true, never

Style/FrozenStringLiteralComment:
@@ -188,47 +348,83 @@ Style/FrozenStringLiteralComment: 
    - 'tools/update-changelog.rb'



# Offense count: 2

# Cop supports --auto-correct.

# This cop supports unsafe autocorrection (--autocorrect-all).

Style/GlobalStdStream:

  Exclude:

    - 'lib/labkit/tracing/jaeger_factory.rb'



# Offense count: 1

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.

Style/GuardClause:

  Exclude:

    - 'lib/labkit/logging/json_logger.rb'



# Offense count: 3

# Cop supports --auto-correct.

# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.

# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys

# SupportedShorthandSyntax: always, never, either, consistent, either_consistent

Style/HashSyntax:

  Exclude:

    - 'spec/labkit/excon_publisher_spec.rb'



# Offense count: 1

# This cop supports safe autocorrection (--autocorrect).

Style/IfUnlessModifier:

  Exclude:

    - 'lib/labkit/tracing/jaeger_factory.rb'



# Offense count: 1

# This cop supports unsafe autocorrection (--autocorrect-all).

Style/LineEndConcatenation:

  Exclude:

    - 'lib/labkit/logging/json_logger.rb'



# Offense count: 16

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: PreferredDelimiters.

Style/PercentLiteralDelimiters:

  Exclude:

    - 'spec/labkit/tracing/redis/redis_interceptor_helper_spec.rb'



# Offense count: 2

# Cop supports --auto-correct.

# Offense count: 1

# This cop supports safe autocorrection (--autocorrect).

Style/RedundantBegin:

  Exclude:

    - 'Rakefile'

    - 'spec/labkit/net_http_publisher_spec.rb'



# Offense count: 3

# This cop supports safe autocorrection (--autocorrect).

Style/RedundantFreeze:

  Exclude:

    - 'lib/labkit/logging/sanitizer.rb'

    - 'lib/labkit/tracing/redis/redis_interceptor_helper.rb'



# Offense count: 1

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

Style/RedundantRegexpEscape:

  Exclude:

    - 'lib/labkit/logging/sanitizer.rb'



# Offense count: 1

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: AllowMultipleReturnValues.

Style/RedundantReturn:

  Exclude:

    - 'lib/labkit/tracing/jaeger_factory.rb'



# Offense count: 3

# This cop supports unsafe autocorrection (--autocorrect-all).

# Configuration parameters: Mode.

Style/StringConcatenation:

  Exclude:

    - 'lib/labkit/logging/json_logger.rb'

    - 'lib/labkit/tracing/jaeger_factory.rb'

    - 'lib/labkit/tracing/redis/redis_interceptor_helper.rb'



# Offense count: 28

# Cop supports --auto-correct.

# This cop supports safe autocorrection (--autocorrect).

# Configuration parameters: EnforcedStyleForMultiline.

# SupportedStylesForMultiline: comma, consistent_comma, no_comma

Style/TrailingCommaInArrayLiteral:

gitlab-labkit.gemspec

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec| 
  spec.add_development_dependency "excon", "~> 0.78.1"

  spec.add_development_dependency "faraday", "~> 1.10.3"

  spec.add_development_dependency "gitlab-dangerfiles", "~> 2.11.0"

  spec.add_development_dependency "gitlab-styles", "~> 6.2.0"

  spec.add_development_dependency "gitlab-styles", "~> 13.0.2"

  spec.add_development_dependency "grpc-tools", ">= 1.62"

  spec.add_development_dependency "httparty", "~> 0.22.0"

  spec.add_development_dependency "httpclient", "~> 2.8.3"