chefstyle 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59f6eeec9124e1a5b410c337a2f397960cbecb40
-  data.tar.gz: 7700043724c67630b39c5610ccac56e0bd6d7953
+  metadata.gz: 5381b1c87d477aa07cf1c2a9f82ad8f4c46f3732
+  data.tar.gz: b8cce9e6e91fa46824f9101a219e6a14402421de
 SHA512:
-  metadata.gz: b2770939d4ebc8e963867abcd588c3796b2096288cccf1b81d4136bf8bcffd8613537392415632b8d2f552ce7abf1f77aaa02a9344fffe72f6156d903229ebf7
-  data.tar.gz: 8d85d02ec98ab91bdcadd783c3a603542a8fc2c17f909f762865eb5430b7f7775362c1b5ea211dd38751c323397e6dfa04223257f1fbf37b0c4014588a3c503c
+  metadata.gz: 8a72c4b7756e89bd293acf7f3c126147d32f8c8ff158fbad5b41d1eecc6cc5b7e242e86ef8bf484626e5fdf53aea99c673df0a646625788276997d3e028cc27c
+  data.tar.gz: 8c90216a9a3d71ec0bafbe8286f5777296fa2025f113583e74c6e5b8a5e6a42dfe9b90fb98579d6392610b287cea7515065f8fea8c37360438e4b1ea526cd0c0

data/README.md

