[RuboCop] Update to 0.48.0

3 files changed, 65 insertions, 7 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4917f5af50..d03086eab2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,11 +1,26 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-03-11 17:10:16 -0500 using RuboCop version 0.47.1.
+# on 2017-03-30 23:48:11 +0900 using RuboCop version 0.48.0.
 # 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: 23
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'lib/bundler/definition.rb'
+    - 'lib/bundler/resolver.rb'
+    - 'lib/bundler/runtime.rb'
+    - 'lib/bundler/source/path.rb'
+    - 'spec/bundler/compact_index_client/updater_spec.rb'
+    - 'spec/commands/init_spec.rb'
+    - 'spec/commands/install_spec.rb'
+    - 'spec/install/gems/flex_spec.rb'
+    - 'spec/lock/lockfile_spec.rb'
+    - 'spec/runtime/setup_spec.rb'
+    - 'spec/support/indexes.rb'
+
 # Offense count: 2
 Lint/EmptyWhen:
   Exclude:
@@ -39,6 +54,12 @@ Lint/RescueException:
     - 'lib/bundler/rubygems_integration.rb'
     - 'lib/bundler/worker.rb'
 
+# Offense count: 2
+Lint/ShadowedException:
+  Exclude:
+    - 'lib/bundler.rb'
+    - 'lib/bundler/rubygems_integration.rb'
+
 # Offense count: 1
 # Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
 Lint/UselessAccessModifier:
@@ -51,12 +72,12 @@ Lint/UselessAssignment:
     - 'lib/bundler/index.rb'
     - 'lib/bundler/installer.rb'
 
-# Offense count: 442
+# Offense count: 444
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
   Max: 980
 
-# Offense count: 1966
+# Offense count: 1991
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
@@ -79,7 +100,7 @@ Performance/RedundantMatch:
     - 'lib/bundler/definition.rb'
     - 'lib/bundler/lockfile_parser.rb'
 
-# Offense count: 5
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: MaxKeyValuePairs.
 Performance/RedundantMerge:
@@ -146,6 +167,17 @@ Style/ConditionalAssignment:
 Style/Documentation:
   Enabled: false
 
+# Offense count: 300
+# Cop supports --auto-correct.
+Style/EmptyLineAfterMagicComment:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/EmptyLinesAroundExceptionHandlingKeywords:
+  Exclude:
+    - 'Rakefile'
+
 # Offense count: 17
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -209,6 +241,24 @@ Style/IfUnlessModifierOfIfUnless:
 Style/IndentArray:
   EnforcedStyle: consistent
 
+# Offense count: 33
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
+Style/IndentHeredoc:
+  Enabled: false
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: InverseMethods, InverseBlocks.
+Style/InverseMethods:
+  Exclude:
+    - 'lib/bundler/cli/doctor.rb'
+    - 'lib/bundler/definition.rb'
+    - 'lib/bundler/dsl.rb'
+    - 'lib/bundler/index.rb'
+    - 'lib/bundler/resolver.rb'
+
 # Offense count: 6
 Style/MethodMissing:
   Exclude:
@@ -221,6 +271,14 @@ Style/MethodMissing:
 
 # Offense count: 2
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: separated, grouped
+Style/MixinGrouping:
+  Exclude:
+    - 'lib/bundler/spec_set.rb'
+    - 'spec/runtime/setup_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: module_function, extend_self
 Style/ModuleFunction:
   Exclude:
diff --git a/Rakefile b/Rakefile
index 9b3538707e..44b51efd69 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.47.1" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
+    deps["rubocop"] ||= "= 0.48.0" 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.47.1"
+    gem "rubocop", "= 0.48.0"
     require "rubocop/rake_task"
     RuboCop::RakeTask.new
   end
diff --git a/bin/rubocop b/bin/rubocop
index c7d45e23fb..ab7285f421 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.47.1"
+gem "rubocop", "= 0.48.0"
 
 Gem.finish_resolve if Gem.respond_to?(:finish_resolve)