bundler 1.1.pre.1 → 1.1.pre.2

data/lib/bundler/settings.rb

@@ -16,7 +16,7 @@ module Bundler
     end
 
     def delete(key)
-      @local_config
+      @local_config.delete(key_for(key))
     end
 
     def set_global(key, value)
@@ -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/shared_helpers.rb

@@ -1,6 +1,9 @@
 require 'pathname'
 require 'rubygems'
-Gem.source_index # ensure Rubygems is fully loaded in Ruby 1.9
+
+require 'bundler/rubygems_integration'
+
+Bundler.rubygems.fully_load!
 
 module Gem
   class Dependency
@@ -59,109 +62,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
-      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
-
-      # 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

@@ -19,7 +19,9 @@ module Bundler
         @allow_remote = false
         @allow_cached = false
 
-        @caches = [ Bundler.app_cache ] + Gem.path.map{ |p| File.expand_path("#{p}/cache") }
+        @caches = [ Bundler.app_cache ]
+        @caches << Bundler.rubygems.gem_path.map{|p| File.expand_path("#{p}/cache") }
+
         @spec_fetch_map = {}
       end
 
@@ -71,7 +73,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
@@ -86,7 +88,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,
@@ -98,16 +100,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.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)
@@ -160,7 +162,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
@@ -194,7 +196,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
@@ -210,7 +212,7 @@ module Bundler
       def remote_specs(dependencies = nil)
         @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}"
@@ -232,21 +234,21 @@ module Bundler
           end
           idx
         ensure
-          Gem.sources = old
+          Bundler.rubygems.sources = old
         end
       end
 
       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
 
@@ -308,14 +310,13 @@ module Bundler
       def eql?(o)
         o.instance_of?(Path) &&
         path.expand_path(Bundler.root) == o.path.expand_path(Bundler.root) &&
-        name == o.name &&
         version == o.version
       end
 
       alias == eql?
 
       def name
-        File.basename(@path.to_s)
+        File.basename(path.expand_path(Bundler.root).to_s)
       end
 
       def load_spec_files
@@ -342,8 +343,9 @@ module Bundler
               s.summary  = "Fake gemspec for #{@name}"
               s.relative_loaded_from = "#{@name}.gemspec"
               if expanded_path.join("bin").exist?
-                binaries = expanded_path.join("bin").children.map{|c| c.basename.to_s }
-                s.executables = binaries
+                binaries = expanded_path.join("bin").children
+                binaries.reject!{|p| File.directory?(p) }
+                s.executables = binaries.map{|c| c.basename.to_s }
               end
             end
           end
