Fix Bundler on 1.9

lib/bundler/dsl.rb

@@ -80,11 +80,14 @@ def _version?(version)
     end
 
     def _normalize_hash(opts)
-      opts.each do |k, v|
+      # Cannot modify a hash during an iteration in 1.9
+      opts.keys.each do |k|
         next if String === k
+        v = opts[k]
         opts.delete(k)
         opts[k.to_s] = v
       end
+      opts
     end
 
     def _normalize_options(name, version, opts)

lib/bundler/installer.rb

@@ -12,6 +12,9 @@ def run(options)
         return
       end
 
+      # Ensure that BUNDLE_PATH exists
+      FileUtils.mkdir_p(Bundler.bundle_path)
+
       specs.sort_by { |s| s.name }.each do |spec|
         # unless spec.source.is_a?(Source::SystemGems)
           Bundler.ui.info "Installing #{spec.name} (#{spec.version}) from #{spec.source} "

lib/bundler/runtime.rb

@@ -256,7 +256,7 @@ def cripple_rubygems(specs)
       source_index_class.send(:define_method, :from_gems_in) do |*args|
         source_index = Gem::SourceIndex.new
         source_index.spec_dirs = *args
-        source_index.add_specs *specs
+        source_index.add_specs(*specs)
         source_index
       end
 

lib/bundler/source.rb

@@ -236,7 +236,7 @@ def specs
             # Loop over the lines and extract the relative path and the
             # git hash
             lines.each do |line|
-              next unless line =~ %r{^(\d+) (blob|tree) ([a-zf0-9]+)\t(.*)$}
+              next unless line =~ %r{^(\d+) (blob|tree) ([a-f0-9]+)\t(.*)$}
               hash, file = $3, $4
               # Read the gemspec
               if spec = eval(%x(git cat-file blob #{$3}))

lib/bundler/templates/environment.erb

@@ -31,6 +31,7 @@ module Bundler
 
   def self.setup(*groups)
     match_fingerprint
+    clean_load_path
     SPECS.each do |spec|
       spec[:load_paths].each { |path| $LOAD_PATH.unshift path }
     end
@@ -53,6 +54,10 @@ module Bundler
   end
 
   def self.patch_rubygems
+    Kernel.class_eval do
+      private
+      def gem(*) ; end
+    end
     Gem.source_index # ensure RubyGems is fully loaded
     specs = SPECS
 

spec/runtime/environment_rb_spec.rb

@@ -16,6 +16,7 @@
   it "does not pull in system gems" do
     run <<-R, :lite_runtime => true
       require 'rubygems'
+
       begin;
         require 'rack'
       rescue LoadError

spec/spec_helper.rb

@@ -10,7 +10,9 @@
   require file
 end
 
-$debug = false
+$debug    = false
+$show_err = false
+
 Spec::Rubygems.setup
 FileUtils.rm_rf(Spec::Path.gem_repo1)
 

spec/support/helpers.rb

@@ -44,7 +44,7 @@ def bundle(cmd, options = {})
       gemfile = File.expand_path('../../../bin/bundle', __FILE__)
       input, out, err, waitthread = Open3.popen3("#{Gem.ruby} -I#{lib} #{gemfile} #{cmd}#{args}")
       @err = err.read.strip
-      puts @err if $debug && !err.empty?
+      puts @err if $show_err && !@err.empty?
       @out = out.read.strip
       @exitstatus = nil
       @exitstatus = waitthread.value.to_i if waitthread