update rubocop to 0.50colby/rubocop-050

3 files changed, 97 insertions, 59 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f411b8e11d..472c641f55 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-05-30 06:35:02 +0900 using RuboCop version 0.49.1.
+# on 2017-09-17 16:46:43 +0900 using RuboCop version 0.50.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
@@ -12,13 +12,6 @@ Layout/EmptyLinesAroundExceptionHandlingKeywords:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Layout/ExtraSpacing:
-  Exclude:
-    - 'lib/bundler/cli.rb'
-
 # Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles, IndentationWidth.
@@ -26,7 +19,7 @@ Layout/ExtraSpacing:
 Layout/IndentArray:
   EnforcedStyle: consistent
 
-# Offense count: 35
+# Offense count: 40
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
@@ -58,7 +51,7 @@ Layout/SpaceInsideBlockBraces:
   Exclude:
     - 'lib/bundler/installer/parallel_installer.rb'
 
-# Offense count: 25
+# Offense count: 31
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'lib/bundler/definition.rb'
@@ -67,23 +60,27 @@ Lint/AmbiguousBlockAssociation:
     - 'spec/commands/init_spec.rb'
     - 'spec/commands/install_spec.rb'
     - 'spec/install/gems/flex_spec.rb'
-    - 'spec/lock/lockfile_spec.rb'
     - 'spec/lock/lockfile_bundler_1_spec.rb'
+    - 'spec/lock/lockfile_spec.rb'
     - 'spec/other/major_deprecation_spec.rb'
     - 'spec/runtime/setup_spec.rb'
     - 'spec/support/helpers.rb'
     - 'spec/support/indexes.rb'
 
+# Offense count: 1
+Lint/DuplicateMethods:
+  Exclude:
+    - 'lib/bundler/rubygems_ext.rb'
+
 # Offense count: 2
 Lint/EmptyWhen:
   Exclude:
     - 'lib/bundler/friendly_errors.rb'
     - 'spec/support/builders.rb'
 
-# Offense count: 4
+# Offense count: 3
 Lint/HandleExceptions:
   Exclude:
-    - 'lib/bundler/installer.rb'
     - 'lib/bundler/psyched_yaml.rb'
     - 'lib/bundler/vendored_persistent.rb'
 
@@ -92,6 +89,15 @@ Lint/IneffectiveAccessModifier:
   Exclude:
     - 'lib/bundler/settings.rb'
 
+# Offense count: 6
+Lint/InterpolationCheck:
+  Exclude:
+    - 'lib/bundler/dsl.rb'
+    - 'lib/bundler/installer/standalone.rb'
+    - 'spec/commands/binstubs_spec.rb'
+    - 'spec/install/gems/standalone_spec.rb'
+    - 'spec/other/major_deprecation_spec.rb'
+
 # Offense count: 3
 Lint/NestedMethodDefinition:
   Exclude:
@@ -107,6 +113,10 @@ Lint/RescueException:
     - 'lib/bundler/rubygems_integration.rb'
     - 'lib/bundler/worker.rb'
 
+# Offense count: 29
+Lint/RescueWithoutErrorClass:
+  Enabled: false
+
 # Offense count: 2
 Lint/ShadowedException:
   Exclude:
@@ -125,18 +135,63 @@ Lint/UselessAssignment:
     - 'lib/bundler/index.rb'
     - 'lib/bundler/installer.rb'
 
-# Offense count: 2085
+# Offense count: 1
+Lint/Void:
+  Exclude:
+    - 'lib/bundler/spec_set.rb'
+
+# Offense count: 2564
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 207
 
+# Offense count: 1
+Naming/AccessorMethodName:
+  Exclude:
+    - 'lib/bundler/source/git.rb'
+
+# Offense count: 31
+# Configuration parameters: Blacklist.
+# Blacklist: END, (?-mix:EO[A-Z]{1})
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+# Offense count: 9
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/bundler/definition.rb'
+    - 'lib/bundler/installer/parallel_installer.rb'
+    - 'lib/bundler/settings.rb'
+    - 'lib/bundler/source/git.rb'
+    - 'lib/bundler/source/git/git_proxy.rb'
+    - 'lib/bundler/source/path.rb'
+
 # Offense count: 2
 Performance/Caller:
   Exclude:
     - 'lib/bundler/rubygems_integration.rb'
     - 'spec/support/builders.rb'
 
+# Offense count: 9
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect.
+Performance/HashEachMethods:
+  Exclude:
+    - 'lib/bundler/definition.rb'
+    - 'lib/bundler/dependency.rb'
+    - 'lib/bundler/dsl.rb'
+    - 'lib/bundler/index.rb'
+    - 'lib/bundler/plugin.rb'
+    - 'spec/install/gems/standalone_spec.rb'
+    - 'spec/support/builders.rb'
+    - 'spec/support/helpers.rb'
+
 # Offense count: 7
 # Cop supports --auto-correct.
 Performance/RedundantBlockCall:
@@ -175,18 +230,6 @@ Security/MarshalLoad:
     - '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:
-    - 'lib/bundler/source/git.rb'
-
 # Offense count: 3
 Style/CaseEquality:
   Exclude:
