Put web site back online

[chef.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 07985407d1cf89d05b7de06242a8b9c020d7f26b..5823b51329c5539eb6ff6790245e971c41829046 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -13,7 +13,7 @@ Layout/ExtraSpacing:
 Layout/IndentHeredoc:
   EnforcedStyle: squiggly
 
 Layout/IndentHeredoc:
   EnforcedStyle: squiggly
 

-Style/FileName:
+Naming/FileName:

   Exclude:
     - 'cookbooks/trac/files/default/trac-authenticate'
     - 'cookbooks/planet/files/default/replication-bin/replicate-changesets'
   Exclude:
     - 'cookbooks/trac/files/default/trac-authenticate'
     - 'cookbooks/planet/files/default/replication-bin/replicate-changesets'


@@ -21,12 +21,18 @@ Style/FileName:
     - 'hooks/*'
     - 'roles/*.rb'
 
     - 'hooks/*'
     - 'roles/*.rb'
 

+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+

 Style/FrozenStringLiteralComment:
   EnforcedStyle: never
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
 Style/FrozenStringLiteralComment:
   EnforcedStyle: never
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 

+Style/IfUnlessModifier:
+  Enabled: false
+

 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes