bundler 1.0.12 → 1.0.13

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.0.13 (May 4, 2011)
+
+Features:
+
+  - Compatibility with Rubygems master (soon to be v1.8) (@evanphx)
+  - Informative error when --path points to a broken symlink
+  - Support Rake 0.9 and greater (@e2)
+  - Output full errors for non-TTYs e.g. pow (@josh)
+
+Bugfixes:
+
+  - Allow spaces in gem path names for gem tasks (@rslifka)
+  - Have cap run bundle install from release_path (@martinjagusch)
+  - Quote git refspec so zsh doesn't expand it (@goneflyin)
+
 ## 1.0.12 (April 8, 2011)
 
 Features:
@@ -8,7 +23,7 @@ Features:
 
 Bugfixes:
 
-  - Compatibility with Rubygems 1.7 and Rails 2.3 and vendored gems (@evan)
+  - Compatibility with Rubygems 1.7 and Rails 2.3 and vendored gems (@evanphx)
   - Fix changing gem order in lock (@gucki)
   - Remove color escape sequences when displaying man pages (@bgreenlee)
   - Fix creating GEM_HOME on both JRuby 1.5 and 1.6 (@nickseiger)

data/Rakefile

@@ -8,8 +8,8 @@ def sudo?
 end
 
 begin
+  # set up rspec tasks
   require 'rspec/core/rake_task'
-  require 'ronn'
 
   desc "Run specs"
   RSpec::Core::RakeTask.new do |t|
@@ -71,17 +71,35 @@ begin
           unless File.directory?("tmp/rubygems")
             system("git clone git://github.com/rubygems/rubygems.git tmp/rubygems")
           end
+          hash = nil
+
           Dir.chdir("tmp/rubygems") do
             system("git remote update")
             system("git checkout #{rg}")
             system("git pull origin master") if rg == "master"
+            hash = `git rev-parse HEAD`.strip
           end
+
+          puts "Running bundler specs against rubygems '#{rg}' at #{hash}"
           ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
         end
 
         task rg => "clone_rubygems_#{rg}"
         task "rubygems:all" => rg
       end
+
+      desc "Run specs under a Rubygems checkout (set RG=path)"
+      RSpec::Core::RakeTask.new("co") do |t|
+        t.rspec_opts = %w(-fs --color)
+        t.ruby_opts  = %w(-w)
+      end
+
+      task "setup_co" do
+        ENV["RUBYOPT"] = "-I#{File.expand_path ENV['RG']} #{rubyopt}"
+      end
+
+      task "co" => "setup_co"
+      task "rubygems:all" => "co"
     end
 
     namespace :ruby do
@@ -111,6 +129,38 @@ begin
 
   end
 
+
+  # set up man tasks that use ronn
+  require 'ronn'
+
+  namespace :man do
+    directory "lib/bundler/man"
+
+    Dir["man/*.ronn"].each do |ronn|
+      basename = File.basename(ronn, ".ronn")
+      roff = "lib/bundler/man/#{basename}"
+
+      file roff => ["lib/bundler/man", ronn] do
+        sh "ronn --roff --pipe #{ronn} > #{roff}"
+      end
+
+      file "#{roff}.txt" => roff do
+        sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt"
+      end
+
+      task :build_all_pages => "#{roff}.txt"
+    end
+
+    desc "Build the man pages"
+    task :build => "man:build_all_pages"
+
+    desc "Clean up from the built man pages"
+    task :clean do
+      rm_rf "lib/bundler/man"
+    end
+  end
+
+
 rescue LoadError
   task :spec do
     abort "Run `rake spec:deps` to be able to run the specs"
@@ -126,33 +176,6 @@ rescue LoadError
 
 end
 
-namespace :man do
-  directory "lib/bundler/man"
-
-  Dir["man/*.ronn"].each do |ronn|
-    basename = File.basename(ronn, ".ronn")
-    roff = "lib/bundler/man/#{basename}"
-
-    file roff => ["lib/bundler/man", ronn] do
-      sh "ronn --roff --pipe #{ronn} > #{roff}"
-    end
-
-    file "#{roff}.txt" => roff do
-      sh "groff -Wall -mtty-char -mandoc -Tascii #{roff} | col -b > #{roff}.txt"
-    end
-
-    task :build_all_pages => "#{roff}.txt"
-  end
-
-  desc "Build the man pages"
-  task :build => "man:build_all_pages"
-
-  desc "Clean up from the built man pages"
-  task :clean do
-    rm_rf "lib/bundler/man"
-  end
-end
-
 namespace :vendor do
   desc "Build the vendor dir"
   task :build => :clean do

data/lib/bundler.rb

@@ -9,6 +9,7 @@ end
 
 require 'yaml'
 require 'bundler/rubygems_ext'
