Skip to content

Commit 5f9071c

Browse files
authored
Merge pull request #388 from Shopify/ac-release-2.6.0
Release 2.6.0
2 parents f56d998 + 2cc5b92 commit 5f9071c

File tree

3 files changed

+26
-27
lines changed

3 files changed

+26
-27
lines changed

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
rubocop-shopify (2.5.0)
4+
rubocop-shopify (2.6.0)
55
rubocop (~> 1.29)
66

77
GEM
@@ -24,9 +24,9 @@ GEM
2424
pry (~> 0.13.0)
2525
rainbow (3.1.1)
2626
rake (13.0.6)
27-
regexp_parser (2.3.1)
27+
regexp_parser (2.4.0)
2828
rexml (3.2.5)
29-
rubocop (1.29.0)
29+
rubocop (1.29.1)
3030
parallel (~> 1.10)
3131
parser (>= 3.1.0.0)
3232
rainbow (>= 2.2.2, < 4.0)

rubocop-shopify.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Gem::Specification.new do |s|
44
s.platform = Gem::Platform::RUBY
55
s.name = "rubocop-shopify"
6-
s.version = "2.5.0"
6+
s.version = "2.6.0"
77
s.summary = "Shopify's style guide for Ruby."
88
s.description = "Gem containing the rubocop.yml config that corresponds to "\
99
"the implementation of the Shopify's style guide for Ruby."

