lib/bundler.rb in bundler-1.3.5 vs lib/bundler.rb in bundler-1.3.6

- old
+ new

@@ -78,12 +78,11 @@ end status_code(6) end - class InvalidSpecSet < StandardError; end - class MarshalError < StandardError; end + class MarshalError < StandardError; end class << self attr_writer :ui, :bundle_path def configure @@ -260,11 +259,11 @@ # bins are written to a different location on OS X bin_dir = Pathname.new(Bundler.system_bindir) bin_dir = bin_dir.parent until bin_dir.exist? # if any directory is not writable, we need sudo - dirs = [path, bin_dir] | Dir[path.join('*')] + dirs = [path, bin_dir] | Dir[path.join('*').to_s] sudo_needed = dirs.find{|d| !File.writable?(d) } end @requires_sudo_ran = true @requires_sudo = settings.allow_sudo? && sudo_present && sudo_needed @@ -365,10 +364,9 @@ paths = possibles.flatten.compact.uniq.reject { |p| p.empty? } ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR) configure_gem_home end - Bundler.rubygems.refresh bundle_path end def configure_gem_home # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602)