Skip to content

Commit

Permalink
Merge pull request #550 from Shopify/dependabot/bundler/rubocop-1.53.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sambostock committed Jun 26, 2023
2 parents 0cf1914 + a0609aa commit 84ce09e
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 7 deletions.
14 changes: 9 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PATH
remote: .
specs:
rubocop-shopify (2.14.0)
rubocop (~> 1.52)
rubocop (~> 1.53)

GEM
remote: https://rubygems.org/
Expand All @@ -12,25 +12,29 @@ GEM
coderay (1.1.3)
diffy (3.4.2)
json (2.6.3)
language_server-protocol (3.17.0.3)
method_source (1.0.0)
minitest (5.18.1)
parallel (1.23.0)
parser (3.2.2.1)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
racc (1.7.1)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.0)
regexp_parser (2.8.1)
rexml (3.2.5)
rubocop (1.52.0)
rubocop (1.53.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.0.0)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
Expand Down
2 changes: 1 addition & 1 deletion rubocop-shopify.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ Gem::Specification.new do |s|

s.required_ruby_version = ">= 2.7.0"

s.add_dependency("rubocop", "~> 1.52")
s.add_dependency("rubocop", "~> 1.53")
end
18 changes: 18 additions & 0 deletions rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ Lint/InterpolationCheck:
Lint/LambdaWithoutLiteralBlock:
Enabled: false

Lint/MixedCaseRange:
Enabled: true

Lint/MixedRegexpCaptureTypes:
Enabled: false

Expand Down Expand Up @@ -218,6 +221,9 @@ Lint/RaiseException:
Lint/RedundantDirGlobSort:
Enabled: false

Lint/RedundantRegexpQuantifiers:
Enabled: true

Lint/RedundantRequireStatement:
Enabled: false

Expand Down Expand Up @@ -718,6 +724,9 @@ Style/RedundantConditional:
Style/RedundantConstantBase:
Enabled: true

Style/RedundantCurrentDirectoryInPath:
Enabled: true

Style/RedundantDoubleSplatHashBraces:
Enabled: true

Expand All @@ -742,6 +751,9 @@ Style/RedundantInitialize:
Style/RedundantLineContinuation:
Enabled: true

Style/RedundantRegexpArgument:
Enabled: true

Style/RedundantRegexpCharacterClass:
Enabled: false

Expand Down Expand Up @@ -772,6 +784,9 @@ Style/RescueStandardError:
Style/ReturnNil:
Enabled: true

Style/ReturnNilInPredicateMethodDefinition:
Enabled: true

Style/SelectByRegexp:
Enabled: false

Expand Down Expand Up @@ -832,5 +847,8 @@ Style/UnpackFirst:
Style/WordArray:
EnforcedStyle: brackets

Style/YAMLFileRead:
Enabled: true

Style/YodaCondition:
Enabled: false
36 changes: 35 additions & 1 deletion test/fixtures/full_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,9 @@ Layout/ClassStructure:
Description: Enforces a configured order of definitions within a class body.
StyleGuide: "#consistent-classes"
Enabled: false
SafeAutoCorrect: false
VersionAdded: '0.52'
VersionChanged: '1.53'
Categories:
module_inclusion:
- include
Expand Down Expand Up @@ -1064,7 +1066,6 @@ Lint/AmbiguousAssignment:
Lint/AmbiguousBlockAssociation:
Description: Checks for ambiguous block association with method when param passed
without parentheses.
StyleGuide: "#syntax"
Enabled: false
VersionAdded: '0.48'
VersionChanged: '1.13'
Expand Down Expand Up @@ -1435,8 +1436,15 @@ Lint/MissingSuper:
Description: Checks for the presence of constructors and lifecycle callbacks without
calls to `super`.
Enabled: true
AllowedParentClasses: []
VersionAdded: '0.89'
VersionChanged: '1.4'
Lint/MixedCaseRange:
Description: Checks for mixed-case character ranges since they include likely unintended
characters.
Enabled: true
SafeAutoCorrect: false
VersionAdded: '1.53'
Lint/MixedRegexpCaptureTypes:
Description: Do not mix named captures and numbered captures in a Regexp literal.
Enabled: false
Expand Down Expand Up @@ -1559,6 +1567,10 @@ Lint/RedundantDirGlobSort:
VersionAdded: '1.8'
VersionChanged: '1.26'
SafeAutoCorrect: false
Lint/RedundantRegexpQuantifiers:
Description: Checks for redundant quantifiers in Regexps.
Enabled: true
VersionAdded: '1.53'
Lint/RedundantRequireStatement:
Description: Checks for unnecessary `require` statement.
Enabled: false
Expand Down Expand Up @@ -3655,6 +3667,10 @@ Style/RedundantConstantBase:
Description: Avoid redundant `::` prefix on constant.
Enabled: true
VersionAdded: '1.40'
Style/RedundantCurrentDirectoryInPath:
Description: Checks for uses a redundant current directory in path.
Enabled: true
VersionAdded: '1.53'
Style/RedundantDoubleSplatHashBraces:
Description: Checks for redundant uses of double splat hash braces.
Enabled: true
Expand Down Expand Up @@ -3726,6 +3742,11 @@ Style/RedundantPercentQ:
StyleGuide: "#percent-q"
Enabled: true
VersionAdded: '0.76'
Style/RedundantRegexpArgument:
Description: Identifies places where argument can be replaced from a deterministic
regexp to a string.
Enabled: true
VersionAdded: '1.53'
Style/RedundantRegexpCharacterClass:
Description: Checks for unnecessary single-element Regexp character classes.
Enabled: false
Expand Down Expand Up @@ -3816,6 +3837,14 @@ Style/ReturnNil:
- return
- return_nil
VersionAdded: '0.50'
Style/ReturnNilInPredicateMethodDefinition:
Description: Checks if uses of `return` or `return nil` in predicate method definition.
StyleGuide: "#bool-methods-qmark"
Enabled: true
SafeAutoCorrect: false
AllowedMethods: []
AllowedPatterns: []
VersionAdded: '1.53'
Style/SafeNavigation:
Description: Transforms usages of a method call safeguarded by a check for the existence
of the object to safe navigation (`&.`). Autocorrection is unsafe as it assumes
Expand Down Expand Up @@ -4189,6 +4218,11 @@ Style/WordArray:
- brackets
MinSize: 2
WordRegex: !ruby/regexp /\A(?:\p{Word}|\p{Word}-\p{Word}|\n|\t)+\z/
Style/YAMLFileRead:
Description: Checks for the use of `YAML.load`, `YAML.safe_load`, and `YAML.parse`
with `File.read` argument.
Enabled: true
VersionAdded: '1.53'
Style/YodaCondition:
Description: Forbid or enforce yoda conditions.
Reference: https://en.wikipedia.org/wiki/Yoda_conditions
Expand Down

0 comments on commit 84ce09e

Please sign in to comment.