Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/public/chef

[chef.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 54dd4f715d12ea80b249066b3d2f0b1a39938034..12d060a1b67140fe609ff94b8a4f77826916ad78 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,15 +1,41 @@
 inherit_from: .rubocop_todo.yml
 
-Style/AlignParameters:
-  Exclude:
-    - '**/metadata.rb'
+AllCops:
+  TargetRubyVersion: 2.3
+
+ChefModernize/IncludingAptDefaultRecipe:
+  Enabled: false
+
+Layout/ExtraSpacing:
+  AllowForAlignment: true
+
+Layout/IndentHeredoc:
+  EnforcedStyle: squiggly
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
 
 Style/HashSyntax:
   EnforcedStyle: hash_rockets
 
-Style/SingleSpaceBeforeFirstArg:
-  Exclude:
-    - '**/metadata.rb'
+Style/NumericPredicate:
+  EnforcedStyle: predicate
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%i': '[]'
+    '%I': '[]'
+    '%w': '[]'
+    '%W': '[]'
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
+
+Style/SymbolArray:
+  EnforcedStyle: brackets
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: false