@@ -101,6 +101,28 @@ guard :rubocop, cli: "--config #{Chefstyle.config}" do
 end
 ```
 
+### git pre-commit hoooks
+
+In any repo a pre-commit hook can be used in .git/hooks/pre-commit to catch offenses before checkin:
+
+```ruby
+#!/usr/bin/env ruby
+
+changed_files = `git diff --name-only --cached`.split.select { |f| File.extname(f) == ".rb" }
+
+unless changed_files.empty?
+  system "chefstyle #{changed_files.join(" ")}"
+  unless $?.success?
+    puts "\n\nthere was a chefstyle error, please fix before commiting:"
+    puts "(chefstyle -a may be able to autofix these issues for you)\n\n"
+  end
+end
+exit $?.to_s[-1].to_i
+```
+
+For whatever `$REASON` git does not allow easily distributing hooks in the repo itself so each individual user
+needs to set this up.
+
 ### .rubocop.yml
 
 As with vanilla RuboCop, any custom settings can still be placed in a `.rubocop.yml` file in the root of your project.

data/config/chefstyle.yml

@@ -32,8 +32,12 @@ Lint/EndInMethod:
   Enabled: true
 Lint/EnsureReturn:
   Enabled: true
+Lint/FloatOutOfRange:
+  Enabled: true
 Lint/FormatParameterMismatch:
   Enabled: true
+Lint/ImplicitStringConcatenation:
+  Enabled: true
 Lint/InvalidCharacterLiteral:
   Enabled: true
 Lint/LiteralInCondition:
@@ -42,22 +46,32 @@ Lint/LiteralInInterpolation:
   Enabled: true
 Lint/Loop:
   Enabled: true
+Lint/NestedMethodDefinition:
+  Enabled: true
+Lint/NextWithoutAccumulator:
+  Enabled: true
 Lint/NonLocalExitFromIterator:
   Enabled: true
+Lint/RandOne:
+  Enabled: true
 Lint/RequireParentheses:
   Enabled: true
 Lint/StringConversionInInterpolation:
   Enabled: true
-Lint/UnneededDisable:
+Lint/UnderscorePrefixedVariableName:
   Enabled: true
 Lint/UnreachableCode:
   Enabled: true
+Lint/UselessAccessModifier:
+  Enabled: true
 Lint/UselessComparison:
   Enabled: true
 Lint/UselessElseWithoutRescue:
   Enabled: true
 Lint/UselessSetterCall:
   Enabled: true
+Lint/Void:
+  Enabled: true
 
 #
 # Disabled Lint
@@ -76,20 +90,38 @@ Lint/HandleExceptions:
 Lint/RescueException:
   Enabled: false
 
+# we have lots of not-insecure uses of eval
+Lint/Eval:
+  Enabled: false
+
+# disabling this will make it easier to stage chefstyle rollouts
+Lint/UnneededDisable:
+  Enabled: false
+
 #
 # Performance
 #
 
-Performance/CaseCmp:
+Performance/Casecmp:
   Enabled: true
 Performance/CaseWhenSplat:
   Enabled: true
+Performance/Count:
+  Enabled: true
 Performance/Detect:
   Enabled: true
+Performance/DoubleStartEndWith:
+  Enabled: true
+Performance/EndWith:
+  Enabled: true
 Performance/FixedSize:
   Enabled: true
 Performance/FlatMap:
   Enabled: true
+Performance/HashEachMethods:
+  Enabled: true
+Performance/LstripRstrip:
+  Enabled: true
 Performance/RangeInclude:
   Enabled: true
 Performance/RedundantBlockCall:
@@ -98,14 +130,20 @@ Performance/RedundantMatch:
   Enabled: true
 Performance/RedundantMerge:
   Enabled: true
+Performance/RedundantSortBy:
+  Enabled: true
 Performance/ReverseEach:
   Enabled: true
 Performance/Sample:
   Enabled: true
 Performance/Size:
   Enabled: true
+Performance/StartWith:
+  Enabled: true
 Performance/StringReplacement:
   Enabled: true
+Performance/TimesMap:
+  Enabled: true
 
 #
 # Rails
@@ -166,6 +204,8 @@ Metrics/PerceivedComplexity:
 # Style
 #
 
+Style/AccessModifierIndentation:
+  Enabled: true
 Style/AlignHash:
   Enabled: true
 Style/AndOr:
@@ -178,6 +218,8 @@ Style/Attr:
   Enabled: true
 Style/BeginBlock:
   Enabled: true
+Style/BlockDelimiters:
+  Enabled: true
 Style/CharacterLiteral:
   Enabled: true
 Style/ClassMethods:
@@ -186,6 +228,8 @@ Style/ColonMethodCall:
   Enabled: true
 Style/CommandLiteral:
   Enabled: true
+Style/ConstantName:
+  Enabled: true
 Style/ElseAlignment:
   Enabled: true
 Style/EmptyLineBetweenDefs:
@@ -208,8 +252,14 @@ Style/FlipFlop:
   Enabled: true
 Style/For:
   Enabled: true
+Style/FrozenStringLiteralComment:
+  Enabled: true
+Style/IfUnlessModifierOfIfUnless:
+  Enabled: true
 Style/IfWithSemicolon:
   Enabled: true
+Style/IndentAssignment:
+  Enabled: true
 Style/IndentationConsistency:
   Enabled: true
 Style/IndentationWidth:
@@ -222,9 +272,17 @@ Style/LambdaCall:
   Enabled: true
 Style/MethodDefParentheses:
   Enabled: true
+Style/MultilineBlockLayout:
+  Enabled: true
+Style/MultilineIfThen:
+  Enabled: true
+Style/MultilineMethodDefinitionBraceLayout:
+  Enabled: true
 Style/MultilineOperationIndentation:
   Enabled: true
   EnforcedStyle: indented
+Style/MultilineTernaryOperator:
+  Enabled: true
 Style/NegatedWhile:
   Enabled: true
 Style/NestedModifier:
@@ -233,6 +291,10 @@ Style/NestedTernaryOperator:
   Enabled: true
 Style/OneLineConditional:
   Enabled: true
+Style/OpMethod:
+  Enabled: true
+Style/OptionalArguments:
+  Enabled: true
 Style/ParenthesesAroundCondition:
   Enabled: true
 # - The chef source code predominantly uses {} for %,%i,%q,%Q,%r,%w,%W
@@ -254,6 +316,8 @@ Style/PercentLiteralDelimiters:
     '%x': '{}'
 Style/PercentQLiterals:
   Enabled: true
+Style/RedundantException:
+  Enabled: true
 Style/RedundantFreeze:
   Enabled: true
 Style/RescueEnsureAlignment:
@@ -268,6 +332,8 @@ Style/SpaceAfterComma:
   Enabled: true
 Style/SpaceAfterMethodName:
   Enabled: true
+Style/SpaceAfterSemicolon:
+  Enabled: true
 Style/SpaceAroundBlockParameters:
   Enabled: true
 Style/SpaceAroundEqualsInParameterDefault:
@@ -276,8 +342,12 @@ Style/SpaceAroundOperators:
   Enabled: true
 Style/SpaceBeforeBlockBraces:
   Enabled: true
+Style/SpaceBeforeComment:
+  Enabled: true
 Style/SpaceBeforeFirstArg:
   Enabled: true
+Style/SpaceBeforeSemicolon:
+  Enabled: true
 Style/SpaceAroundKeyword:
   Enabled: true
 Style/SpaceInsideBlockBraces:
@@ -292,8 +362,12 @@ Style/StabbyLambdaParentheses:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
   Enabled: true
+Style/StructInheritance:
+  Enabled: true
 Style/SymbolLiteral:
   Enabled: true
+Style/StringMethods:
+  Enabled: true
 Style/Tab:
   Enabled: true
 Style/TrailingBlankLines:
@@ -312,10 +386,14 @@ Style/UnneededCapitalW:
   Enabled: true
 #Style/UnneededPercentQ:  # would like to enable this one but its buggy as of 0.35.1
 #  Enabled: true
+Style/VariableName:
+  Enabled: true
 Style/WhenThen:
   Enabled: true
 Style/WhileUntilDo:
   Enabled: true
+Style/WhileUntilModifier:
+  Enabled: true
 Style/WordArray:
   Enabled: true
 
@@ -368,3 +446,19 @@ Style/IndentHash:
 #  - https://github.com/chef/chef/pull/4541
 Style/TrivialAccessors:
   Enabled: false
+
+# Not a lot of offenses and this seems to catch code that looks otherwise fine to my eye
+Style/MultilineBlockChain:
+  Enabled: false
+
+# We see nothing at all wrong with a trailing `rescue nil`
+Style/RescueModifier:
+  Enabled: false
+
+# Resulted in a bit of a bikeshed over names with unicode chars vs silently hidden unicode chars in comments
+Style/AsciiComments:
+  Enabled: false
+
+# Parens around ternaries often make them more readable and reduces cognitive load over operator precidence
+Style/TernaryParentheses:
+  Enabled: false

data/config/disable_all.yml

@@ -45,6 +45,8 @@ Lint/HandleExceptions:
   Enabled: false
 Lint/ImplicitStringConcatenation:
   Enabled: false
+Lint/InheritException:
+  Enabled: false
 Lint/IneffectiveAccessModifier:
   Enabled: false
 Lint/InvalidCharacterLiteral:
@@ -63,12 +65,18 @@ Lint/NonLocalExitFromIterator:
   Enabled: false
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
+Lint/PercentStringArray:
+  Enabled: false
+Lint/PercentSymbolArray:
+  Enabled: false
 Lint/RandOne:
   Enabled: false
 Lint/RequireParentheses:
   Enabled: false
 Lint/RescueException:
   Enabled: false
+Lint/ShadowedException:
+  Enabled: false
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 Lint/StringConversionInInterpolation:
@@ -85,6 +93,8 @@ Lint/UnusedMethodArgument:
   Enabled: false
 Lint/UselessAccessModifier:
   Enabled: false
+Lint/UselessArraySplat:
+  Enabled: false
 Lint/UselessAssignment:
   Enabled: false
 Lint/UselessComparison:
@@ -133,6 +143,8 @@ Performance/HashEachMethods:
   Enabled: false
 Performance/LstripRstrip:
   Enabled: false
+Performance/PushSplat:
+  Enabled: false
 Performance/RangeInclude:
   Enabled: false
 Performance/RedundantBlockCall:
@@ -227,7 +239,7 @@ Style/Copyright:
   Enabled: false
 Style/DefWithParentheses:
   Enabled: false
-Style/DeprecatedHashMethods:
+Style/PreferredHashMethods:
   Enabled: false
 Style/Documentation:
   Enabled: false
@@ -235,10 +247,14 @@ Style/DotPosition:
   Enabled: false
 Style/DoubleNegation:
   Enabled: false
+Style/EachForSimpleLoop:
+  Enabled: false
 Style/EachWithObject:
   Enabled: false
 Style/ElseAlignment:
   Enabled: false
+Style/EmptyCaseCondition:
+  Enabled: false
 Style/EmptyElse:
   Enabled: false
 Style/EmptyLineBetweenDefs:
@@ -303,6 +319,8 @@ Style/IfUnlessModifierOfIfUnless:
   Enabled: false
 Style/IfWithSemicolon:
   Enabled: false
+Style/ImplicitRuntimeError:
+  Enabled: false
 Style/IndentArray:
   Enabled: false
 Style/IndentAssignment:
@@ -335,6 +353,8 @@ Style/MethodDefParentheses:
   Enabled: false
 Style/MethodName:
   Enabled: false
+Style/MethodMissing:
+  Enabled: false
 Style/MissingElse:
   Enabled: false
 Style/ModuleFunction:
@@ -383,6 +403,10 @@ Style/Not:
   Enabled: false
 Style/NumericLiterals:
   Enabled: false
+Style/NumericLiteralPrefix:
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false
 Style/OneLineConditional:
   Enabled: false
 Style/OpMethod:
@@ -465,6 +489,8 @@ Style/SpaceBeforeFirstArg:
   Enabled: false
 Style/SpaceBeforeSemicolon:
   Enabled: false
+Style/SpaceInsideArrayPercentLiteral:
+  Enabled: false
 Style/SpaceInsideBlockBraces:
   Enabled: false
 Style/SpaceInsideBrackets:
@@ -473,6 +499,8 @@ Style/SpaceInsideHashLiteralBraces:
   Enabled: false
 Style/SpaceInsideParens:
   Enabled: false
+Style/SpaceInsidePercentLiteralDelimiters:
+  Enabled: false
 Style/SpaceInsideRangeLiteral:
   Enabled: false
 Style/SpaceInsideStringInterpolation:
@@ -497,6 +525,8 @@ Style/SymbolProc:
   Enabled: false
 Style/Tab:
   Enabled: false
+Style/TernaryParentheses:
+  Enabled: false
 Style/TrailingBlankLines:
   Enabled: false
 Style/TrailingCommaInArguments:
@@ -537,21 +567,31 @@ Rails/Date:
   Enabled: false
 Rails/Delegate:
   Enabled: false
+Rails/Exit:
+  Enabled: false
 Rails/FindBy:
   Enabled: false
 Rails/FindEach:
   Enabled: false
 Rails/HasAndBelongsToMany:
   Enabled: false
+Rails/OutputSafety:
+  Enabled: false
 Rails/Output:
   Enabled: false
 Rails/PluralizationGrammar:
   Enabled: false
 Rails/ReadWriteAttribute:
   Enabled: false
+Rails/RequestReferer:
+  Enabled: false
+Rails/SaveBang:
+  Enabled: false
 Rails/ScopeArgs:
   Enabled: false
 Rails/TimeZone:
   Enabled: false
+Rails/UniqBeforePluck:
+  Enabled: false
 Rails/Validation:
   Enabled: false

data/config/disabled.yml

@@ -5,6 +5,11 @@
 Rails:
   Enabled: false
 
+Rails/SaveBang:
+  Description: 'Identifies possible cases where Active Record save! or related should be used.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#save-bang'
+  Enabled: false
+
 Style/AutoResourceCleanup:
   Description: 'Suggests the usage of an auto resource cleanup version of a method (if available).'
   Enabled: false
@@ -47,6 +52,12 @@ Style/FirstMethodParameterLineBreak:
                  multi-line method parameter definition.
   Enabled: false
 
+Style/ImplicitRuntimeError:
+  Description: >-
+                 Use `raise` or `fail` with an explicit exception class and
+                 message, rather than just a message.
+  Enabled: false
+
 Style/InlineComment:
   Description: 'Avoid inline comments.'
   Enabled: false
@@ -73,39 +84,11 @@ Style/MissingElse:
     - case
     - both
 
-Style/MultilineArrayBraceLayout:
-  Description: >-
-                 Checks that the closing brace in an array literal is
-                 symmetrical with respect to the opening brace and the
-                 array elements.
-  Enabled: false
-
 Style/MultilineAssignmentLayout:
   Description: 'Check for a newline after the assignment operator in multi-line assignments.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#indent-conditional-assignment'
   Enabled: false
 
-Style/MultilineHashBraceLayout:
-  Description: >-
-                 Checks that the closing brace in a hash literal is
-                 symmetrical with respect to the opening brace and the
-                 hash elements.
-  Enabled: false
-
-Style/MultilineMethodCallBraceLayout:
-  Description: >-
-                 Checks that the closing brace in a method call is
-                 symmetrical with respect to the opening brace and the
-                 method arguments.
-  Enabled: false
-
-Style/MultilineMethodDefinitionBraceLayout:
-  Description: >-
-                 Checks that the closing brace in a method definition is
-                 symmetrical with respect to the opening brace and the
-                 method parameters.
-  Enabled: false
-
 Style/OptionHash:
   Description: "Don't use option hashes when you can use keyword arguments."
   Enabled: false

data/config/enabled.yml

@@ -7,6 +7,7 @@ Style/AccessModifierIndentation:
 
 Style/AccessorMethodName:
   Description: Check the naming of accessor methods for get_/set_.
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#accessor_mutator_method_names'
   Enabled: true
 
 Style/Alias:
@@ -170,8 +171,8 @@ Style/DefWithParentheses:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#method-parens'
   Enabled: true
 
-Style/DeprecatedHashMethods:
-  Description: 'Checks for use of deprecated Hash methods.'
+Style/PreferredHashMethods:
+  Description: 'Checks use of `has_key?` and `has_value?` Hash methods.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#hash-key'
   Enabled: true
 
@@ -192,6 +193,12 @@ Style/DoubleNegation:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-bang-bang'
   Enabled: true
 
+Style/EachForSimpleLoop:
+  Description: >-
+                 Use `Integer#times` for a simple loop which iterates a fixed
+                 number of times.
+  Enabled: true
+
 Style/EachWithObject:
   Description: 'Prefer `each_with_object` over `inject` or `reduce`.'
   Enabled: true
