Skip to content

Commit ccb3aa7

Browse files
authored
Merge pull request #486 from Shopify/dependabot/bundler/rubocop-1.44.0
Bump rubocop from 1.42.0 to 1.44.0
2 parents f32f7c2 + f53b5b4 commit ccb3aa7

File tree

4 files changed

+65
-12
lines changed

4 files changed

+65
-12
lines changed

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PATH
22
remote: .
33
specs:
44
rubocop-shopify (2.11.1)
5-
rubocop (~> 1.42)
5+
rubocop (~> 1.44)
66

77
GEM
88
remote: https://rubygems.org/
@@ -15,7 +15,7 @@ GEM
1515
method_source (1.0.0)
1616
minitest (5.17.0)
1717
parallel (1.22.1)
18-
parser (3.1.3.0)
18+
parser (3.2.0.0)
1919
ast (~> 2.4.1)
2020
pry (0.14.1)
2121
coderay (~> 1.1)
@@ -25,22 +25,22 @@ GEM
2525
pry (>= 0.13, < 0.15)
2626
rainbow (3.1.1)
2727
rake (13.0.6)
28-
regexp_parser (2.6.1)
28+
regexp_parser (2.6.2)
2929
rexml (3.2.5)
30-
rubocop (1.42.0)
30+
rubocop (1.44.0)
3131
json (~> 2.3)
3232
parallel (~> 1.10)
33-
parser (>= 3.1.2.1)
33+
parser (>= 3.2.0.0)
3434
rainbow (>= 2.2.2, < 4.0)
3535
regexp_parser (>= 1.8, < 3.0)
3636
rexml (>= 3.2.5, < 4.0)
3737
rubocop-ast (>= 1.24.1, < 2.0)
3838
ruby-progressbar (~> 1.7)
39-
unicode-display_width (>= 1.4.0, < 3.0)
39+
unicode-display_width (>= 2.4.0, < 3.0)
4040
rubocop-ast (1.24.1)
4141
parser (>= 3.1.1.0)
4242
ruby-progressbar (1.11.0)
43-
unicode-display_width (2.3.0)
43+
unicode-display_width (2.4.2)
4444

4545
PLATFORMS
4646
ruby

rubocop-shopify.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
2323

2424
s.required_ruby_version = ">= 2.7.0"
2525

26-
s.add_dependency("rubocop", "~> 1.42")
26+
s.add_dependency("rubocop", "~> 1.44")
2727
end

rubocop.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Bundler/OrderedGems:
1212
Gemspec/DeprecatedAttributeAssignment:
1313
Enabled: true
1414

15+
Gemspec/DevelopmentDependencies:
16+
Enabled: false
17+
1518
Gemspec/RequireMFA:
1619
Enabled: false
1720

@@ -305,6 +308,9 @@ Lint/UriRegexp:
305308
Lint/UselessMethodDefinition:
306309
Enabled: false
307310

311+
Lint/UselessRescue:
312+
Enabled: true
313+
308314
Lint/UselessRuby2Keywords:
309315
Enabled: true
310316

@@ -445,6 +451,9 @@ Style/CommandLiteral:
445451
Style/CommentedKeyword:
446452
Enabled: false
447453

454+
Style/ComparableClamp:
455+
Enabled: true
456+
448457
Style/ConcatArrayLiterals:
449458
Enabled: true
450459

@@ -556,6 +565,9 @@ Style/InPatternThen:
556565
Style/InverseMethods:
557566
Enabled: false
558567

568+
Style/InvertibleUnlessCondition:
569+
Enabled: true
570+
559571
Style/KeywordParametersOrder:
560572
Enabled: false
561573

@@ -784,6 +796,3 @@ Style/WordArray:
784796

785797
Style/YodaCondition:
786798
Enabled: false
787-
788-
Style/YodaExpression:
789-
Enabled: false

test/fixtures/full_config.yml

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,22 @@ Gemspec/DeprecatedAttributeAssignment:
184184
VersionChanged: '1.40'
185185
Include:
186186
- "**/*.gemspec"
187+
Gemspec/DevelopmentDependencies:
188+
Description: Checks that development dependencies are specified in Gemfile rather
189+
than gemspec.
190+
Enabled: false
191+
VersionAdded: '1.44'
192+
EnforcedStyle: Gemfile
193+
SupportedStyles:
194+
- Gemfile
195+
- gems.rb
196+
- gemspec
197+
AllowedGems:
198+
- bundler
199+
Include:
200+
- "**/*.gemspec"
201+
- "**/Gemfile"
202+
- "**/gems.rb"
187203
Gemspec/DuplicatedAssignment:
188204
Description: An attribute assignment method calls should be listed only once in
189205
a gemspec.
@@ -1815,6 +1831,10 @@ Lint/UselessMethodDefinition:
18151831
VersionAdded: '0.90'
18161832
VersionChanged: '0.91'
18171833
Safe: false
1834+
Lint/UselessRescue:
1835+
Description: Checks for useless `rescue`s.
1836+
Enabled: true
1837+
VersionAdded: '1.43'
18181838
Lint/UselessRuby2Keywords:
18191839
Description: Finds unnecessary uses of `ruby2_keywords`.
18201840
Enabled: true
@@ -2536,6 +2556,11 @@ Style/CommentedKeyword:
25362556
SafeAutoCorrect: false
25372557
VersionAdded: '0.51'
25382558
VersionChanged: '1.19'
2559+
Style/ComparableClamp:
2560+
Description: Enforces the use of `Comparable#clamp` instead of comparison by minimum
2561+
and maximum.
2562+
Enabled: true
2563+
VersionAdded: '1.44'
25392564
Style/ConcatArrayLiterals:
25402565
Description: Enforces the use of `Array#push(item)` instead of `Array#concat([item])`
25412566
to avoid redundant array literals.
@@ -2869,7 +2894,8 @@ Style/HashEachMethods:
28692894
Safe: false
28702895
VersionAdded: '0.80'
28712896
VersionChanged: '1.16'
2872-
AllowedReceivers: []
2897+
AllowedReceivers:
2898+
- Thread.current
28732899
Style/HashExcept:
28742900
Description: Checks for usages of `Hash#reject`, `Hash#select`, and `Hash#filter`
28752901
methods that can be replaced with `Hash#except` method.
@@ -2991,6 +3017,23 @@ Style/InverseMethods:
29913017
InverseBlocks:
29923018
:select: :reject
29933019
:select!: :reject!
3020+
Style/InvertibleUnlessCondition:
3021+
Description: Favor `if` with inverted condition over `unless`.
3022+
Enabled: true
3023+
VersionAdded: '1.44'
3024+
InverseMethods:
3025+
:!=: :==
3026+
:>: :<=
3027+
:<=: :>
3028+
:<: :>=
3029+
:>=: :<
3030+
:!~: :=~
3031+
:zero?: :nonzero?
3032+
:nonzero?: :zero?
3033+
:any?: :none?
3034+
:none?: :any?
3035+
:even?: :odd?
3036+
:odd?: :even?
29943037
Style/IpAddresses:
29953038
Description: Don't include literal IP addresses in code.
29963039
Enabled: false
@@ -4113,6 +4156,7 @@ Style/YodaExpression:
41134156
Enabled: false
41144157
Safe: false
41154158
VersionAdded: '1.42'
4159+
VersionChanged: '1.43'
41164160
SupportedOperators:
41174161
- "*"
41184162
- "+"

0 commit comments

Comments
 (0)