test/fixtures/full_config.yml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ Layout/HeredocArgumentClosingParenthesis:
582582
StyleGuide: "#heredoc-argument-closing-parentheses"
583583
VersionAdded: '0.68'
584584
Layout/HeredocIndentation:
585-
Description: This cop checks the indentation of the here document bodies.
585+
Description: Checks the indentation of the here document bodies.
586586
StyleGuide: "#squiggly-heredocs"
587587
Enabled: true
588588
VersionAdded: '0.49'
@@ -1040,7 +1040,7 @@ Lint/BigDecimalNew:
10401040
Enabled: true
10411041
VersionAdded: '0.53'
10421042
Lint/BinaryOperatorWithIdenticalOperands:
1043-
Description: This cop checks for places where binary operator has identical operands.
1043+
Description: Checks for places where binary operator has identical operands.
10441044
Enabled: true
10451045
Safe: false
10461046
VersionAdded: '0.89'
@@ -1188,7 +1188,7 @@ Lint/ElseLayout:
11881188
VersionAdded: '0.17'
11891189
VersionChanged: '1.2'
11901190
Lint/EmptyBlock:
1191-
Description: This cop checks for blocks without a body.
1191+
Description: Checks for blocks without a body.
11921192
Enabled: false
11931193
VersionAdded: '1.1'
11941194
VersionChanged: '1.15'
@@ -1200,8 +1200,8 @@ Lint/EmptyClass:
12001200
VersionAdded: '1.3'
12011201
AllowComments: false
12021202
Lint/EmptyConditionalBody:
1203-
Description: This cop checks for the presence of `if`, `elsif` and `unless` branches
1204-
without a body.
1203+
Description: Checks for the presence of `if`, `elsif` and `unless` branches without
1204+
a body.
12051205
Enabled: false
12061206
AllowComments: true
12071207
VersionAdded: '0.89'
@@ -1340,8 +1340,8 @@ Lint/MissingCopEnableDirective:
13401340
VersionAdded: '0.52'
13411341
MaximumRangeSize: .inf
13421342
Lint/MissingSuper:
1343-
Description: This cop checks for the presence of constructors and lifecycle callbacks
1344-
without calls to `super`.
1343+
Description: Checks for the presence of constructors and lifecycle callbacks without
1344+
calls to `super`.
13451345
Enabled: true
13461346
VersionAdded: '0.89'
13471347
VersionChanged: '1.4'
@@ -1609,20 +1609,20 @@ Lint/Syntax:
16091609
Enabled: true
16101610
VersionAdded: '0.9'
16111611
Lint/ToEnumArguments:
1612-
Description: This cop ensures that `to_enum`/`enum_for`, called for the current
1613-
method, has correct arguments.
1612+
Description: Ensures that `to_enum`/`enum_for`, called for the current method, has
1613+
correct arguments.
16141614
Enabled: false
16151615
VersionAdded: '1.1'
16161616
Lint/ToJSON:
16171617
Description: 'Ensure #to_json includes an optional argument.'
16181618
Enabled: false
16191619
VersionAdded: '0.66'
16201620
Lint/TopLevelReturnWithArgument:
1621-
Description: This cop detects top level return statements with argument.
1621+
Description: Detects top level return statements with argument.
16221622
Enabled: false
16231623
VersionAdded: '0.89'
16241624
Lint/TrailingCommaInAttributeDeclaration:
1625-
Description: This cop checks for trailing commas in attribute declarations.
1625+
Description: Checks for trailing commas in attribute declarations.
16261626
Enabled: false
16271627
VersionAdded: '0.90'
16281628
Lint/TripleQuotes:
@@ -1666,7 +1666,7 @@ Lint/UnreachableCode:
16661666
Enabled: true
16671667
VersionAdded: '0.9'
16681668
Lint/UnreachableLoop:
1669-
Description: This cop checks for loops that will have at most one iteration.
1669+
Description: Checks for loops that will have at most one iteration.
16701670
Enabled: false
16711671
VersionAdded: '0.89'
16721672
VersionChanged: '1.7'
@@ -2285,8 +2285,8 @@ Style/CaseEquality:
22852285
VersionChanged: '0.89'
22862286
AllowOnConstant: true
22872287
Style/CaseLikeIf:
2288-
Description: This cop identifies places where `if-elsif` constructions can be replaced
2289-
with `case-when`.
2288+
Description: Identifies places where `if-elsif` constructions can be replaced with
2289+
`case-when`.
22902290
StyleGuide: "#case-vs-if-else"
22912291
Enabled: false
22922292
Safe: false
@@ -2614,7 +2614,7 @@ Style/ExponentialNotation:
26142614
- engineering
26152615
- integral
26162616
Style/FetchEnvVar:
2617-
Description: This cop suggests `ENV.fetch` for the replacement of `ENV[]`.
2617+
Description: Suggests `ENV.fetch` for the replacement of `ENV[]`.
26182618
Reference:
26192619
- https://rubystyle.guide/#hash-fetch-defaults
26202620
Enabled: false
@@ -3083,9 +3083,8 @@ Style/NegatedIf:
30833083
- prefix
30843084
- postfix
30853085
Style/NegatedIfElseCondition:
3086-
Description: This cop checks for uses of `if-else` and ternary operators with a
3087-
negated condition which can be simplified by inverting condition and swapping
3088-
branches.
3086+
Description: Checks for uses of `if-else` and ternary operators with a negated condition
3087+
which can be simplified by inverting condition and swapping branches.
30893088
Enabled: false
30903089
VersionAdded: '1.2'
30913090
Style/NegatedUnless:
@@ -3525,9 +3524,9 @@ Style/ReturnNil:
35253524
- return_nil
35263525
VersionAdded: '0.50'
35273526
Style/SafeNavigation:
3528-
Description: This cop transforms usages of a method call safeguarded by a check
3529-
for the existence of the object to safe navigation (`&.`). Auto-correction is
3530-
unsafe as it assumes the object will be `nil` or truthy, but never `false`.
3527+
Description: Transforms usages of a method call safeguarded by a check for the existence
3528+
of the object to safe navigation (`&.`). Auto-correction is unsafe as it assumes
3529+
the object will be `nil` or truthy, but never `false`.
35313530
Enabled: true
35323531
VersionAdded: '0.43'
35333532
VersionChanged: '1.27'
@@ -3712,7 +3711,7 @@ Style/StructInheritance:
37123711
VersionAdded: '0.29'
37133712
VersionChanged: '1.20'
37143713
Style/SwapValues:
3715-
Description: This cop enforces the use of shorthand-style swapping of 2 variables.
3714+
Description: Enforces the use of shorthand-style swapping of 2 variables.
37163715
StyleGuide: "#values-swapping"
37173716
Enabled: false
37183717
VersionAdded: '1.1'
@@ -3755,7 +3754,7 @@ Style/TernaryParentheses:
37553754
- require_parentheses_when_complex
37563755
AllowSafeAssignment: true
37573756
Style/TopLevelMethodDefinition:
3758-
Description: This cop looks for top-level method definitions.
3757+
Description: Looks for top-level method definitions.
37593758
StyleGuide: "#top-level-methods"
37603759
Enabled: false
37613760
VersionAdded: '1.15'

0 commit comments

Comments
 (0)