+require 'bundler/rubygems_integration'
 require 'bundler/version'
 
 module Bundler
@@ -85,7 +86,6 @@ module Bundler
     end
 
     def bundle_path
-      # STDERR.puts settings.path
       @bundle_path ||= Pathname.new(settings.path).expand_path(root)
     end
 
@@ -138,11 +138,11 @@ module Bundler
     end
 
     def ruby_scope
-      "#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}"
+      "#{Bundler.rubygems.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}"
     end
 
     def user_bundle_path
-      Pathname.new(Gem.user_home).join(".bundler")
+      Pathname.new(Bundler.rubygems.user_home).join(".bundler")
     end
 
     def home
@@ -259,8 +259,9 @@ module Bundler
       if settings[:disable_shared_gems]
         ENV['GEM_PATH'] = ''
         ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
-      elsif Gem.dir != bundle_path.to_s
-        paths = [Gem.dir, Gem.path].flatten.compact.uniq.reject{|p| p.empty? }
+      elsif Bundler.rubygems.gem_dir != bundle_path.to_s
+        possibles = [Bundler.rubygems.gem_dir, Bundler.rubygems.gem_path]
+        paths = possibles.flatten.compact.uniq.reject { |p| p.empty? }
         ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
         ENV["GEM_HOME"] = bundle_path.to_s
       end
@@ -268,7 +269,7 @@ module Bundler
       # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602)
       FileUtils.mkdir_p bundle_path.to_s rescue nil
 
-      Gem.clear_paths
+      Bundler.rubygems.clear_paths
     end
 
     def upgrade_lockfile

data/lib/bundler/cli.rb

@@ -4,9 +4,6 @@ require 'thor/actions'
 require 'rubygems/user_interaction'
 require 'rubygems/config_file'
 
-# Work around a RubyGems bug
-Gem.configuration
-
 module Bundler
   class CLI < Thor
     include Thor::Actions
@@ -16,7 +13,7 @@ module Bundler
       the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
       Bundler.ui = UI::Shell.new(the_shell)
       Bundler.ui.debug! if options["verbose"]
-      Gem::DefaultUserInteraction.ui = UI::RGProxy.new(Bundler.ui)
+      Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
     end
 
     check_unknown_options! unless ARGV.include?("exec") || ARGV.include?("config")
@@ -162,6 +159,7 @@ module Bundler
       end
       opts[:without].map!{|g| g.to_sym }
 
+      # Can't use Bundler.settings for this because settings needs gemfile.dirname
       ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
       ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD
 
@@ -211,7 +209,6 @@ module Bundler
         opts[:system] = true
       end
 
-      # Can't use Bundler.settings for this because settings needs gemfile.dirname
       Bundler.settings[:path] = nil if opts[:system]
       Bundler.settings[:path] = "vendor/bundle" if opts[:deployment]
       Bundler.settings[:path] = path if path
@@ -241,7 +238,7 @@ module Bundler
           "Please use `bundle install --path #{path}` instead."
       end
     rescue GemNotFound => e
-      if opts[:local]
+      if opts[:local] && Bundler.app_cache.exist?
         Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
       end
 

data/lib/bundler/definition.rb

@@ -61,7 +61,7 @@ module Bundler
       @unlock[:gems] ||= []
       @unlock[:sources] ||= []
 
-      current_platform = Gem.platforms.map { |p| generic(p) }.compact.last
+      current_platform = Bundler.rubygems.platforms.map { |p| generic(p) }.compact.last
       @new_platform = !@platforms.include?(current_platform)
       @platforms |= [current_platform]
 

data/lib/bundler/deployment.rb

@@ -45,7 +45,7 @@ module Bundler
           args << bundle_flags.to_s
           args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
 
-          run "#{bundle_cmd} install #{args.join(' ')}"
+          run "cd #{context.fetch(:current_release)} && #{bundle_cmd} install #{args.join(' ')}"
         end
       end
     end

data/lib/bundler/gem_helper.rb

@@ -2,6 +2,13 @@ $:.unshift File.expand_path('../vendor', __FILE__)
 require 'thor'
 require 'bundler'
 
+begin
+  # Support Rake > 0.8.7
+  require 'rake/dsl_definition'
+  include Rake::DSL
+rescue LoadError
+end
+
 module Bundler
   class GemHelper
     def self.install_tasks(opts = {})
@@ -39,7 +46,7 @@ module Bundler
 
     def build_gem
       file_name = nil
