Skip to content

Commit

Permalink
Merge pull request #132 from chef/bump_rubocop
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <tsmith@chef.io>
  • Loading branch information
tas50 authored Mar 24, 2021
2 parents 6ce904f + c398ed1 commit 542c763
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
2 changes: 2 additions & 0 deletions config/disable_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,8 @@ Style/StabbyLambdaParentheses:
Enabled: false
Style/StderrPuts:
Enabled: false
Style/StringChars:
Enabled: false
Style/StringConcatenation:
Enabled: false
Style/StringHashKeys:
Expand Down
17 changes: 16 additions & 1 deletion config/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2055,13 +2055,18 @@ Lint/SuppressedException:
StyleGuide: '#dont-hide-exceptions'
Enabled: true
AllowComments: true
AllowNil: true
VersionAdded: '0.9'
VersionChanged: '0.81'
VersionChanged: '1.12'

Lint/SymbolConversion:
Description: 'Checks for unnecessary symbol conversions.'
Enabled: pending
VersionAdded: '1.9'
EnforcedStyle: strict
SupportedStyles:
- strict
- consistent

Lint/Syntax:
Description: 'Checks for syntax errors.'
Expand Down Expand Up @@ -2489,6 +2494,7 @@ Naming/MemoizedInstanceVariableName:
- disallowed
- required
- optional
Safe: false

Naming/MethodName:
Description: 'Use the configured style when naming methods.'
Expand Down Expand Up @@ -3174,6 +3180,7 @@ Style/Documentation:
Description: 'Document classes and non-namespace modules.'
Enabled: true
VersionAdded: '0.9'
AllowedConstants: []
Exclude:
- 'spec/**/*'
- 'test/**/*'
Expand Down Expand Up @@ -3672,6 +3679,7 @@ Style/MethodCallWithArgsParentheses:
AllowParenthesesInMultilineCall: false
AllowParenthesesInChaining: false
AllowParenthesesInCamelCaseMethod: false
AllowParenthesesInStringInterpolation: false
EnforcedStyle: require_parentheses
SupportedStyles:
- require_parentheses
Expand Down Expand Up @@ -4491,6 +4499,13 @@ Style/StderrPuts:
Enabled: true
VersionAdded: '0.51'

Style/StringChars:
Description: 'Checks for uses of `String#split` with empty string or regexp literal argument.'
StyleGuide: '#string-chars'
Enabled: pending
Safe: false
VersionAdded: '1.12'

Style/StringConcatenation:
Description: 'Checks for places where string concatenation can be replaced with string interpolation.'
StyleGuide: '#string-interpolation'
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 = "1.7.3"
RUBOCOP_VERSION = "1.11.0"
RUBOCOP_VERSION = "1.12.0"
end

0 comments on commit 542c763

Please sign in to comment.