@@ -204,6 +211,10 @@ Style/EmptyElse:
   Description: 'Avoid empty else-clauses.'
   Enabled: true
 
+Style/EmptyCaseCondition:
+  Description: 'Avoid empty condition in case statements.'
+  Enabled: true
+
 Style/EmptyLineBetweenDefs:
   Description: 'Use empty lines between defs.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#empty-lines-between-methods'
@@ -406,11 +417,23 @@ Style/MethodName:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#snake-case-symbols-methods-vars'
   Enabled: true
 
+Style/MethodMissing:
+  Description: 'Avoid using `method_missing`.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-method-missing'
+  Enabled: true
+
 Style/ModuleFunction:
   Description: 'Checks for usage of `extend self` in modules.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#module-function'
   Enabled: true
 
+Style/MultilineArrayBraceLayout:
+  Description: >-
+                 Checks that the closing brace in an array literal is
+                 either on the same line as the last array element, or
+                 a new line.
+  Enabled: true
+
 Style/MultilineBlockChain:
   Description: 'Avoid multi-line chains of blocks.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#single-line-blocks'
@@ -420,17 +443,38 @@ Style/MultilineBlockLayout:
   Description: 'Ensures newlines after multiline block do statements.'
   Enabled: true
 
+Style/MultilineHashBraceLayout:
+  Description: >-
+                 Checks that the closing brace in a hash literal is
+                 either on the same line as the last hash element, or
+                 a new line.
+  Enabled: true
+
 Style/MultilineIfThen:
   Description: 'Do not use then for multi-line if/unless.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-then'
   Enabled: true
 