-      sh("gem build #{spec_path}") { |out, code|
+      sh("gem build '#{spec_path}'") { |out, code|
         raise out unless out[/Successfully/]
         file_name = File.basename(built_gem_path)
         FileUtils.mkdir_p(File.join(base, 'pkg'))
@@ -51,7 +58,7 @@ module Bundler
 
     def install_gem
       built_gem_path = build_gem
-      out, _ = sh_with_code("gem install #{built_gem_path}")
+      out, _ = sh_with_code("gem install '#{built_gem_path}'")
       raise "Couldn't install gem, run `gem install #{built_gem_path}' for more detailed output" unless out[/Successfully installed/]
       Bundler.ui.confirm "#{name} (#{version}) installed"
     end
@@ -68,7 +75,7 @@ module Bundler
 
     protected
     def rubygem_push(path)
-      out, _ = sh("gem push #{path}")
+      out, _ = sh("gem push '#{path}'")
       raise "Gem push failed due to lack of RubyGems.org credentials." if out[/Enter your RubyGems.org credentials/]
       Bundler.ui.confirm "Pushed #{name} #{version} to rubygems.org"
     end

data/lib/bundler/installer.rb

@@ -10,6 +10,14 @@ module Bundler
     end
 
     def run(options)
+      # Create the BUNDLE_PATH directory
+      begin
+        Bundler.bundle_path.mkpath unless Bundler.bundle_path.exist?
+      rescue Errno::EEXIST
+        raise PathError, "Could not install to path `#{Bundler.settings[:path]}` " +
+          "because of an invalid symlink. Remove the symlink so the directory can be created."
+      end
+
       if Bundler.settings[:frozen]
         @definition.ensure_equivalent_gemfile_and_lockfile(options[:deployment])
       end
@@ -35,9 +43,6 @@ module Bundler
           @definition.resolve_remotely!
       end
 
-      # Ensure that BUNDLE_PATH exists
-      Bundler.mkdir_p(Bundler.bundle_path) unless File.exist?(Bundler.bundle_path)
-
       # Must install gems in the order that the resolver provides
       # as dependencies might actually affect the installation of
       # the gem.
@@ -49,13 +54,9 @@ module Bundler
         #   next
         # end
 
-        begin
-          old_args = Gem::Command.build_args
-          Gem::Command.build_args = [Bundler.settings["build.#{spec.name}"]]
+        Bundler.rubygems.with_build_args [Bundler.settings["build.#{spec.name}"]] do
           spec.source.install(spec)
           Bundler.ui.debug "from #{spec.loaded_from} "
-        ensure
-          Gem::Command.build_args = old_args
         end
 
         Bundler.ui.info ""

data/lib/bundler/rubygems_ext.rb

@@ -39,6 +39,11 @@ module Gem
       end
     end
 
+    # RubyGems 1.8+ used only.
+    def gem_dir
+      full_gem_path
+    end
+
     def groups
       @groups ||= []
     end

data/lib/bundler/rubygems_integration.rb

@@ -0,0 +1,285 @@
+module Bundler
+  class RubygemsIntegration
+    def initialize
+      # Work around a RubyGems bug
+      configuration
+    end
+
+    def loaded_specs(name)
+      Gem.loaded_specs[name]
+    end
+
+    def mark_loaded(spec)
+      Gem.loaded_specs[spec.name] = spec
+    end
+
+    def path(obj)
+      obj.to_s
+    end
+
+    def platforms
+      Gem.platforms
+    end
+
+    def configuration
+      Gem.configuration
+    end
+
+    def ruby_engine
+      Gem.ruby_engine
+    end
+
+    def read_binary(path)
+      Gem.read_binary(path)
+    end
+
+    def inflate(obj)
+      Gem.inflate(obj)
+    end
+
+    def sources=(val)
+      Gem.sources = val
+    end
+
+    def sources
+      Gem.sources
+    end
+
+    def gem_dir
+      Gem.dir.to_s
+    end
+
+    def gem_bindir
+      Gem.bindir
+    end
+
+    def user_home
+      Gem.user_home
+    end
+
+    def gem_path
+      # Make sure that Gem.path is an array of Strings, not some
+      # internal Rubygems object
+      Gem.path.map { |x| x.to_s }
+    end
+
+    def marshal_spec_dir
+      Gem::MARSHAL_SPEC_DIR
+    end
+
+    def clear_paths
+      Gem.clear_paths
+    end
+
+    def bin_path(gem, bin, ver)
+      Gem.bin_path(gem, bin, ver)
+    end
+
+    def ui=(obj)
+      Gem::DefaultUserInteraction.ui = obj
+    end
+
+    def fetch_specs(all, pre, &blk)
+      Gem::SpecFetcher.new.list(all, pre).each(&blk)
+    end
+
+    def with_build_args(args)
+      old_args = Gem::Command.build_args
+      begin
+        Gem::Command.build_args = args
+        yield
+      ensure
+        Gem::Command.build_args = old_args
+      end
+    end
+
+    def spec_from_gem(path)
+      Gem::Format.from_file_by_path(path).spec
+    end
+
+    def download_gem(spec, uri, path)
+      Gem::RemoteFetcher.fetcher.download(spec, uri, path)
+    end
+
+    def reverse_rubygems_kernel_mixin
+      # Disable rubygems' gem activation system
+      ::Kernel.class_eval do
+        if private_method_defined?(:gem_original_require)
+          alias rubygems_require require
+          alias require gem_original_require
+        end
+
+        undef gem
+      end
+    end
+
+    def replace_gem(specs)
+      executables = specs.map { |s| s.executables }.flatten
+
+      ::Kernel.send(:define_method, :gem) do |dep, *reqs|
+        if executables.include? File.basename(caller.first.split(':').first)
+          return
+        end
+        opts = reqs.last.is_a?(Hash) ? reqs.pop : {}
+
+        unless dep.respond_to?(:name) && dep.respond_to?(:requirement)
+          dep = Gem::Dependency.new(dep, reqs)
+        end
+
+        spec = specs.find  { |s| s.name == dep.name }
+
+        if spec.nil?
+
+          e = Gem::LoadError.new "#{dep.name} is not part of the bundle. Add it to Gemfile."
+          e.name = dep.name
+          if e.respond_to?(:requirement=)
+            e.requirement = dep.requirement
+          else
+            e.version_requirement = dep.requirement
+          end
+          raise e
+        elsif dep !~ spec
+          e = Gem::LoadError.new "can't activate #{dep}, already activated #{spec.full_name}. " \
+                                 "Make sure all dependencies are added to Gemfile."
+          e.name = dep.name
+          if e.respond_to?(:requirement=)
+            e.requirement = dep.requirement
+          else
+            e.version_requirement = dep.requirement
+          end
+          raise e
+        end
+
+        true
+      end
+    end
+
+    def stub_source_index137(specs)
+      # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
+      source_index_class = (class << Gem::SourceIndex ; self ; end)
+      source_index_class.send(:remove_method, :from_gems_in)
+      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
+      end
+    end
+
+    def stub_source_index170(specs)
+      Gem::SourceIndex.send(:define_method, :initialize) do |*args|
+        @gems = {}
+        self.spec_dirs = *args
+        add_specs(*specs)
+      end
+    end
+
+    # Used to make bin stubs that are not created by bundler work
+    # under bundler. The new Gem.bin_path only considers gems in
+    # +specs+
+    def replace_bin_path(specs)
+      gem_class = (class << Gem ; self ; end)
+      gem_class.send(:remove_method, :bin_path)
+      gem_class.send(:define_method, :bin_path) do |name, *args|
+        exec_name, *reqs = args
+
+        if exec_name == 'bundle'
+          return ENV['BUNDLE_BIN_PATH']
+        end
+
+        spec = nil
+
+        if exec_name
+          spec = specs.find { |s| s.executables.include?(exec_name) }
+          spec or raise Gem::Exception, "can't find executable #{exec_name}"
+        else
+          spec = specs.find  { |s| s.name == name }
+          exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}"
+        end
+
+        gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
+        gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
+        File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
+      end
+    end
+
+    # Because Bundler has a static view of what specs are available,
+    # we don't #reflesh, so stub it out.
+    def replace_refresh
+      gem_class = (class << Gem ; self ; end)
+      gem_class.send(:remove_method, :refresh)
+      gem_class.send(:define_method, :refresh) { }
+    end
+
+    # Replace or hook into Rubygems to provide a bundlerized view
+    # of the world.
+    def replace_entrypoints(specs)
+      reverse_rubygems_kernel_mixin
+
+      replace_gem(specs)
+
+      stub_rubygems(specs)
+
+      replace_bin_path(specs)
+      replace_refresh
+
+      Gem.clear_paths
+    end
+
+    class Modern < RubygemsIntegration
+      def stub_rubygems(specs)
+        Gem::Specification.all = specs
+
+        Gem.post_reset {
+          Gem::Specification.all = specs
+        }
+
+        stub_source_index170(specs)
+      end
+
+      def all_specs
+        Gem::Specification.to_a
+      end
+
+      def find_name(name)
+        Gem::Specification.find_all_by_name name
+      end
+
+    end
+
+    class Legacy < RubygemsIntegration
+      def stub_rubygems(specs)
+        stub_source_index137(specs)
+      end
+
+      def all_specs
+        Gem.source_index.all_gems.values
+      end
+
+      def find_name(name)
+        Gem.source_index.find_name(name)
+      end
+    end
+
+    class Transitional < Legacy
+      def stub_rubygems(specs)
+        stub_source_index170(specs)
+      end
+    end
+
+  end
+
+  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.7.0')
+    if Gem::Specification.respond_to? :all=
+      @rubygems = RubygemsIntegration::Modern.new
+    else
+      @rubygems = RubygemsIntegration::Transitional.new
+    end
+  else
+    @rubygems = RubygemsIntegration::Legacy.new
+  end
+
+  class << self
+    attr_reader :rubygems
+  end
+end

data/lib/bundler/runtime.rb

@@ -11,7 +11,7 @@ module Bundler
       specs = groups.any? ? @definition.specs_for(groups) : requested_specs
 
       setup_environment
-      cripple_rubygems(specs)
+      Bundler.rubygems.replace_entrypoints(specs)
 
       # Activate the specs
       specs.each do |spec|
@@ -19,7 +19,7 @@ module Bundler
           raise GemNotFound, "#{spec.full_name} is missing. Run `bundle` to get it."
         end
 
-        if activated_spec = Gem.loaded_specs[spec.name] and activated_spec.version != spec.version
+        if activated_spec = Bundler.rubygems.loaded_specs(spec.name) and activated_spec.version != spec.version
           e = Gem::LoadError.new "You have already activated #{activated_spec.name} #{activated_spec.version}, " \
                                  "but your Gemfile requires #{spec.name} #{spec.version}. Consider using bundle exec."
           e.name = spec.name
@@ -31,7 +31,7 @@ module Bundler
           raise e
         end
 
-        Gem.loaded_specs[spec.name] = spec
+        Bundler.rubygems.mark_loaded(spec)
         load_paths = spec.load_paths.reject {|path| $LOAD_PATH.include?(path)}
         $LOAD_PATH.unshift(*load_paths)
       end
@@ -102,7 +102,7 @@ module Bundler
       cached  = Dir["#{cache_path}/*.gem"]
 
       cached = cached.delete_if do |path|
-        spec = Gem::Format.from_file_by_path(path).spec
+        spec = Bundler.rubygems.spec_from_gem path
 
         resolve.any? do |s|
           s.name == spec.name && s.version == spec.version && !s.source.is_a?(Bundler::Source::Git)
@@ -127,7 +127,7 @@ module Bundler
 
     def setup_environment
       begin
-        ENV["BUNDLE_BIN_PATH"] = Gem.bin_path("bundler", "bundle", VERSION)
+        ENV["BUNDLE_BIN_PATH"] = Bundler.rubygems.bin_path("bundler", "bundle", VERSION)
       rescue Gem::GemNotFoundException
         ENV["BUNDLE_BIN_PATH"] = File.expand_path("../../../bin/bundle", __FILE__)
       end

data/lib/bundler/settings.rb

@@ -79,7 +79,7 @@ module Bundler
       if path = self[:path]
         "#{path}/#{Bundler.ruby_scope}"
       else
-        Gem.dir
+        Bundler.rubygems.gem_dir
       end
     end
 
@@ -106,7 +106,7 @@ module Bundler
     end
 
     def global_config_file
-      file = ENV["BUNDLE_CONFIG"] || File.join(Gem.user_home, ".bundle/config")
+      file = ENV["BUNDLE_CONFIG"] || File.join(Bundler.rubygems.user_home, ".bundle/config")
       Pathname.new(file)
     end
 

data/lib/bundler/setup.rb

@@ -2,12 +2,16 @@ require 'bundler/shared_helpers'
 
 if Bundler::SharedHelpers.in_bundle?
   require 'bundler'
-  begin
+  if STDOUT.tty?
+    begin
+      Bundler.setup
+    rescue Bundler::BundlerError => e
+      puts "\e[31m#{e.message}\e[0m"
+      puts e.backtrace.join("\n") if ENV["DEBUG"]
+      exit e.status_code
+    end
+  else
     Bundler.setup
-  rescue Bundler::BundlerError => e
-    puts "\e[31m#{e.message}\e[0m"
-    puts e.backtrace.join("\n") if ENV["DEBUG"]
-    exit e.status_code
   end
 
   # Add bundler to the load path after disabling system gems

data/lib/bundler/shared_helpers.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'rubygems'
-Gem.source_index # ensure Rubygems is fully loaded in Ruby 1.9
+
+require 'bundler/rubygems_integration'
 
 module Gem
   class Dependency
@@ -59,118 +60,12 @@ module Bundler
         $LOAD_PATH.reject! do |p|
           next if File.expand_path(p) =~ /^#{me}/
           p != File.dirname(__FILE__) &&
-            Gem.path.any?{|gp| p =~ /^#{gp}/ }
+            Bundler.rubygems.gem_path.any?{|gp| p =~ /^#{gp}/ }
         end
         $LOAD_PATH.uniq!
       end
     end
 
-    def reverse_rubygems_kernel_mixin
-      # Disable rubygems' gem activation system
-      ::Kernel.class_eval do
-        if private_method_defined?(:gem_original_require)
-          alias rubygems_require require
-          alias require gem_original_require
-        end
-
-        undef gem
-      end
-    end
-
-    def cripple_rubygems(specs)
-      reverse_rubygems_kernel_mixin
-
-      executables = specs.map { |s| s.executables }.flatten
-      Gem.source_index # ensure RubyGems is fully loaded
-
-      ::Kernel.send(:define_method, :gem) do |dep, *reqs|
-        if executables.include? File.basename(caller.first.split(':').first)
-          return
-        end
-        opts = reqs.last.is_a?(Hash) ? reqs.pop : {}
-
-        unless dep.respond_to?(:name) && dep.respond_to?(:requirement)
-          dep = Gem::Dependency.new(dep, reqs)
-        end
-
-        spec = specs.find  { |s| s.name == dep.name }
-
-        if spec.nil?
-
-          e = Gem::LoadError.new "#{dep.name} is not part of the bundle. Add it to Gemfile."
-          e.name = dep.name
-          if e.respond_to?(:requirement=)
-            e.requirement = dep.requirement
-          else
-            e.version_requirement = dep.requirement
-          end
-          raise e
-        elsif dep !~ spec
-          e = Gem::LoadError.new "can't activate #{dep}, already activated #{spec.full_name}. " \
-                                 "Make sure all dependencies are added to Gemfile."
-          e.name = dep.name
-          if e.respond_to?(:requirement=)
-            e.requirement = dep.requirement
-          else
-            e.version_requirement = dep.requirement
-          end
-          raise e
-        end
-
-        true
-      end
-
-      # === Following hacks are to improve on the generated bin wrappers ===
-
-      # Yeah, talk about a hack
-      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.7.0')
-        Gem::SourceIndex.send(:define_method, :initialize) do |*args|
-          @gems = {}
-          self.spec_dirs = *args
-          add_specs(*specs)
-        end
-      else
-        # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
-        source_index_class = (class << Gem::SourceIndex ; self ; end)
-        source_index_class.send(:remove_method, :from_gems_in)
-        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
-        end
-      end
-
-      # OMG more hacks
-      gem_class = (class << Gem ; self ; end)
-      gem_class.send(:remove_method, :refresh)
-      gem_class.send(:define_method, :refresh) { }
-      gem_class.send(:remove_method, :bin_path)
-      gem_class.send(:define_method, :bin_path) do |name, *args|
-        exec_name, *reqs = args
-
-        if exec_name == 'bundle'
-          return ENV['BUNDLE_BIN_PATH']
-        end
-
-        spec = nil
-
-        if exec_name
-          spec = specs.find { |s| s.executables.include?(exec_name) }
-          spec or raise Gem::Exception, "can't find executable #{exec_name}"
-        else
-          spec = specs.find  { |s| s.name == name }
-          exec_name = spec.default_executable or raise Gem::Exception, "no default executable for #{spec.full_name}"
-        end
-
-        gem_bin = File.join(spec.full_gem_path, spec.bindir, exec_name)
-        gem_from_path_bin = File.join(File.dirname(spec.loaded_from), spec.bindir, exec_name)
-        File.exist?(gem_bin) ? gem_bin : gem_from_path_bin
-      end
-
-      Gem.clear_paths
-    end
-
     extend self
   end
 end

data/lib/bundler/source.rb

@@ -17,8 +17,12 @@ module Bundler
         @remotes = (options["remotes"] || []).map { |r| normalize_uri(r) }
         @allow_remote = false
         @allow_cached = false
+
         # Hardcode the paths for now
-        @caches = [ Bundler.app_cache ] + Gem.path.map { |p| File.expand_path("#{p}/cache") }
+        @caches = [ Bundler.app_cache ] + Bundler.rubygems.gem_path.map do |x|
+          File.expand_path("#{x}/cache")
+        end
+
         @spec_fetch_map = {}
       end
 
@@ -70,7 +74,7 @@ module Bundler
         spec, uri = @spec_fetch_map[spec.full_name]
         if spec
           path = download_gem_from_uri(spec, uri)
-          s = Gem::Format.from_file_by_path(path).spec
+          s = Bundler.rubygems.spec_from_gem(path)
           spec.__swap__(s)
         end
       end
@@ -85,7 +89,7 @@ module Bundler
 
         Bundler.ui.info "Installing #{spec.name} (#{spec.version}) "
 
-        install_path = Bundler.requires_sudo? ? Bundler.tmp : Gem.dir
+        install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
         options = { :install_dir         => install_path,
                     :ignore_dependencies => true,
                     :wrappers            => true,
@@ -97,16 +101,16 @@ module Bundler
 
         # SUDO HAX
         if Bundler.requires_sudo?
-          sudo "mkdir -p #{Gem.dir}/gems #{Gem.dir}/specifications"
-          sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Gem.dir}/gems/"
-          sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Gem.dir}/specifications/"
+          sudo "mkdir -p #{Bundler.rubygems.gem_dir}/gems #{Bundler.rubygems.gem_dir}/specifications"
+          sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Bundler.rubygems.gem_dir}/gems/"
+          sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Bundler.rubygems.gem_dir}/specifications/"
           spec.executables.each do |exe|