@@ -361,8 +363,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
@@ -376,9 +378,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
@@ -551,7 +553,9 @@ module Bundler
           out = %x{git #{command}}
 
           if $?.exitstatus != 0
-            raise GitError, "An error has occurred in git when running `git #{command}`. Cannot complete bundling."
+            msg = "Git error: command `git #{command}` in directory #{Dir.pwd} has failed."
+            msg << "\nIf this error persists you could try removing the cache directory '#{cache_path}'" if cached?
+            raise GitError, msg
           end
           out
         else
@@ -602,7 +606,7 @@ module Bundler
           return if has_revision_cached?
           Bundler.ui.info "Updating #{uri}"
           in_cache do
-            git %|fetch --force --quiet --tags "#{uri}" refs/heads/*:refs/heads/*|
+            git %|fetch --force --quiet --tags "#{uri}" "refs/heads/*:refs/heads/*"|
           end
         else
           Bundler.ui.info "Fetching #{uri}"

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.1.pre.1" unless defined?(::Bundler::VERSION)
+  VERSION = "1.1.pre.2" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-install.ronn

@@ -60,6 +60,7 @@ update process below under [CONSERVATIVE UPDATING][].
 
 * `--deployment`:
   Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE].
+  Do not use this flag on development machines.
 
 * `--binstubs[=<directory>]`:
   Create a directory (defaults to `bin`) containing an executable
@@ -72,6 +73,8 @@ update process below under [CONSERVATIVE UPDATING][].
 
 Bundler's defaults are optimized for development. To switch to
 defaults optimized for deployment, use the `--deployment` flag.
+Do not activate deployment mode on development machines, as it
+will cause in an error when the Gemfile is modified.
 
 1. A `Gemfile.lock` is required.
 

data/spec/install/deploy_spec.rb

@@ -76,7 +76,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile")
       out.should include("* rack-obama")
       out.should_not include("You have deleted from the Gemfile")
@@ -92,7 +92,7 @@ describe "install with --deployment or --frozen" do
 
       ENV['BUNDLE_FROZEN'] = '1'
       bundle "install"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile")
       out.should include("* rack-obama")
       out.should_not include("You have deleted from the Gemfile")
@@ -107,7 +107,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --frozen"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile")
       out.should include("* rack-obama")
       out.should_not include("You have deleted from the Gemfile")
@@ -121,7 +121,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile:\n* activesupport\n\n")
       out.should include("You have deleted from the Gemfile:\n* rack")
       out.should_not include("You have changed in the Gemfile")
@@ -134,7 +134,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have added to the Gemfile:\n* source: git://hubz.com (at master)")
       out.should_not include("You have changed in the Gemfile")
     end
@@ -153,7 +153,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")} (at master)")
       out.should_not include("You have added to the Gemfile")
       out.should_not include("You have changed in the Gemfile")
@@ -176,7 +176,7 @@ describe "install with --deployment or --frozen" do
       G
 
       bundle "install --deployment"
-      out.should include("You have modified your Gemfile")
+      out.should include("deployment mode")
       out.should include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")} (at master)`")
       out.should_not include("You have added to the Gemfile")
       out.should_not include("You have deleted from the Gemfile")

data/spec/install/git_spec.rb

@@ -348,7 +348,7 @@ describe "bundle install with git sources" do
 
     bundle :install, :expect_err => true
 
-    out.should include("An error has occurred in git")
+    out.should include("Git error:")
     err.should include("fatal")
     err.should include("omgomg")
     err.should include("fatal: The remote end hung up unexpectedly")

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/install/path_spec.rb

@@ -141,6 +141,47 @@ describe "bundle install with explicit source paths" do
     should_be_installed "rack 1.0"
   end
 
+  it "doesn't automatically unlock dependencies when using the gemspec syntax" do
+    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+      s.add_dependency "rack", ">= 1.0"
+    end
+
+    Dir.chdir lib_path("foo")
+
+    install_gemfile lib_path("foo/Gemfile"), <<-G
+      source "file://#{gem_repo1}"
+      gemspec
+    G
+
+    build_gem "rack", "1.0.1", :to_system => true
+
+    bundle "install"
+
+    should_be_installed "foo 1.0"
+    should_be_installed "rack 1.0"
+  end
+
+  it "doesn't automatically unlock dependencies when using the gemspec syntax and the gem has development dependencies" do
+    build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+      s.add_dependency "rack", ">= 1.0"
+      s.add_development_dependency "activesupport"
+    end
+
+    Dir.chdir lib_path("foo")
+
+    install_gemfile lib_path("foo/Gemfile"), <<-G
+      source "file://#{gem_repo1}"
+      gemspec
+    G
+
+    build_gem "rack", "1.0.1", :to_system => true
+
+    bundle "install"
+
+    should_be_installed "foo 1.0"
+    should_be_installed "rack 1.0"
+  end
+
   it "raises if there are multiple gemspecs" do
     build_lib "foo", "1.0", :path => lib_path("foo") do |s|
       s.write "bar.gemspec"
@@ -182,6 +223,17 @@ describe "bundle install with explicit source paths" do
     out.should == "1.0"
   end
 
+  it "handles directories in bin/" do
+    build_lib "foo"
+    lib_path("foo-1.0").join("foo.gemspec").rmtree
+    lib_path("foo-1.0").join("bin/performance").mkpath
+
+    install_gemfile <<-G
+      gem 'foo', '1.0', :path => "#{lib_path('foo-1.0')}"
+    G
+    err.should == ""
+  end
+
   it "removes the .gem file after installing" do
     build_lib "foo"