Skip to content

Commit

Permalink
Merge pull request #140 from chef/1.17
Browse files Browse the repository at this point in the history
Update RuboCop 1.15 -> 1.17
  • Loading branch information
tas50 authored Jun 17, 2021
2 parents b257fe4 + 2d48272 commit 75670ed
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 4 deletions.
8 changes: 8 additions & 0 deletions config/disable_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ Lint/EmptyExpression:
Enabled: false
Lint/EmptyFile:
Enabled: false
Lint/EmptyInPattern:
Enabled: false
Lint/EmptyInterpolation:
Enabled: false
Lint/EmptyWhen:
Expand Down Expand Up @@ -667,6 +669,8 @@ Style/IfWithSemicolon:
Enabled: false
Style/ImplicitRuntimeError:
Enabled: false
Style/InPatternThen:
Enabled: false
Style/InfiniteLoop:
Enabled: false
Style/InverseMethods:
Expand All @@ -687,6 +691,8 @@ Style/MethodCallWithoutArgsParentheses:
Enabled: false
Style/MethodCallWithArgsParentheses:
Enabled: false
Style/MultilineInPatternThen:
Enabled: false
Style/RedundantAssignment:
Enabled: false
Style/RedundantFetchBlock:
Expand Down Expand Up @@ -787,6 +793,8 @@ Style/PreferredHashMethods:
Enabled: false
Style/Proc:
Enabled: false
Style/QuotedSymbols:
Enabled: false
Style/RaiseArgs:
Enabled: false
Style/RandomWithOffset:
Expand Down
39 changes: 36 additions & 3 deletions config/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,11 @@ Layout/BlockEndNewline:
VersionAdded: '0.49'

Layout/CaseIndentation:
Description: 'Indentation of when in a case/when/[else/]end.'
Description: 'Indentation of when in a case/(when|in)/[else/]end.'
StyleGuide: '#indent-when-to-case'
Enabled: true
VersionAdded: '0.49'
VersionChanged: '1.16'
EnforcedStyle: case
SupportedStyles:
- case
Expand Down Expand Up @@ -771,7 +772,7 @@ Layout/HashAlignment:
Enabled: true
AllowMultipleStyles: true
VersionAdded: '0.49'
VersionChanged: '0.77'
VersionChanged: '1.16'
# Alignment of entries using hash rocket as separator. Valid values are:
#
# key - left alignment of keys
Expand Down Expand Up @@ -1645,6 +1646,12 @@ Lint/EmptyFile:
AllowComments: true
VersionAdded: '0.90'

Lint/EmptyInPattern:
Description: 'Checks for the presence of `in` pattern branches without a body.'
Enabled: pending
AllowComments: true
VersionAdded: '1.16'

Lint/EmptyInterpolation:
Description: 'Checks for empty string interpolation.'
Enabled: true
Expand Down Expand Up @@ -2092,6 +2099,7 @@ Lint/SymbolConversion:
Description: 'Checks for unnecessary symbol conversions.'
Enabled: pending
VersionAdded: '1.9'
VersionChanged: '1.16'
EnforcedStyle: strict
SupportedStyles:
- strict
Expand Down Expand Up @@ -3490,8 +3498,10 @@ Style/HashEachMethods:
Description: 'Use Hash#each_key and Hash#each_value.'
StyleGuide: '#hash-each'
Enabled: true
VersionAdded: '0.80'
Safe: false
VersionAdded: '0.80'
VersionChanged: '1.16'
AllowedReceivers: []

Style/HashExcept:
Description: >-
Expand Down Expand Up @@ -3554,6 +3564,7 @@ Style/IdenticalConditionalBranches:
out of the conditional.
Enabled: true
VersionAdded: '0.36'
VersionChanged: '1.16'

Style/IfInsideElse:
Description: 'Finds if nodes inside else, which can be converted to elsif.'
Expand Down Expand Up @@ -3600,6 +3611,12 @@ Style/ImplicitRuntimeError:
Enabled: false
VersionAdded: '0.41'

Style/InPatternThen:
Description: 'Checks for `in;` uses in `case` expressions.'
StyleGuide: '#no-in-pattern-semicolons'
Enabled: pending
VersionAdded: '1.16'

Style/InfiniteLoop:
Description: >-
Use Kernel#loop for infinite loops.
Expand Down Expand Up @@ -3828,6 +3845,12 @@ Style/MultilineIfThen:
VersionAdded: '0.9'
VersionChanged: '0.26'

Style/MultilineInPatternThen:
Description: 'Do not use `then` for multi-line `in` statement.'
StyleGuide: '#no-then'
Enabled: pending
VersionAdded: '1.16'

Style/MultilineMemoization:
Description: 'Wrap multiline memoizations in a `begin` and `end` block.'
Enabled: true
Expand Down Expand Up @@ -4186,6 +4209,16 @@ Style/Proc:
VersionAdded: '0.9'
VersionChanged: '0.18'

Style/QuotedSymbols:
Description: 'Use a consistent style for quoted symbols.'
Enabled: pending
VersionAdded: '1.16'
EnforcedStyle: same_as_string_literals
SupportedStyles:
- same_as_string_literals
- single_quotes
- double_quotes

Style/RaiseArgs:
Description: 'Checks the arguments passed to raise/fail.'
StyleGuide: '#exception-class-messages'
Expand Down
2 changes: 1 addition & 1 deletion lib/chefstyle/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module Chefstyle
VERSION = "2.0.4"
RUBOCOP_VERSION = "1.15.0"
RUBOCOP_VERSION = "1.17.0"
end

0 comments on commit 75670ed

Please sign in to comment.