Auto merge of #4035 - bundler:seg-update-rubocop, r=segiddins

[RuboCop] Update to 0.34.1

Rakefile

@@ -33,7 +33,7 @@ namespace :spec do
     deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
       [d.name, d.requirement.to_s]
     end]
-    deps["rubocop"] ||= "= 0.33.0" if RUBY_VERSION >= "1.9.3" # can't go in the gemspec because of the ruby version requirement
+    deps["rubocop"] ||= "= 0.34.1" 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.33.0"
+    gem "rubocop", "= 0.34.1"
     require "rubocop/rake_task"
     RuboCop::RakeTask.new
   end

bin/rubocop

@@ -7,5 +7,5 @@ bundler_spec.dependencies.each do |dep|
   gem dep.name, dep.requirement.to_s
 end
 
-gem "rubocop", "= 0.33.0"
+gem "rubocop", "= 0.34.1"
 load Gem.bin_path("rubocop", "rubocop")

exe/bundle_ruby

@@ -20,7 +20,7 @@ module Bundler
     end
 
     def eval_gemfile(gemfile, contents = nil)
-      contents ||= File.open(gemfile, "rb") {|f| f.read }
+      contents ||= File.open(gemfile, "rb", &:read)
       instance_eval(contents, gemfile.to_s, 1)
     rescue SyntaxError => e
       bt = e.message.split("\n")[1..-1]

lib/bundler.rb

@@ -111,7 +111,7 @@ def message
                when :write then "write to"
                when :executable, :exec then "execute"
                else @permission_type.to_s
-               end
+      end
       "There was an error while trying to #{action} `#{@path}`. " \
       "It is likely that you need to grant #{@permission_type} permissions " \
       "for that path."
@@ -386,7 +386,7 @@ def sudo(str)
     end
 
     def read_file(file)
-      File.open(file, "rb") {|f| f.read }
+      File.open(file, "rb", &:read)
     end
 
     def load_marshal(data)

spec/support/builders.rb

@@ -158,9 +158,7 @@ def build_repo1
           RUBY
         end
 
-        build_gem "very_simple_binary" do |s|
-          s.add_c_extension
-        end
+        build_gem "very_simple_binary", &:add_c_extension
 
         build_gem "bundler", "0.9" do |s|
           s.executables = "bundle"
@@ -503,6 +501,7 @@ def _build(options)
         if options[:rubygems_version]
           @spec.rubygems_version = options[:rubygems_version]
           def @spec.mark_version; end
+
           def @spec.validate; end
         end