+Style/MultilineMethodCallBraceLayout:
+  Description: >-
+                 Checks that the closing brace in a method call is
+                 either on the same line as the last method argument, or
+                 a new line.
+  Enabled: true
+
 Style/MultilineMethodCallIndentation:
   Description: >-
                  Checks indentation of method calls with the dot operator
                  that span more than one line.
   Enabled: true
 
+Style/MultilineMethodDefinitionBraceLayout:
+  Description: >-
+                 Checks that the closing brace in a method definition is
+                 either on the same line as the last method parameter, or
+                 a new line.
+  Enabled: true
+
 Style/MultilineOperationIndentation:
   Description: >-
                  Checks indentation of binary operations that span more than
@@ -503,6 +547,17 @@ Style/NumericLiterals:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscores-in-numerics'
   Enabled: true
 
+Style/NumericLiteralPrefix:
+  Description: 'Use smallcase prefixes for numeric literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#numeric-literal-prefixes'
+  Enabled: true
+
+Style/NumericPredicate:
+  Description: >-
+                 Checks for the use of predicate- or comparison methods for
+                 numeric comparisons.
+  Enabled: true
+
 Style/OneLineConditional:
   Description: >-
                  Favor the ternary operator(?:) over
@@ -716,6 +771,14 @@ Style/SpaceAroundOperators:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-operators'
   Enabled: true
 