-            sudo "mkdir -p #{Gem.bindir}"
-            sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Gem.bindir}"
+            sudo "mkdir -p #{Bundler.rubygems.gem_bindir}"
+            sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_bindir}"
           end
         end
 
-        spec.loaded_from = "#{Gem.dir}/specifications/#{spec.full_name}.gemspec"
+        spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
       end
 
       def sudo(str)
@@ -159,7 +163,7 @@ module Bundler
         @installed_specs ||= begin
           idx = Index.new
           have_bundler = false
-          Gem.source_index.to_a.reverse.each do |dont_use_this_var, spec|
+          Bundler.rubygems.all_specs.reverse.each do |spec|
             next if spec.name == 'bundler' && spec.version.to_s != VERSION
             have_bundler = true if spec.name == 'bundler'
             spec.source = self
@@ -176,6 +180,7 @@ module Bundler
              s.version  = VERSION
              s.platform = Gem::Platform::RUBY
              s.source   = self
+             s.authors  = ["bundler team"]
              s.loaded_from = File.expand_path("..", __FILE__)
            end
            idx << bundler
@@ -193,7 +198,7 @@ module Bundler
             next if gemfile =~ /bundler\-[\d\.]+?\.gem/
 
             begin
-              s ||= Gem::Format.from_file_by_path(gemfile).spec
+              s ||= Bundler.rubygems.spec_from_gem(gemfile)
             rescue Gem::Package::FormatError
               raise GemspecError, "Could not read gem at #{gemfile}. It may be corrupted."
             end
