Merge remote-tracking branch 'github/pull/339'

[chef.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index f5d3d4c19bf1ac03803fe9c3112f14a2e765dc87..649fc64dc4e1ab442d295463e9eae0b87bcff42b 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,42 +1,41 @@
 inherit_from: .rubocop_todo.yml
 
 inherit_from: .rubocop_todo.yml
 

-require: rubocop-performance
-

 AllCops:
 AllCops:

-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6

 
 

-Layout/AlignParameters:
-  Exclude:
-    - '**/metadata.rb'
+ChefModernize/IncludingAptDefaultRecipe:
+  Enabled: false

 
 Layout/ExtraSpacing:
   AllowForAlignment: true
 
 
 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'
+Layout/HeredocIndentation:
+  Enabled: true

 
 

-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:

   Enabled: false
 
   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