+Style/SpaceInsideArrayPercentLiteral:
+  Description: 'No unnecessary additional spaces between elements in %i/%w literals.'
+  Enabled: true
+
+Style/SpaceInsidePercentLiteralDelimiters:
+  Description: 'No unnecessary spaces inside delimiters of %i/%w/%x literals.'
+  Enabled: true
+
 Style/SpaceInsideBrackets:
   Description: 'No spaces after [ or before ].'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-spaces-braces'
@@ -780,6 +843,10 @@ Style/Tab:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#spaces-indentation'
   Enabled: true
 
+Style/TernaryParentheses:
+  Description: 'Checks for use of parentheses around ternary conditions.'
+  Enabled: true
+
 Style/TrailingBlankLines:
   Description: 'Checks trailing blank lines and final newline.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#newline-eof'
@@ -787,7 +854,7 @@ Style/TrailingBlankLines:
 
 Style/TrailingCommaInArguments:
   Description: 'Checks for trailing comma in argument lists.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-params-comma'
   Enabled: true
 
 Style/TrailingCommaInLiteral:
@@ -1035,6 +1102,10 @@ Lint/IneffectiveAccessModifier:
                  the visibility of a class method, which does not work.
   Enabled: true
 
+Lint/InheritException:
+  Description: 'Avoid inheriting from the `Exception` class.'
+  Enabled: true
+
 Lint/InvalidCharacterLiteral:
   Description: >-
                  Checks for invalid character literals with a non-escaped
@@ -1078,6 +1149,16 @@ Lint/ParenthesesAsGroupedExpression:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#parens-no-spaces'
   Enabled: true
 
+Lint/PercentStringArray:
+  Description: >-
+                 Checks for unwanted commas and quotes in %w/%W literals.
+  Enabled: true
+
+Lint/PercentSymbolArray:
+  Description: >-
+                 Checks for unwanted commas and colons in %i/%I literals.
+  Enabled: true
+
 Lint/RandOne:
   Description: >-
                  Checks for `rand(1)` calls. Such calls always return `0`
@@ -1095,6 +1176,12 @@ Lint/RescueException:
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-blind-rescues'
   Enabled: true
 