@@ -209,7 +214,7 @@ module Bundler
       def remote_specs
         @remote_specs ||= begin
           idx     = Index.new
-          old     = Gem.sources
+          old     = Bundler.rubygems.sources
 
           remotes.each do |uri|
             Bundler.ui.info "Fetching source index for #{uri}"
@@ -226,7 +231,7 @@ module Bundler
           end
           idx
         ensure
-          Gem.sources = old
+          Bundler.rubygems.sources = old
         end
       end
 
@@ -248,14 +253,14 @@ module Bundler
       def download_gem_from_uri(spec, uri)
         spec.fetch_platform
 
-        download_path = Bundler.requires_sudo? ? Bundler.tmp : Gem.dir
-        gem_path = "#{Gem.dir}/cache/#{spec.full_name}.gem"
+        download_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
+        gem_path = "#{Bundler.rubygems.gem_dir}/cache/#{spec.full_name}.gem"
 
         FileUtils.mkdir_p("#{download_path}/cache")
-        Gem::RemoteFetcher.fetcher.download(spec, uri, download_path)
+        Bundler.rubygems.download_gem(spec, uri, download_path)
 
         if Bundler.requires_sudo?
-          sudo "mkdir -p #{Gem.dir}/cache"
+          sudo "mkdir -p #{Bundler.rubygems.gem_dir}/cache"
           sudo "mv #{Bundler.tmp}/cache/#{spec.full_name}.gem #{gem_path}"
         end
 
@@ -349,6 +354,7 @@ module Bundler
               s.platform = Gem::Platform::RUBY
               s.summary  = "Fake gemspec for #{@name}"
               s.relative_loaded_from = "#{@name}.gemspec"
+              s.authors  = ["no one"]
               if expanded_path.join("bin").exist?
                 binaries = expanded_path.join("bin").children
                 binaries.reject!{|p| File.directory?(p) }
@@ -370,8 +376,8 @@ module Bundler
       class Installer < Gem::Installer
         def initialize(spec, options = {})
           @spec              = spec
-          @bin_dir           = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Gem.dir}/bin"
-          @gem_dir           = spec.full_gem_path
+          @bin_dir           = Bundler.requires_sudo? ? "#{Bundler.tmp}/bin" : "#{Bundler.rubygems.gem_dir}/bin"
+          @gem_dir           = Bundler.rubygems.path(spec.full_gem_path)
           @wrappers          = options[:wrappers] || true
           @env_shebang       = options[:env_shebang] || true
           @format_executable = options[:format_executable] || false
@@ -385,9 +391,9 @@ module Bundler
           end
           super
           if Bundler.requires_sudo?
-            Bundler.mkdir_p "#{Gem.dir}/bin"
+            Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/bin"
             spec.executables.each do |exe|
