[Rubocop] Update Rubocop to 0.47.1

4 files changed, 55 insertions, 24 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index b027d4cf54..ded01cbb21 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -15,7 +15,7 @@ Lint/AssignmentInCondition:
   Enabled: false
 
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
   AutoCorrect: true
 
 Lint/UnusedMethodArgument:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fd3dce32f2..8fd3ba1231 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-01-15 12:02:24 -0600 using RuboCop version 0.46.0.
+# on 2017-02-20 19:38:50 +1100 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
@@ -13,13 +13,6 @@ Lint/EmptyWhen:
     - 'spec/support/builders.rb'
 
 # Offense count: 4
-Lint/Eval:
-  Exclude:
-    - 'lib/bundler.rb'
-    - 'lib/bundler/endpoint_specification.rb'
-    - 'spec/support/streams.rb'
-
-# Offense count: 4
 Lint/HandleExceptions:
   Exclude:
     - 'lib/bundler/installer.rb'
@@ -47,7 +40,7 @@ Lint/RescueException:
     - 'lib/bundler/worker.rb'
 
 # Offense count: 1
-# Configuration parameters: ContextCreatingMethods.
+# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
   Exclude:
     - 'lib/bundler/fetcher.rb'
@@ -58,18 +51,18 @@ Lint/UselessAssignment:
     - 'lib/bundler/index.rb'
     - 'lib/bundler/installer.rb'
 
-# Offense count: 8
-# Configuration parameters: CountComments.
+# Offense count: 437
+# Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 46
+  Max: 976
 
-# Offense count: 1890
+# Offense count: 1923
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 207
 
-# Offense count: 6
+# Offense count: 7
 # Cop supports --auto-correct.
 Performance/RedundantBlockCall:
   Exclude:
@@ -93,6 +86,28 @@ Performance/RedundantMerge:
   Exclude:
     - 'lib/bundler/cli/gem.rb'
 
+# Offense count: 4
+Security/Eval:
+  Exclude:
+    - 'lib/bundler.rb'
+    - 'lib/bundler/endpoint_specification.rb'
+    - 'spec/support/streams.rb'
+
+# Offense count: 6
+Security/MarshalLoad:
+  Exclude:
+    - 'lib/bundler.rb'
+    - 'spec/install/gems/resolving_spec.rb'
+    - 'spec/support/artifice/compact_index.rb'
+    - 'spec/support/artifice/endpoint.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Security/YAMLLoad:
+  Exclude:
+    - 'spec/bundler/yaml_serializer_spec.rb'
+    - 'spec/commands/inject_spec.rb'
+
 # Offense count: 1
 Style/AccessorMethodName:
   Exclude:
@@ -113,7 +128,7 @@ Style/ClassAndModuleChildren:
 
 # Offense count: 9
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
@@ -267,12 +282,27 @@ Style/PredicateName:
     - 'lib/bundler/source/git/git_proxy.rb'
     - 'lib/bundler/source/path.rb'
 
-# Offense count: 25
+# Offense count: 24
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
-  Enabled: false
+  Exclude:
+    - 'lib/bundler/cli/install.rb'
+    - 'lib/bundler/deployment.rb'
+    - 'lib/bundler/fetcher/downloader.rb'
+    - 'lib/bundler/fetcher/index.rb'
+    - 'lib/bundler/installer/standalone.rb'
+    - 'lib/bundler/rubygems_integration.rb'
+    - 'lib/bundler/shared_helpers.rb'
+    - 'lib/bundler/source/git/git_proxy.rb'
+    - 'lib/bundler/source/rubygems/remote.rb'
+    - 'spec/bundler/endpoint_specification_spec.rb'
+    - 'spec/bundler/fetcher/dependency_spec.rb'
+    - 'spec/bundler/fetcher/downloader_spec.rb'
+    - 'spec/bundler/fetcher/index_spec.rb'
+    - 'spec/bundler/rubygems_integration_spec.rb'
+    - 'spec/bundler/shared_helpers_spec.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -290,8 +320,9 @@ Style/SpaceAroundOperators:
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
 Style/SpaceInsideBlockBraces:
   Exclude:
     - 'lib/bundler/installer/parallel_installer.rb'
@@ -307,8 +338,8 @@ Style/TernaryParentheses:
 
 # Offense count: 9
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
-# SupportedStyles: comma, consistent_comma, no_comma
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStylesForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInLiteral:
   Exclude:
     - 'lib/bundler/cli/gem.rb'
diff --git a/Rakefile b/Rakefile
index 6952e13a1d..9b3538707e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -39,7 +39,7 @@ namespace :spec do
     deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
       [d.name, d.requirement.to_s]
     end]
-    deps["rubocop"] ||= "= 0.46.0" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
+    deps["rubocop"] ||= "= 0.47.1" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
 
     # JRuby can't build ronn or rdiscount, so we skip that
     if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
@@ -93,7 +93,7 @@ begin
 
   if RUBY_VERSION >= "2.0.0"
     # can't go in the gemspec because of the ruby version requirement
-    gem "rubocop", "= 0.46.0"
+    gem "rubocop", "= 0.47.1"
     require "rubocop/rake_task"
     RuboCop::RakeTask.new
   end
diff --git a/bin/rubocop b/bin/rubocop
index aedb4db20c..c7d45e23fb 100755
--- a/bin/rubocop
+++ b/bin/rubocop
@@ -10,7 +10,7 @@ bundler_spec.dependencies.each do |dep|
   gem dep.name, dep.requirement
 end
 
-gem "rubocop", "= 0.46.0"
+gem "rubocop", "= 0.47.1"
 
 Gem.finish_resolve if Gem.respond_to?(:finish_resolve)