[RuboCop] Update to 0.46.0seg-update-rubocop

3 files changed, 27 insertions, 19 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 8abe1e76eb..10d9e58fa5 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-11-19 11:43:45 -0600 using RuboCop version 0.45.0.
+# on 2017-01-15 12:02:24 -0600 using RuboCop version 0.46.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
@@ -58,13 +58,13 @@ Lint/UselessAssignment:
     - 'lib/bundler/index.rb'
     - 'lib/bundler/installer.rb'
 
-# Offense count: 7
+# Offense count: 8
 # Configuration parameters: CountComments.
 Metrics/BlockLength:
   Max: 46
 
-# Offense count: 1855
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
+# Offense count: 1890
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 207
@@ -127,10 +127,23 @@ Style/ConditionalAssignment:
     - 'lib/bundler/source/git.rb'
     - 'lib/bundler/source/rubygems.rb'
 
-# Offense count: 148
+# Offense count: 152
 Style/Documentation:
   Enabled: false
 
+# Offense count: 17
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: compact, expanded
+Style/EmptyMethod:
+  Exclude:
+    - 'exe/bundle_ruby'
+    - 'lib/bundler/cli.rb'
+    - 'lib/bundler/plugin/api/source.rb'
+    - 'lib/bundler/rubygems_integration.rb'
+    - 'lib/bundler/ui/silent.rb'
+    - 'spec/support/artifice/fail.rb'
+
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
@@ -145,7 +158,7 @@ Style/GlobalVars:
     - 'lib/bundler/cli.rb'
     - 'spec/spec_helper.rb'
 
-# Offense count: 19
+# Offense count: 18
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
@@ -159,7 +172,6 @@ Style/GuardClause:
     - 'lib/bundler/installer.rb'
     - 'lib/bundler/lockfile_parser.rb'
     - 'lib/bundler/runtime.rb'
-    - 'lib/bundler/shared_helpers.rb'
     - 'lib/bundler/source/path/installer.rb'
     - 'lib/bundler/source_list.rb'
     - 'spec/commands/newgem_spec.rb'
@@ -276,7 +288,7 @@ Style/SpaceAroundOperators:
   Exclude:
     - 'lib/bundler/retry.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -287,20 +299,19 @@ Style/SpaceInsideBlockBraces:
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
-# SupportedStyles: require_parentheses, require_no_parentheses
+# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
 Style/TernaryParentheses:
   Exclude:
     - 'lib/bundler/cli/common.rb'
     - 'lib/bundler/gem_version_promoter.rb'
 
-# Offense count: 10
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
 # SupportedStyles: comma, consistent_comma, no_comma
 Style/TrailingCommaInLiteral:
   Exclude:
     - 'lib/bundler/cli/gem.rb'
-    - 'lib/bundler/dependency.rb'
     - 'lib/bundler/fetcher.rb'
     - 'lib/bundler/gem_helpers.rb'
     - 'lib/bundler/graph.rb'
@@ -308,7 +319,7 @@ Style/TrailingCommaInLiteral:
     - 'lib/bundler/similarity_detector.rb'
     - 'spec/support/artifice/endpoint.rb'
 
-# Offense count: 18
+# Offense count: 7
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
   Exclude:
@@ -317,14 +328,11 @@ Style/UnneededInterpolation:
     - 'spec/bundler/shared_helpers_spec.rb'
     - 'spec/cache/git_spec.rb'
     - 'spec/commands/exec_spec.rb'
-    - 'spec/support/artifice/endpoint.rb'
-    - 'spec/support/artifice/endpoint_500.rb'
 
 # Offense count: 2
-# Configuration parameters: SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: snake_case, normalcase, non_integer
 Style/VariableNumber:
-  EnforcedStyle: normalcase
   Exclude:
     - 'spec/commands/help_spec.rb'
     - 'spec/other/ext_spec.rb'
diff --git a/Rakefile b/Rakefile
index 67a0ce2cda..6952e13a1d 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.45.0" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
+    deps["rubocop"] ||= "= 0.46.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.45.0"
+    gem "rubocop", "= 0.46.0"
     require "rubocop/rake_task"
     RuboCop::RakeTask.new
   end
diff --git a/bin/rubocop b/bin/rubocop
index 83e8e78c08..aedb4db20c 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.45.0"
+gem "rubocop", "= 0.46.0"
 
 Gem.finish_resolve if Gem.respond_to?(:finish_resolve)