-              Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Gem.dir}/bin/"
+              Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.rubygems.gem_dir}/bin/"
             end
           end
         end

data/lib/bundler/version.rb

@@ -2,5 +2,5 @@ module Bundler
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = "1.0.12" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.13" unless defined?(::Bundler::VERSION)
 end

data/spec/install/gems/flex_spec.rb

@@ -185,10 +185,10 @@ describe "bundle flex_install" do
 
     it "does not install gems whose dependencies are not met" do
       bundle :install
-      ruby <<-RUBY
+      ruby <<-RUBY, :expect_err => true
         require 'bundler/setup'
       RUBY
-      out.should =~ /could not find gem 'rack-obama/i
+      err.should =~ /could not find gem 'rack-obama/i
     end
 
     it "suggests bundle update when the Gemfile requires different versions than the lock" do

data/spec/install/invalid_spec.rb

@@ -15,3 +15,21 @@ describe "bundle install with deprecated features" do
   end
 
 end
+
+describe "bundle install to a dead symlink" do
+  before do
+    in_app_root do
+      `ln -s /tmp/idontexist bundle`
+    end
+  end
+
+  it "reports the symlink is dead" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+      gem "rack"
+    G
+
+    bundle "install --path bundle"
+    out.should =~ /invalid symlink/
+  end
+end