+Lint/ShadowedException:
+  Description: >-
+                  Avoid rescuing a higher level exception
+                  before a lower level exception.
+  Enabled: true
+
 Lint/ShadowingOuterLocalVariable:
   Description: >-
                  Do not use the same name as outer local variable
@@ -1134,6 +1221,11 @@ Lint/UnreachableCode:
 Lint/UselessAccessModifier:
   Description: 'Checks for useless access modifiers.'
   Enabled: true
+  ContextCreatingMethods: []
+
+Lint/UselessArraySplat:
+  Description: 'Checks for useless array splats.'
+  Enabled: true
 
 Lint/UselessAssignment:
   Description: 'Checks for useless assignment to a local variable.'
@@ -1234,6 +1326,10 @@ Performance/LstripRstrip:
   Description: 'Use `strip` instead of `lstrip.rstrip`.'
   Enabled: true
 
+Performance/PushSplat:
+  Description: 'Use `concat` instead of `push(*)`.'
+  Enabled: true
+
 Performance/RangeInclude:
   Description: 'Use `Range#cover?` instead of `Range#include?`.'
   Reference: 'https://github.com/JuanitoFatas/fast-ruby#cover-vs-include-code'
@@ -1311,22 +1407,36 @@ Rails/Delegate:
   Description: 'Prefer delegate method for delegations.'
   Enabled: true
 
+Rails/Exit:
+  Description: >-
+                  Favor `fail`, `break`, `return`, etc. over `exit` in
+                  application or library code outside of Rake files to avoid
+                  exits during unit testing or running in production.
+  Enabled: true
+
 Rails/FindBy:
   Description: 'Prefer find_by over where.first.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find_by'
   Enabled: true
 
 Rails/FindEach:
   Description: 'Prefer all.find_each over all.find.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#find-each'
   Enabled: true
 
 Rails/HasAndBelongsToMany:
   Description: 'Prefer has_many :through to has_and_belongs_to_many.'
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#has-many-through'
   Enabled: true
 
 Rails/Output:
   Description: 'Checks for calls to puts, print, etc.'
   Enabled: true
 
+Rails/OutputSafety:
+  Description: 'The use of `html_safe` or `raw` may be a security risk.'
+  Enabled: true
+
 Rails/PluralizationGrammar:
   Description: 'Checks for incorrect grammar when using methods like `3.day.ago`.'
   Enabled: true
@@ -1335,6 +1445,11 @@ Rails/ReadWriteAttribute:
   Description: >-
                  Checks for read_attribute(:attr) and
                  write_attribute(:attr, val).
+  StyleGuide: 'https://github.com/bbatsov/rails-style-guide#read-attribute'
+  Enabled: true
+
+Rails/RequestReferer:
+  Description: 'Use consistent syntax for request.referer.'
   Enabled: true
 
 Rails/ScopeArgs:
@@ -1347,6 +1462,10 @@ Rails/TimeZone:
   Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
   Enabled: true
 
+Rails/UniqBeforePluck:
+  Description: 'Prefer the use of uniq or distinct before pluck.'
+  Enabled: true
+
 Rails/Validation:
   Description: 'Use validates :attribute, hash of validations.'
   Enabled: true

data/config/upstream.yml

@@ -25,6 +25,8 @@ AllCops:
     - '**/Berksfile'
     - '**/Cheffile'
     - '**/Vagabondfile'
+    - '**/Fastfile'
+    - '**/*Fastfile'
   Exclude:
     - 'vendor/**/*'
   # Default formatter will be used if no -f/--format option is given.
@@ -63,9 +65,20 @@ AllCops:
   # which is "/tmp" on Unix-like systems, but could be something else on other
   # systems.
   CacheRootDirectory: /tmp
-  # What version of the Ruby interpreter is the inspected code intended to
+  # The default cache root directory is /tmp, which on most systems is
+  # writable by any system user. This means that it is possible for a
+  # malicious user to anticipate the location of Rubocop's cache directory,
+  # and create a symlink in its place that could cause Rubocop to overwrite
+  # unintended files, or read malicious input. If you are certain that your
+  # cache location is secure from this kind of attack, and wish to use a
+  # symlinked cache location, set this value to "true".
+  AllowSymlinksInCacheRootDirectory: false
+  # What MRI version of the Ruby interpreter is the inspected code intended to
   # run on? (If there is more than one, set this to the lowest version.)
-  TargetRubyVersion: 2.0
+  # If a value is specified for TargetRubyVersion then it is used.
+  # Else if .ruby-version exists and it contains an MRI version it is used.
+  # Otherwise we fallback to the oldest officially supported Ruby version (2.0).
+  TargetRubyVersion: ~
 
 # Indent private/protected/public as deep as method definitions
 Style/AccessModifierIndentation:
