Merge pull request #1924 from DomT4/rubocop

Rubocop 0.47.1

3 files changed, 24 insertions, 5 deletions

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 097eff995..29a891e2a 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -41,7 +41,7 @@ Lint/AssignmentInCondition:
   Enabled: false
 
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
 
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
@@ -63,7 +63,7 @@ Style/BlockDelimiters:
   EnforcedStyle: line_count_based
 
 Style/CaseIndentation:
-  IndentWhenRelativeTo: end
+  EnforcedStyle: end
 
 Style/ClassAndModuleChildren:
   EnforcedStyle: nested
diff --git a/Library/Homebrew/.rubocop_todo.yml b/Library/Homebrew/.rubocop_todo.yml
index 99080b546..37518a5f0 100644
--- a/Library/Homebrew/.rubocop_todo.yml
+++ b/Library/Homebrew/.rubocop_todo.yml
@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 100`
-# on 2016-12-31 22:41:53 +0000 using RuboCop version 0.45.0.
+# on 2017-01-27 21:44:55 +0000 using RuboCop version 0.47.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 16
+# Offense count: 17
 Lint/HandleExceptions:
   Exclude:
     - 'cmd/install.rb'
@@ -60,6 +60,7 @@ Lint/ShadowedException:
     - 'utils/fork.rb'
 
 # Offense count: 13
+# Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 5
 
@@ -73,6 +74,12 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Max: 6
 
+# Offense count: 2
+Security/MarshalLoad:
+  Exclude:
+    - 'dependency.rb'
+    - 'utils/fork.rb'
+
 # Offense count: 1
 Style/AccessorMethodName:
   Exclude:
@@ -86,6 +93,18 @@ Style/ClassVars:
     - 'test/support/helper/fs_leak_logger.rb'
 
 # Offense count: 13
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: compact, expanded
+Style/EmptyMethod:
+  Exclude:
+    - 'debrew/irb.rb'
+    - 'download_strategy.rb'
+    - 'extend/ENV/super.rb'
+    - 'formula.rb'
+    - 'patch.rb'
+
+# Offense count: 13
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
diff --git a/Library/Homebrew/cmd/style.rb b/Library/Homebrew/cmd/style.rb
index 9befcf9ac..586c6da6b 100644
--- a/Library/Homebrew/cmd/style.rb
+++ b/Library/Homebrew/cmd/style.rb
@@ -47,7 +47,7 @@ module Homebrew
 
   def check_style_impl(files, output_type, options = {})
     fix = options[:fix]
-    Homebrew.install_gem_setup_path! "rubocop", "0.45.0"
+    Homebrew.install_gem_setup_path! "rubocop", "0.47.1"
 
     args = %w[
       --force-exclusion