From e3e05e14c94c3c5839717d716bfe2ebc6e3a61fa Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Tue, 29 Mar 2016 17:37:23 -0500
Subject: [RuboCop] Update to 0.39.0

---
 .rubocop_todo.yml | 12 +++++++++---
 Rakefile          |  4 ++--
 bin/rubocop       |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 539f92a5..686c1898 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-03-09 11:11:00 -0600 using RuboCop version 0.38.0.
+# on 2016-03-29 17:34:30 -0500 using RuboCop version 0.39.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
@@ -52,7 +52,7 @@ Lint/UselessAssignment:
     - 'lib/bundler/index.rb'
     - 'lib/bundler/installer.rb'
 
-# Offense count: 1327
+# Offense count: 1331
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https
 Metrics/LineLength:
@@ -112,7 +112,8 @@ Style/ClassAndModuleChildren:
 
 # Offense count: 11
 # Cop supports --auto-correct.
-# Configuration parameters: SingleLineConditionsOnly.
+# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly.
+# SupportedStyles: assign_to_condition, assign_inside_condition
 Style/ConditionalAssignment:
   Exclude:
     - 'lib/bundler/cli.rb'
@@ -150,6 +151,11 @@ Style/IfInsideElse:
   Exclude:
     - 'lib/bundler/cli/install.rb'
 
+# Offense count: 1
+Style/IfUnlessModifierOfIfUnless:
+  Exclude:
+    - 'spec/support/helpers.rb'
+
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles, IndentationWidth.
diff --git a/Rakefile b/Rakefile
index 6cdcfcb9..eca97cfd 100644
--- a/Rakefile
+++ b/Rakefile
@@ -34,7 +34,7 @@ namespace :spec do
     deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
       [d.name, d.requirement.to_s]
     end]
-    deps["rubocop"] ||= "= 0.38.0" if RUBY_VERSION >= "1.9.3" # can't go in the gemspec because of the ruby version requirement
+    deps["rubocop"] ||= "= 0.39.0" if RUBY_VERSION >= "1.9.3" # 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"
@@ -88,7 +88,7 @@ begin
 
   if RUBY_VERSION >= "1.9.3"
     # can't go in the gemspec because of the ruby version requirement
-    gem "rubocop", "= 0.38.0"
+    gem "rubocop", "= 0.39.0"
     require "rubocop/rake_task"
     RuboCop::RakeTask.new
   end
diff --git a/bin/rubocop b/bin/rubocop
index bc620424..9e0e1488 100755
--- a/bin/rubocop
+++ b/bin/rubocop
@@ -10,7 +10,7 @@ bundler_spec.dependencies.each do |dep|
   gem dep.name, dep.requirement.to_s
 end
 
-gem "rubocop", "= 0.38.0"
+gem "rubocop", "= 0.39.0"
 
 Gem.finish_resolve if Gem.respond_to?(:finish_resolve)
 
-- 
cgit v1.2.3