@@ -215,7 +258,7 @@ Style/ConditionalAssignment:
     - 'lib/bundler/source/git.rb'
     - 'lib/bundler/source/rubygems.rb'
 
-# Offense count: 160
+# Offense count: 167
 Style/Documentation:
   Enabled: false
 
@@ -232,6 +275,18 @@ Style/EmptyMethod:
     - 'lib/bundler/ui/silent.rb'
     - 'spec/support/artifice/fail.rb'
 
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AutoCorrectEncodingComment.
+# SupportedStyles: when_needed, always, never
+Style/Encoding:
+  Exclude:
+    - 'Rakefile'
+    - 'bundler.gemspec'
+    - 'lib/bundler/friendly_errors.rb'
+    - 'spec/bundler/bundler_spec.rb'
+    - 'spec/quality_es_spec.rb'
+
 # Offense count: 1
 # Configuration parameters: SupportedStyles.
 # SupportedStyles: annotated, template
@@ -245,12 +300,11 @@ Style/GlobalVars:
     - 'lib/bundler/cli.rb'
     - 'spec/spec_helper.rb'
 
-# Offense count: 16
+# Offense count: 12
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
     - 'lib/bundler/cli/cache.rb'
-    - 'lib/bundler/cli/clean.rb'
     - 'lib/bundler/cli/install.rb'
     - 'lib/bundler/cli/outdated.rb'
     - 'lib/bundler/cli/package.rb'
@@ -263,20 +317,12 @@ Style/GuardClause:
     - 'spec/support/sometimes.rb'
 
 # Offense count: 1
-Style/IfInsideElse:
-  Exclude:
-    - 'lib/bundler/cli/install.rb'
-
-# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/bundler/dsl.rb'
 
-# Offense count: 1
-Style/IfUnlessModifierOfIfUnless:
-  Exclude:
-    - 'spec/support/helpers.rb'
-
 # Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: InverseMethods, InverseBlocks.
@@ -315,7 +361,7 @@ Style/ModuleFunction:
     - 'lib/bundler/shared_helpers.rb'
     - 'spec/support/path.rb'
 
-# Offense count: 11
+# Offense count: 10
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:
   Exclude:
@@ -328,13 +374,15 @@ Style/MultilineIfModifier:
 
 # Offense count: 3
 # Cop supports --auto-correct.
+# Configuration parameters: Whitelist.
+# Whitelist: be, be_a, be_an, be_between, be_falsey, be_kind_of, be_instance_of, be_truthy, be_within, eq, eql, end_with, include, match, raise_error, respond_to, start_with
 Style/NestedParenthesizedCalls:
   Exclude:
     - 'lib/bundler/resolver.rb'
     - 'spec/commands/lock_spec.rb'
     - 'spec/runtime/setup_spec.rb'
 
-# Offense count: 6
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
 # SupportedStyles: predicate, comparison
@@ -343,23 +391,13 @@ Style/NumericPredicate:
     - 'spec/**/*'
     - 'lib/bundler/gem_helper.rb'
     - 'lib/bundler/mirror.rb'
-    - 'lib/bundler/source/git/git_proxy.rb'
     - 'lib/bundler/source/path.rb'
 
-# Offense count: 9
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/OrAssignment:
   Exclude:
-    - 'spec/**/*'
-    - 'lib/bundler/definition.rb'
-    - 'lib/bundler/installer/parallel_installer.rb'
-    - 'lib/bundler/settings.rb'
-    - 'lib/bundler/source/git.rb'
-    - 'lib/bundler/source/git/git_proxy.rb'
-    - 'lib/bundler/source/path.rb'
+    - 'lib/bundler/ui/shell.rb'
 
 # Offense count: 24
 # Cop supports --auto-correct.
@@ -412,7 +450,7 @@ Style/TrailingCommaInLiteral:
     - 'lib/bundler/similarity_detector.rb'
     - 'spec/support/artifice/endpoint.rb'
 
-# Offense count: 7
+# Offense count: 14
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
   Exclude:
diff --git a/Rakefile b/Rakefile
index a6dd6dbdba..39a61f4fea 100644
--- a/Rakefile
+++ b/Rakefile
@@ -42,7 +42,7 @@ namespace :spec do
     deps = Hash[bundler_spec.development_dependencies.map do |d|
       [d.name, d.requirement.to_s]
     end]
-    deps["rubocop"] ||= "= 0.49.1" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
+    deps["rubocop"] ||= "= 0.50.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"
@@ -103,7 +103,7 @@ begin
 
   if RUBY_VERSION >= "2.0.0"
     # can't go in the gemspec because of the ruby version requirement
-    gem "rubocop", "= 0.49.1"
+    gem "rubocop", "= 0.50.0"
     require "rubocop/rake_task"
     RuboCop::RakeTask.new
   end
diff --git a/bin/rubocop b/bin/rubocop
index 98ce0c89c2..81f4679fb8 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.49.1"
+gem "rubocop", "= 0.50.0"
 
 Gem.finish_resolve if Gem.respond_to?(:finish_resolve)