data/spec/lock/git_spec.rb

@@ -27,7 +27,7 @@ describe "bundle lock with git gems" do
 
   it "provides correct #full_gem_path" do
     run <<-RUBY
-      puts Gem.source_index.find_name('foo').first.full_gem_path
+      puts Bundler.rubygems.find_name('foo').first.full_gem_path
     RUBY
     out.should == bundle("show foo")
   end

data/spec/other/exec_spec.rb

@@ -83,7 +83,8 @@ describe "bundle exec" do
       gem "rack"
     G
 
-    rubyopt = "-I#{bundler_path} -rbundler/setup"
+    rubyopt = ENV['RUBYOPT']
+    rubyopt = "-I#{bundler_path} -rbundler/setup #{rubyopt}"
 
     bundle "exec 'echo $RUBYOPT'"
     out.should have_rubyopts(rubyopt)

data/spec/runtime/setup_spec.rb

@@ -166,7 +166,7 @@ describe "Bundler.setup" do
     should_be_installed "rack 1.0.0"
   end
 
-  describe "crippling rubygems" do
+  describe "integrate with rubygems" do
     describe "by replacing #gem" do
       before :each do
         install_gemfile <<-G
@@ -522,7 +522,7 @@ describe "Bundler.setup" do
 
     run <<-R
       Gem.refresh
-      puts Gem.source_index.find_name("rack").inspect
+      puts Bundler.rubygems.find_name("rack").inspect
     R
 
     out.should == "[]"

data/spec/spec_helper.rb

@@ -39,8 +39,13 @@ RSpec.configure do |config|
   config.include Spec::Platforms
   config.include Spec::Sudo
 
+  if Spec::Sudo.test_sudo?
+    config.filter_run :sudo => true
+  else
+    config.filter_run_excluding :sudo => true
+  end
+
   config.filter_run :focused => true unless ENV['CI']
-  config.filter_run_excluding :sudo => true unless Spec::Sudo.test_sudo?
   config.run_all_when_everything_filtered = true
   config.alias_example_to :fit, :focused => true
 

data/spec/support/builders.rb

@@ -322,6 +322,9 @@ module Spec
 
       Array(versions).each do |version|
         spec = builder.new(self, name, version)
+        if !spec.authors or spec.authors.empty?
+          spec.authors = ["no one"]
+        end
         yield spec if block_given?
         spec._build(options)
       end
@@ -454,6 +457,8 @@ module Spec
           @files = _default_files.merge(@files)
         end
 
+        @spec.authors = ["no one"]
+
         @files.each do |file, source|
           file = Pathname.new(path).join(file)
           FileUtils.mkdir_p(file.dirname)
@@ -563,6 +568,11 @@ module Spec
         Dir.chdir(lib_path) do
           destination = opts[:path] || _default_path
           FileUtils.mkdir_p(destination)
+
+          if !@spec.authors or @spec.authors.empty?
+            @spec.authors = ["that guy"]
+          end
+
           Gem::Builder.new(@spec).build
           if opts[:to_system]
             `gem install --ignore-dependencies #{@spec.full_name}.gem`

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
   - 0
-  - 12
-  version: 1.0.12
+  - 13
+  version: 1.0.13
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -07:00
+date: 2011-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
 - lib/bundler/rubygems_ext.rb
+- lib/bundler/rubygems_integration.rb
 - lib/bundler/runtime.rb
 - lib/bundler/settings.rb
 - lib/bundler/setup.rb