sotm: support sotm.org short domain

[chef.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 5823b51329c5539eb6ff6790245e971c41829046..5db1a31045524667dabbea1a6aaf55863ffa3ed4 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,38 +3,36 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.3
 
 AllCops:
   TargetRubyVersion: 2.3
 

-Layout/AlignParameters:
-  Exclude:
-    - '**/metadata.rb'
-

 Layout/ExtraSpacing:
   AllowForAlignment: true
 
 Layout/IndentHeredoc:
   EnforcedStyle: squiggly
 
 Layout/ExtraSpacing:
   AllowForAlignment: true
 
 Layout/IndentHeredoc:
   EnforcedStyle: squiggly
 

-Naming/FileName:
-  Exclude:
-    - 'cookbooks/trac/files/default/trac-authenticate'
-    - 'cookbooks/planet/files/default/replication-bin/replicate-changesets'
-    - 'cookbooks/*/templates/*/*.erb'
-    - 'hooks/*'
-    - 'roles/*.rb'
-

 Naming/UncommunicativeMethodParamName:
   Enabled: false
 
 Naming/UncommunicativeMethodParamName:
   Enabled: false
 

-Style/FrozenStringLiteralComment:
-  EnforcedStyle: never
-

 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 

-Style/IfUnlessModifier:
-  Enabled: false
+Style/NumericPredicate:
+  EnforcedStyle: predicate
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%i': '[]'
+    '%I': '[]'
+    '%w': '[]'
+    '%W': '[]'

 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/SymbolArray:
   EnforcedStyle: brackets
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/SymbolArray:
   EnforcedStyle: brackets

+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false