@@ -165,6 +178,9 @@ Style/AlignParameters:
   SupportedStyles:
     - with_first_parameter
     - with_fixed_indentation
+  # By default, the indentation width from Style/IndentationWidth is used
+  # But it can be overridden by setting this parameter
+  IndentationWidth: ~
 
 Style/AndOr:
   # Whether `and` and `or` are banned only in conditionals (conditionals)
@@ -425,10 +441,11 @@ Style/EmptyLinesAroundModuleBody:
 # AutoCorrectEncodingComment must match the regex
 # /#.*coding\s?[:=]\s?(?:UTF|utf)-8/
 Style/Encoding:
-  EnforcedStyle: always
+  EnforcedStyle: never
   SupportedStyles:
     - when_needed
     - always
+    - never
   AutoCorrectEncodingComment: '# encoding: utf-8'
 
 Style/ExtraSpacing:
@@ -518,8 +535,10 @@ Style/HashSyntax:
     - ruby19
     - ruby19_no_mixed_keys
     - hash_rockets
-# Force hashes that have a symbol value to use hash rockets
+  # Force hashes that have a symbol value to use hash rockets
   UseHashRocketsWithSymbolValues: false
+  # Do not suggest { a?: 1 } over { :a? => 1 } in ruby19 style
+  PreferHashRocketsForNonAlnumEndingSymbols: false
 
 Style/IfUnlessModifier:
   MaxLineLength: 80
@@ -590,6 +609,13 @@ Style/IndentHash:
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
+Style/Lambda:
+  EnforcedStyle: line_count_dependent
+  SupportedStyles:
+    - line_count_dependent
+    - lambda
+    - literal
+
 Style/LambdaCall:
   EnforcedStyle: call
   SupportedStyles:
@@ -617,6 +643,12 @@ Style/NonNilCheck:
   # offenses for `!x.nil?` and does no changes that might change behavior.
   IncludeSemanticChanges: false
 
+Style/NumericPredicate:
+  EnforcedStyle: predicate
+  SupportedStyles:
+    - predicate
+    - comparison
+
 Style/MethodDefParentheses:
   EnforcedStyle: require_parentheses
   SupportedStyles:
@@ -630,6 +662,22 @@ Style/MethodName:
     - snake_case
     - camelCase
 
+Style/ModuleFunction:
+  EnforcedStyle: module_function
+  SupportedStyles:
+    - module_function
+    - extend_self
+
+Style/MultilineArrayBraceLayout:
+  EnforcedStyle: symmetrical
+  SupportedStyles:
+    # symmetrical: closing brace is positioned in same way as opening brace
+    # new_line: closing brace is always on a new line
+    # same_line: closing brace is always on the same line as last element
+    - symmetrical
+    - new_line
+    - same_line
+
 Style/MultilineAssignmentLayout:
   # The types of assignments which are subject to this rule.
   SupportedTypes:
@@ -648,15 +696,46 @@ Style/MultilineAssignmentLayout:
     # for the set of supported types.
     - new_line
 
+Style/MultilineHashBraceLayout:
+  EnforcedStyle: symmetrical
+  SupportedStyles:
+    # symmetrical: closing brace is positioned in same way as opening brace
+    # new_line: closing brace is always on a new line
+    # same_line: closing brace is always on same line as last element
+    - symmetrical
+    - new_line
+    - same_line
+
+Style/MultilineMethodCallBraceLayout:
+  EnforcedStyle: symmetrical
+  SupportedStyles:
+    # symmetrical: closing brace is positioned in same way as opening brace
+    # new_line: closing brace is always on a new line
+    # same_line: closing brace is always on the same line as last argument
+    - symmetrical
+    - new_line
+    - same_line
+
 Style/MultilineMethodCallIndentation:
   EnforcedStyle: aligned
   SupportedStyles:
     - aligned
     - indented
+    - indented_relative_to_receiver
   # By default, the indentation width from Style/IndentationWidth is used
   # But it can be overridden by setting this parameter
   IndentationWidth: ~
 
+Style/MultilineMethodDefinitionBraceLayout:
+  EnforcedStyle: symmetrical
+  SupportedStyles:
+    # symmetrical: closing brace is positioned in same way as opening brace
+    # new_line: closing brace is always on a new line
+    # same_line: closing brace is always on the same line as last parameter
+    - symmetrical
+    - new_line
+    - same_line
+
 Style/MultilineOperationIndentation:
   EnforcedStyle: aligned
   SupportedStyles:
@@ -669,6 +748,12 @@ Style/MultilineOperationIndentation:
 Style/NumericLiterals:
   MinDigits: 5
 
+Style/NumericLiteralPrefix:
+  EnforcedOctalStyle: zero_with_o
+  SupportedOctalStyles:
+    - zero_with_o
+    - zero_only
+
 Style/OptionHash:
   # A list of parameter names that will be flagged by this cop.
   SuspiciousParamNames:
@@ -715,6 +800,10 @@ Style/PredicateName:
   # should still be accepted
   NameWhitelist:
     - is_a?
+  # Exclude Rspec specs because there is a strong convetion to write spec
+  # helpers in the form of `have_something` or `be_something`.
+  Exclude:
+    - 'spec/**/*'
 
 Style/RaiseArgs:
   EnforcedStyle: exploded
@@ -846,6 +935,9 @@ Style/SpaceInsideHashLiteralBraces:
   SupportedStyles:
     - space
     - no_space
+    # 'compact' normally requires a space inside hash braces, with the exception
+    # that successive left braces or right braces are collapsed together
+    - compact
 
 Style/SpaceInsideStringInterpolation:
   EnforcedStyle: no_space
@@ -864,6 +956,14 @@ Style/SymbolProc:
   # The names should be fairly unique, otherwise you'll end up ignoring lots of code.
   IgnoredMethods:
     - respond_to
+    - define_method
+
+Style/TernaryParentheses:
+  EnforcedStyle: require_no_parentheses
+  SupportedStyles:
+    - require_parentheses
+    - require_no_parentheses
+  AllowSafeAssignment: true
 
 Style/TrailingBlankLines:
   EnforcedStyle: final_newline
@@ -944,11 +1044,17 @@ Style/VariableName:
 Style/WhileUntilModifier:
   MaxLineLength: 80
 
+# WordArray enforces how array literals of word-like strings should be expressed.
 Style/WordArray:
   EnforcedStyle: percent
   SupportedStyles:
+    # percent style: %w(word1 word2)
     - percent
+    # bracket style: ['word1', 'word2']
     - brackets
+  # The MinSize option causes the WordArray rule to be ignored for arrays
+  # smaller than a certain size.  The rule is only applied to arrays
+  # whose element count is greater than or equal to MinSize.
   MinSize: 0
   # The regular expression WordRegex decides what is considered a word.
   WordRegex: !ruby/regexp '/\A[\p{Word}\n\t]+\z/'
@@ -1006,7 +1112,7 @@ Lint/AssignmentInCondition:
 Lint/BlockAlignment:
   # The value `start_of_block` means that the `end` should be aligned with line
   # where the `do` keyword appears.
-  # The value `start_of_line` means it should be aligned with the whole 
+  # The value `start_of_line` means it should be aligned with the whole
   # expression's starting line.
   # The value `either` means both are allowed.
   AlignWith: either
@@ -1042,9 +1148,17 @@ Lint/DefEndAlignment:
     - def
   AutoCorrect: false
 
+Lint/InheritException:
+  # The default base class in favour of `Exception`.
+  EnforcedStyle: runtime_error
+  SupportedStyles:
+    - runtime_error
+    - standard_error
+
 # Checks for unused block arguments
 Lint/UnusedBlockArgument:
   IgnoreEmptyBlocks: true
+  AllowUnusedKeywordArguments: false
 
 # Checks for unused method arguments.
 Lint/UnusedMethodArgument:
@@ -1078,6 +1192,14 @@ Rails/Date:
     - strict
     - flexible
 
+Rails/Exit:
+  Include:
+    - app/**/*.rb
+    - config/**/*.rb
+    - lib/**/*.rb
+  Exclude:
+    - lib/**/*.rake
+
 Rails/FindBy:
   Include:
     - app/models/**/*.rb
@@ -1101,6 +1223,12 @@ Rails/ReadWriteAttribute:
   Include:
     - app/models/**/*.rb
 
+Rails/RequestReferer:
+  EnforcedStyle: referer
+  SupportedStyles:
+    - referer
+    - referrer
+
 Rails/ScopeArgs:
   Include:
     - app/models/**/*.rb
@@ -1113,6 +1241,13 @@ Rails/TimeZone:
     - strict
     - flexible
 
+Rails/UniqBeforePluck:
+  EnforcedMode: conservative
+  SupportedModes:
+    - conservative
+    - aggressive
+  AutoCorrect: false
+
 Rails/Validation:
   Include:
     - app/models/**/*.rb

data/lib/chefstyle/version.rb

@@ -1,4 +1,4 @@
 module Chefstyle
-  VERSION = "0.3.1".freeze
-  RUBOCOP_VERSION = "0.39.0".freeze
+  VERSION = "0.4.0".freeze
+  RUBOCOP_VERSION = "0.42.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chefstyle
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Thom May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.42.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.42.0
 description: 
 email:
 - thom@chef.io
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rubocop configuration for Chef's ruby projects