bundler 1.0.13 → 1.0.14

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 1.0.14 (May 27, 2011)
+
+Features:
+
+  - Rubinius platform :rbx (@rkbodenner)
+  - Include gem rake tasks with "require 'bundler/gem_tasks" (@indirect)
+  - Include user name and email from git config in new gemspec (@ognevsky)
+
+Bugfixes:
+
+  - Set file permissions after checking out git repos (@tissak)
+  - Remove deprecated call to Gem::SourceIndex#all_gems (@mpj)
+  - Require the version file in new gemspecs (@rubiii)
+  - Allow relative paths from the Gemfile in gems with no gemspec (@mbirk)
+  - Install gems that contain 'bundler', e.g. guard-bundler (@hone)
+  - Display installed path correctly on Windows (@tadman)
+  - Escape quotes in git URIs (@mheffner)
+  - Improve Rake 0.9 support (@quix)
+  - Handle certain directories already existing (@raggi)
+  - Escape filenames containing regex characters (@indirect)
+
 ## 1.0.13 (May 4, 2011)
 
 Features:

data/ISSUES.md

@@ -1,8 +1,20 @@
 # Bundler Issues
 
+## Frequently encountered issues
+
+### REE and Zlib::GzipFile::Error
+
+Ruby Enterprise Edition users may see a `Zlib::GzipFile::Error` while installing gems. It is due to [a bug in REE](http://code.google.com/p/rubyenterpriseedition/issues/detail?id=45). You may be able to resolve the issue by upgrading REE, or changing to a different interpreter.
+
+### Rake activation error
+
+Anyone who has installed the Spork gem may see activation errors while running `rake` directly. This is because installing Spork would [install the newest rake using a mkmf file](https://github.com/timcharper/spork/issues/119). To resolve the issue, update your Gemfile to include either the newest version of Rake or the newest version of Spork (which no longer installs Rake).
+
 ## Troubleshooting
 
-Instructions for common Bundler use-cases can be found on the [Bundler documentation site](http://gembundler.com/v1.0/). Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/man/bundle.1.html).
+Instructions for common Bundler use-cases can be found on the [Bundler documentation site](http://gembundler.com/v1.0/).
+
+Detailed information about each Bundler command, including help with common problems, can be found in the [Bundler man pages](http://gembundler.com/man/bundle.1.html).
 
 After reading the documentation, try these troubleshooting steps:
 
@@ -26,22 +38,23 @@ After reading the documentation, try these troubleshooting steps:
 
 ## Reporting unresolved problems
 
-If you are still having problems, please report issues to the [Bundler issue tracker](http://github.com/carlhuda/bundler/issues/).
-
-Instructions that allow the Bundler team to reproduce your issue are vitally important. When you report a bug, please create a gist of the following information and include a link in your ticket:
+Instructions that allow the Bundler team to reproduce your issue are vitally important. When you report a bug, please include the following information:
 
-  - What version of bundler you are using
-  - What version of Ruby you are using
-  - Whether you are using RVM, and if so what version
+  - The command you ran
+  - Exception backtrace(s), if any
   - Your Gemfile
   - Your Gemfile.lock
-  - If you are on 0.9, whether you have locked or not
-  - If you are on 1.0, the result of `bundle config`
-  - The command you ran to generate exception(s)
-  - The exception backtrace(s)
+  - Your Bundler configuration settings (run `bundle config`)
+  - What version of bundler you are using (run `bundle -v`)
+  - What version of Ruby you are using (run `ruby -v`)
+  - What version of Rubygems you are using (run `gem -v`)
+  - Whether you are using RVM, and if so what version (run `rvm -v`)
+
 
 If you are using Rails 2.3, please also include:
 
   - Your boot.rb file
   - Your preinitializer.rb file
   - Your environment.rb file
+
+[Create a gist](https://gist.github.com) containing all of that information, then visit the [Bundler issue tracker](https://github.com/carlhuda/bundler) and create a new ticket describing your problem and linking to your gist.

data/Rakefile

@@ -1,11 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
-require 'bundler/gem_helper'
-Bundler::GemHelper.install_tasks
-
-def sudo?
-  ENV['BUNDLER_SUDO_TESTS']
-end
+require 'bundler/gem_tasks'
 
 begin
   # set up rspec tasks
@@ -42,31 +37,37 @@ begin
   end
 
   namespace :spec do
+    task :clean do
+      rm_rf 'tmp'
+    end
+
     desc "Run the spec suite with the sudo tests"
-    task :sudo => ["set_sudo", "clean", "spec"]
+    task :sudo => ["set_sudo", "spec", "clean_sudo"]
 
     task :set_sudo do
       ENV['BUNDLER_SUDO_TESTS'] = '1'
     end
 
-    task :clean do
-      if sudo?
-        system "sudo rm -rf #{File.expand_path('../tmp', __FILE__)}"
-      else
-        rm_rf 'tmp'
-      end
+    task :clean_sudo do
+      puts "Cleaning up sudo test files..."
+      system "sudo rm -rf #{File.expand_path('../tmp/sudo_gem_home', __FILE__)}"
     end
 
     namespace :rubygems do
       # Rubygems 1.3.5, 1.3.6, and HEAD specs
       rubyopt = ENV["RUBYOPT"]
-      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.1 v1.7.2).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.3).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
           t.ruby_opts  = %w(-w)
         end
 
+        # Create tasks like spec:rubygems:v1.8.3:sudo to run the sudo specs
+        namespace rg do
+          task :sudo => ["set_sudo", rg, "clean_sudo"]
+        end
+
         task "clone_rubygems_#{rg}" do
           unless File.directory?("tmp/rubygems")
             system("git clone git://github.com/rubygems/rubygems.git tmp/rubygems")

data/lib/bundler/cli.rb

@@ -223,8 +223,7 @@ module Bundler
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
 
       if Bundler.settings[:path]
-        relative_path = Bundler.settings[:path]
-        relative_path = "./" + relative_path unless relative_path[0] == ?/
+        relative_path = File.expand_path(Bundler.settings[:path]).sub(/^#{File.expand_path('.')}/, '.')
         Bundler.ui.confirm "Your bundle is complete! " +
           "It was installed into #{relative_path}"
       else
@@ -480,8 +479,12 @@ module Bundler
       constant_name = name.split('_').map{|p| p.capitalize}.join
       constant_name = constant_name.split('-').map{|q| q.capitalize}.join('::') if constant_name =~ /-/
       constant_array = constant_name.split('::')
+      git_author_name = `git config user.name`.chomp
+      git_author_email = `git config user.email`.chomp
+      author_name = git_author_name.empty? ? "TODO: Write your name" : git_author_name
+      author_email = git_author_email.empty? ? "TODO: Write your email address" : git_author_email
       FileUtils.mkdir_p(File.join(target, 'lib', name))
-      opts = {:name => name, :constant_name => constant_name, :constant_array => constant_array}
+      opts = {:name => name, :constant_name => constant_name, :constant_array => constant_array, :author_name => author_name, :author_email => author_email}
       template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                opts)
       template(File.join("newgem/Rakefile.tt"),              File.join(target, "Rakefile"),               opts)
       template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),             opts)

data/lib/bundler/dependency.rb

@@ -15,6 +15,7 @@ module Bundler
       :mri      => Gem::Platform::RUBY,
       :mri_18   => Gem::Platform::RUBY,
       :mri_19   => Gem::Platform::RUBY,
+      :rbx      => Gem::Platform::RUBY,
       :jruby    => Gem::Platform::JAVA,
       :mswin    => Gem::Platform::MSWIN,
       :mingw    => Gem::Platform::MINGW,
@@ -107,6 +108,10 @@ module Bundler
       mri? && RUBY_VERSION >= "1.9"
     end
 
+    def rbx?
+      ruby? && defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+    end
+
     def jruby?
       defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
     end

data/lib/bundler/gem_helper.rb

@@ -2,15 +2,10 @@ $:.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
+    include Rake::DSL if defined? Rake::DSL
+
     def self.install_tasks(opts = {})
       dir = opts[:dir] || Dir.pwd
       self.new(dir, opts[:name]).install

data/lib/bundler/gem_tasks.rb

@@ -0,0 +1,2 @@
+require 'bundler/gem_helper'
+Bundler::GemHelper.install_tasks

data/lib/bundler/rubygems_ext.rb

@@ -19,7 +19,7 @@ module Gem
 
     def full_gem_path
       source.respond_to?(:path) ?
-        Pathname.new(loaded_from).dirname.expand_path.to_s :
+        Pathname.new(loaded_from).dirname.expand_path(Bundler.root).to_s :
         rg_full_gem_path
     end
 

data/lib/bundler/rubygems_integration.rb

@@ -46,7 +46,7 @@ module Bundler
     end
 
     def gem_dir
-      Gem.dir.to_s
+      Gem.dir
     end
 
     def gem_bindir
@@ -58,9 +58,7 @@ module Bundler
     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 }
+      Gem.path
     end
 
     def marshal_spec_dir
@@ -75,6 +73,11 @@ module Bundler
       Gem.bin_path(gem, bin, ver)
     end
 
+    def preserve_paths
+      # this is a no-op outside of Rubygems 1.8
+      yield
+    end
+
     def ui=(obj)
       Gem::DefaultUserInteraction.ui = obj
     end
@@ -226,44 +229,55 @@ module Bundler
       Gem.clear_paths
     end
 
-    class Modern < RubygemsIntegration
+    # Rubygems versions 1.3.6 through 1.6.2
+    class Legacy < RubygemsIntegration
       def stub_rubygems(specs)
-        Gem::Specification.all = specs
-
-        Gem.post_reset {
-          Gem::Specification.all = specs
-        }
-
-        stub_source_index170(specs)
+        stub_source_index137(specs)
       end
 
       def all_specs
-        Gem::Specification.to_a
+        Gem.source_index.gems.values
       end
 
       def find_name(name)
-        Gem::Specification.find_all_by_name name
+        Gem.source_index.find_name(name)
       end
+    end
 
+    # Rubygems 1.7
+    class Transitional < Legacy
+      def stub_rubygems(specs)
+        stub_source_index170(specs)
+      end
     end
 
-    class Legacy < RubygemsIntegration
+    # Rubygems 1.8
+    class Modern < RubygemsIntegration
       def stub_rubygems(specs)
-        stub_source_index137(specs)
+        Gem::Specification.all = specs
+
+        Gem.post_reset {
+          Gem::Specification.all = specs
+        }
+
+        stub_source_index170(specs)
       end
 
       def all_specs
-        Gem.source_index.all_gems.values
+        Gem::Specification.to_a
       end
 
       def find_name(name)
-        Gem.source_index.find_name(name)
+        Gem::Specification.find_all_by_name name
       end
-    end
 
-    class Transitional < Legacy
-      def stub_rubygems(specs)
-        stub_source_index170(specs)
+      # Rubygems 1.8 changes Gem.dir when you call Gem::Installer#install with
+      # an :install_path option. I guess this makes sense for them, but we have
+      # to change it back for our sudo mode to work.
+      def preserve_paths
+        old_dir, old_path = gem_dir, gem_path
+        yield
+        Gem.use_paths(old_dir, old_path)
       end
     end
 
@@ -271,11 +285,14 @@ module Bundler
 
   if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.7.0')
     if Gem::Specification.respond_to? :all=
+      # >= 1.8
       @rubygems = RubygemsIntegration::Modern.new
     else
+      # 1.7.x
       @rubygems = RubygemsIntegration::Transitional.new
     end
   else
+    # < 1.7.0
     @rubygems = RubygemsIntegration::Legacy.new
   end
 

data/lib/bundler/runtime.rb

@@ -85,7 +85,7 @@ module Bundler
     alias gems specs
 
     def cache
-      FileUtils.mkdir_p(cache_path)
+      FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
 
       Bundler.ui.info "Updating .gem files in vendor/cache"
       specs.each do |spec|
@@ -96,7 +96,7 @@ module Bundler
     end
 
     def prune_cache
-      FileUtils.mkdir_p(cache_path)
+      FileUtils.mkdir_p(cache_path) unless File.exists?(cache_path)
 
       resolve = @definition.resolve
       cached  = Dir["#{cache_path}/*.gem"]

data/lib/bundler/shared_helpers.rb

@@ -58,9 +58,9 @@ module Bundler
       if defined?(::Gem)
         me = File.expand_path("../../", __FILE__)
         $LOAD_PATH.reject! do |p|
-          next if File.expand_path(p) =~ /^#{me}/
+          next if File.expand_path(p) =~ /^#{Regexp.escape(me)}/
           p != File.dirname(__FILE__) &&
-            Bundler.rubygems.gem_path.any?{|gp| p =~ /^#{gp}/ }
+            Bundler.rubygems.gem_path.any?{|gp| p =~ /^#{Regexp.escape(gp)}/ }
         end
         $LOAD_PATH.uniq!
       end

data/lib/bundler/source.rb

@@ -80,24 +80,26 @@ module Bundler
       end
 
       def install(spec)
-        path = cached_gem(spec)
-
         if installed_specs[spec].any?
           Bundler.ui.info "Using #{spec.name} (#{spec.version}) "
           return
         end
 
         Bundler.ui.info "Installing #{spec.name} (#{spec.version}) "
+        path = cached_gem(spec)
+
+        Bundler.rubygems.preserve_paths do
 
-        install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
-        options = { :install_dir         => install_path,
-                    :ignore_dependencies => true,
-                    :wrappers            => true,
-                    :env_shebang         => true }
-        options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty?
+          install_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
+          options = { :install_dir         => install_path,
+                      :ignore_dependencies => true,
+                      :wrappers            => true,
+                      :env_shebang         => true }
+          options.merge!(:bin_dir => "#{install_path}/bin") unless spec.executables.nil? || spec.executables.empty?
 
-        installer = Gem::Installer.new path, options
-        installer.install
+          installer = Gem::Installer.new path, options
+          installer.install
+        end
 
         # SUDO HAX
         if Bundler.requires_sudo?
@@ -140,7 +142,11 @@ module Bundler
 
       def cached_gem(spec)
         possibilities = @caches.map { |p| "#{p}/#{spec.file_name}" }
-        possibilities.find { |p| File.exist?(p) }
+        cached_gem = possibilities.find { |p| File.exist?(p) }
+        unless cached_gem
+          raise Bundler::GemNotFound, "Could not find #{spec.file_name} for installation"
+        end
+        cached_gem
       end
 
       def normalize_uri(uri)
@@ -195,7 +201,7 @@ module Bundler
 
           path = Bundler.app_cache
           Dir["#{path}/*.gem"].each do |gemfile|
-            next if gemfile =~ /bundler\-[\d\.]+?\.gem/
+            next if gemfile =~ /^bundler\-[\d\.]+?\.gem/
 
             begin
               s ||= Bundler.rubygems.spec_from_gem(gemfile)
@@ -602,6 +608,13 @@ module Bundler
         Digest::SHA1.hexdigest(input)
       end
 
+      # Escape the URI for shell commands. To support a single quote
+      # within the URI we must end the string, escape the quote and
+      # restart.
+      def uri_escaped
+        "'#{uri.gsub("'") {|s| "'\\''"}}'"
+      end
+
       def cache_path
         @cache_path ||= begin
           git_scope = "#{base_name}-#{uri_hash}"
@@ -619,12 +632,12 @@ 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_escaped} "refs/heads/*:refs/heads/*"|
           end
         else
           Bundler.ui.info "Fetching #{uri}"
           FileUtils.mkdir_p(cache_path.dirname)
-          git %|clone "#{uri}" "#{cache_path}" --bare --no-hardlinks|
+          git %|clone #{uri_escaped} "#{cache_path}" --bare --no-hardlinks|
         end
       end
 
@@ -633,6 +646,7 @@ module Bundler
           FileUtils.mkdir_p(path.dirname)
           FileUtils.rm_rf(path)
           git %|clone --no-checkout "#{cache_path}" "#{path}"|
+          File.chmod((0777 & ~File.umask), path)
         end
         Dir.chdir(path) do
           git %|fetch --force --quiet --tags "#{cache_path}"|

data/lib/bundler/templates/newgem/Rakefile.tt

@@ -1,2 +1 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'

data/lib/bundler/templates/newgem/lib/newgem.rb.tt

@@ -1,3 +1,5 @@
+require "<%=config[:name]%>/version"
+
 <%- config[:constant_array].each_with_index do |c,i| -%>
 <%= '  '*i %>module <%= c %>
 <%- end -%>

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -5,9 +5,8 @@ require "<%=config[:name]%>/version"
 Gem::Specification.new do |s|
   s.name        = <%=config[:name].inspect%>
   s.version     = <%=config[:constant_name]%>::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["TODO: Write your name"]
-  s.email       = ["TODO: Write your email address"]
+  s.authors     = ["<%= config[:author_name] %>"]
+  s.email       = ["<%= config[:author_email] %>"]
   s.homepage    = ""
   s.summary     = %q{TODO: Write a gem summary}
   s.description = %q{TODO: Write a gem description}

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.13" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.14" unless defined?(::Bundler::VERSION)
 end

data/man/gemfile.5.ronn

@@ -120,6 +120,8 @@ There are a number of `Gemfile` platforms:
     _mri_ `AND` version 1.8
   * `mri_19`:
     _mri_ `AND` version 1.9
+  * `rbx`:
+    Same as _ruby_, but only Rubinius (not MRI)
   * `jruby`:
     JRuby
   * `mswin`:

data/spec/cache/gems_spec.rb

@@ -214,6 +214,17 @@ describe "bundle cache" do
       bundle "install"
       out.should_not =~ /removing/i
     end
+
+    it "should install gems with the name bundler in them (that aren't bundler)" do
+      build_gem "foo-bundler", "1.0",
+        :path => bundled_app('vendor/cache')
+
+      install_gemfile <<-G
+        gem "foo-bundler"
+      G
+
+      should_be_installed "foo-bundler 1.0"
+    end
   end
 
 end

data/spec/install/deploy_spec.rb

@@ -21,7 +21,7 @@ describe "install with --deployment or --frozen" do
   it "works after you try to deploy without a lock" do
     bundle "install --deployment"
     bundle :install, :exitstatus => true
-    check exitstatus.should == 0
+    exitstatus.should eq(0)
     should_be_installed "rack 1.0"
   end
 

data/spec/install/gems/groups_spec.rb

@@ -35,13 +35,13 @@ describe "bundle install with gem sources" do
 
       it "sets up everything if Bundler.setup is used with no groups" do
         out = run("require 'rack'; puts RACK")
-        check out.should == '1.0.0'
+        out.should eq('1.0.0')
 
         out = run("require 'activesupport'; puts ACTIVESUPPORT")
-        check out.should == '2.3.5'
+        out.should eq('2.3.5')
 
         out = run("require 'thin'; puts THIN")
-        out.should == '1.0'
+        out.should eq('1.0')
       end
 
       it "removes old groups when new groups are set up" do

data/spec/install/gems/sudo_spec.rb

@@ -10,10 +10,11 @@ describe "when using sudo", :sudo => true do
       install_gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rack", '1.0'
+        gem "thin"
       G
 
       system_gem_path("gems/rack-1.0.0").should exist
-      check system_gem_path("gems/rack-1.0.0").stat.uid.should == 0
+      system_gem_path("gems/rack-1.0.0").stat.uid.should eq(0)
       should_be_installed "rack 1.0"
     end
 
@@ -29,7 +30,7 @@ describe "when using sudo", :sudo => true do
       G
 
       bundle_path.join("gems/rack-1.0.0").should exist
-      check bundle_path.join("gems/rack-1.0.0").stat.uid.should == 0
+      bundle_path.join("gems/rack-1.0.0").stat.uid.should eq(0)
       should_be_installed "rack 1.0"
     end
 

data/spec/install/git_spec.rb

@@ -145,7 +145,7 @@ describe "bundle install with git sources" do
           gem "foo"
         end
       G
-      check err.should == ""
+      err.should eq("")
 
       run <<-RUBY
         require 'foo'

data/spec/install/path_spec.rb

@@ -191,7 +191,7 @@ describe "bundle install with explicit source paths" do
       gemspec :path => "#{lib_path("foo")}"
     G
 
-    check exitstatus.should == 15
+    exitstatus.should eq(15)
     out.should =~ /There are multiple gemspecs/
   end
 

data/spec/lock/lockfile_spec.rb

@@ -318,7 +318,7 @@ describe "the lockfile format" do
             actionpack (= 2.3.2)
             activerecord (= 2.3.2)
             activeresource (= 2.3.2)
-            rake
+            rake (= 0.8.7)
           rake (0.8.7)
 
       PLATFORMS

data/spec/other/check_spec.rb

@@ -8,7 +8,7 @@ describe "bundle check" do
     G
 
     bundle :check, :exitstatus => true
-    check @exitstatus.should == 0
+    @exitstatus.should eq(0)
     out.should == "The Gemfile's dependencies are satisfied"
   end
 
@@ -55,7 +55,7 @@ describe "bundle check" do
     G
 
     bundle :check, :exitstatus => true
-    check @exitstatus.should > 0
+    @exitstatus.should be > 0
     out.should include("could not be satisfied")
   end
 
@@ -89,7 +89,7 @@ describe "bundle check" do
 
     bundle "install --without foo"
     bundle "check", :exitstatus => true
-    check @exitstatus.should == 0
+    @exitstatus.should eq(0)
     out.should include("The Gemfile's dependencies are satisfied")
   end
 
@@ -175,7 +175,7 @@ describe "bundle check" do
 
   it "outputs an error when the default Gemfile is not found" do
     bundle :check, :exitstatus => true
-    check @exitstatus.should == 10
+    @exitstatus.should eq(10)
     out.should include("Could not locate Gemfile")
   end
 
@@ -190,7 +190,7 @@ describe "bundle check" do
     last_out = out
     3.times do |i|
       bundle :check
-      check out.should == last_out
+      out.should eq(last_out)
       err.should be_empty
     end
   end
@@ -207,7 +207,7 @@ describe "bundle check" do
     it "returns success when the Gemfile is satisfied" do
       bundle :install
       bundle :check, :exitstatus => true
-      check @exitstatus.should == 0
+      @exitstatus.should eq(0)
       out.should == "The Gemfile's dependencies are satisfied"
     end
 

data/spec/other/exec_spec.rb

@@ -54,7 +54,7 @@ describe "bundle exec" do
 
     bundle "exec rackup"
 
-    check out.should == "0.9.1"
+    out.should eq("0.9.1")
 
     Dir.chdir bundled_app2 do
       bundle "exec rackup"
@@ -74,7 +74,7 @@ describe "bundle exec" do
 
     bundle "exec rackup"
 
-    check out.should == "0.9.1"
+    out.should eq("0.9.1")
     should_not_be_installed "rack_middleware 1.0"
   end
 
@@ -99,7 +99,7 @@ describe "bundle exec" do
     G
 
     bundle "exec foobarbaz", :exitstatus => true
-    check exitstatus.should == 127
+    exitstatus.should eq(127)
     out.should include("bundler: command not found: foobarbaz")
     out.should include("Install missing gem binaries with `bundle install`")
   end
@@ -111,7 +111,7 @@ describe "bundle exec" do
 
     bundle "exec touch foo"
     bundle "exec ./foo", :exitstatus => true
-    check exitstatus.should == 126
+    exitstatus.should eq(126)
     out.should include("bundler: not executable: ./foo")
   end
 

data/spec/other/init_spec.rb

@@ -32,9 +32,9 @@ describe "bundle init" do
 
     gemfile = bundled_app("Gemfile").read
     gemfile.should =~ /source :gemcutter/
-    check gemfile.scan(/gem "rack", "= 1.0.1"/).size.should == 1
-    check gemfile.scan(/gem "rspec", "= 1.2"/).size.should == 1
-    check gemfile.scan(/group :development/).size.should == 1
+    gemfile.scan(/gem "rack", "= 1.0.1"/).size.should eq(1)
+    gemfile.scan(/gem "rspec", "= 1.2"/).size.should eq(1)
+    gemfile.scan(/group :development/).size.should eq(1)
   end
 
 end

data/spec/other/newgem_spec.rb

@@ -21,4 +21,8 @@ describe "bundle gem" do
     bundled_app("test-gem/lib/test-gem/version.rb").read.should =~ /module Test\n  module Gem/
     bundled_app("test-gem/lib/test-gem.rb").read.should =~ /module Test\n  module Gem/
   end
-end
+
+  it "requires the version file" do
+    bundled_app("test-gem/lib/test-gem.rb").read.should =~ /require "test-gem\/version"/
+  end
+end

data/spec/quality_spec.rb

@@ -49,7 +49,7 @@ describe "The library itself" do
   it "can still be built" do
     Dir.chdir(root) do
       `gem build bundler.gemspec`
-      check $?.should == 0
+      $?.should eq(0)
 
       # clean up the .gem generated
       system("rm bundler-#{Bundler::VERSION}.gem")

data/spec/runtime/require_spec.rb

@@ -48,23 +48,23 @@ describe "Bundler.require" do
   it "requires the gems" do
     # default group
     run "Bundler.require"
-    check out.should == "two"
+    out.should eq("two")
 
     # specific group
     run "Bundler.require(:bar)"
-    check out.should == "baz\nqux"
+    out.should eq("baz\nqux")
 
     # default and specific group
     run "Bundler.require(:default, :bar)"
-    check out.should == "baz\nqux\ntwo"
+    out.should eq("baz\nqux\ntwo")
 
     # specific group given as a string
     run "Bundler.require('bar')"
-    check out.should == "baz\nqux"
+    out.should eq("baz\nqux")
 
     # specific group declared as a string
     run "Bundler.require(:string)"
-    check out.should == "six"
+    out.should eq("six")
 
     # required in resolver order instead of gemfile order
     run("Bundler.require(:not)")
@@ -95,10 +95,10 @@ describe "Bundler.require" do
   describe "using bundle exec" do
     it "requires the locked gems" do
       bundle "exec ruby -e 'Bundler.require'"
-      check out.should == "two"
+      out.should eq("two")
 
       bundle "exec ruby -e 'Bundler.require(:bar)'"
-      check out.should == "baz\nqux"
+      out.should eq("baz\nqux")
 
       bundle "exec ruby -e 'Bundler.require(:default, :bar)'"
       out.should == "baz\nqux\ntwo"
@@ -138,7 +138,7 @@ describe "Bundler.require" do
       G
 
       run "Bundler.require"
-      check out.should == "two\nmodule_two\none"
+      out.should eq("two\nmodule_two\none")
     end
 
     describe "a gem with different requires for different envs" do
@@ -178,7 +178,7 @@ describe "Bundler.require" do
       G
 
       run "Bundler.require"
-      check out.should == "two_not_loaded\none\ntwo"
+      out.should eq("two_not_loaded\none\ntwo")
     end
 
     describe "with busted gems" do
@@ -225,7 +225,7 @@ describe "Bundler.require with platform specific dependencies" do
 
     run "Bundler.require; puts RACK", :expect_err => true
 
-    check out.should == "1.0.0"
+    out.should eq("1.0.0")
     err.should be_empty
   end
 end

data/spec/runtime/setup_spec.rb

@@ -16,8 +16,8 @@ describe "Bundler.setup" do
         require 'rack'
         puts RACK
       RUBY
-      err.should == ""
-      out.should == "1.0.0"
+      err.should eq("")
+      out.should eq("1.0.0")
     end
   end
 
@@ -41,8 +41,8 @@ describe "Bundler.setup" do
           puts "WIN"
         end
       RUBY
-      err.should == ""
-      out.should == "WIN"
+      err.should eq("")
+      out.should eq("WIN")
     end
 
     it "leaves all groups available if they were already" do
@@ -55,8 +55,8 @@ describe "Bundler.setup" do
         require 'rack'
         puts RACK
       RUBY
-      err.should == ""
-      out.should == "1.0.0"
+      err.should eq("")
+      out.should eq("1.0.0")
     end
   end
 
@@ -528,6 +528,28 @@ describe "Bundler.setup" do
     out.should == "[]"
   end
 
+  describe "when a vendored gem specification uses the :path option" do
+    it "should resolve paths relative to the Gemfile" do
+      path = bundled_app(File.join('vendor', 'foo'))
+      build_lib "foo", :path => path
+
+      # If the .gemspec exists, then Bundler handles the path differently.
+      # See Source::Path.load_spec_files for details.
+      FileUtils.rm(File.join(path, 'foo.gemspec'))
+
+      install_gemfile <<-G
+        gem 'foo', '1.2.3', :path => 'vendor/foo'
+      G
+
+      Dir.chdir(bundled_app.parent) do
+        run <<-R, :env => {"BUNDLE_GEMFILE" => bundled_app('Gemfile')}
+          require 'foo'
+        R
+      end
+      err.should == ""
+    end
+  end
+
   describe "with git gems that don't have gemspecs" do
     before :each do
       build_git "no-gemspec", :gemspec => false
@@ -670,8 +692,8 @@ describe "Bundler.setup" do
         Bundler.load
       RUBY
 
-      err.should == ""
-      out.should == ""
+      err.should eq("")
+      out.should eq("")
     end
   end
 
@@ -685,4 +707,5 @@ describe "Bundler.setup" do
       err.should be_empty
     end
   end
+
 end

data/spec/spec_helper.rb

@@ -57,11 +57,6 @@ RSpec.configure do |config|
     pending "JRuby executables do not have a proper shebang" if RUBY_PLATFORM == "java"
   end
 
-  def check(*args)
-    # suppresses ruby warnings about "useless use of == in void context"
-    # e.g. check foo.should == bar
-  end
-
   config.before :all do
     build_repo1
   end

data/spec/support/builders.rb

@@ -32,7 +32,7 @@ module Spec
 
         build_gem "rails",          "2.3.2" do |s|
           s.executables = "rails"
-          s.add_dependency "rake"
+          s.add_dependency "rake",           "0.8.7"
           s.add_dependency "actionpack",     "2.3.2"
           s.add_dependency "activerecord",   "2.3.2"
           s.add_dependency "actionmailer",   "2.3.2"
@@ -484,6 +484,8 @@ module Spec
         Dir.chdir(path) do
           `git init`
           `git add *`
+          `git config user.email "lol@wut.com"`
+          `git config user.name "lolwut"`
           `git commit -m 'OMG INITIAL COMMIT'`
         end
       end

data/spec/support/matchers.rb

@@ -35,7 +35,7 @@ module Spec
         version_const = name == 'bundler' ? 'Bundler::VERSION' : Spec::Builders.constantize(name)
         run "require '#{name}.rb'; puts #{version_const}", *groups
         actual_version, actual_platform = out.split(/\s+/)
-        check Gem::Version.new(actual_version).should == Gem::Version.new(version)
+        Gem::Version.new(actual_version).should eq(Gem::Version.new(version))
         actual_platform.should == platform
       end
     end

data/spec/support/rubygems_ext.rb

@@ -12,7 +12,9 @@ module Spec
       unless File.exist?("#{Path.base_system_gems}")
         FileUtils.mkdir_p(Path.base_system_gems)
         puts "running `gem install rake fakeweb --no-rdoc --no-ri`"
-        `gem install rake fakeweb --no-rdoc --no-ri`
+        `gem install fakeweb --no-rdoc --no-ri`
+        # Rake version has to be consistent for tests to pass
+        `gem install rake --version 0.8.7 --no-rdoc --no-ri`
         # 3.0.0 breaks 1.9.2 specs
         puts "running `gem install builder --version 2.1.2 --no-rdoc --no-ri`"
         `gem install builder --version 2.1.2 --no-rdoc --no-ri`

data/spec/update/git_spec.rb

@@ -145,7 +145,7 @@ describe "bundle update" do
         G
 
         run "require 'submodule'"
-        check out.should == 'GEM'
+        out.should eq('GEM')
 
         install_gemfile <<-G
           git "#{lib_path('has_submodule-1.0')}", :submodules => true do
@@ -166,7 +166,7 @@ describe "bundle update" do
         G
 
         run "require 'submodule'"
-        check out.should == 'GIT'
+        out.should eq('GIT')
 
         install_gemfile <<-G
           git "#{lib_path('has_submodule-1.0')}" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 1
   - 0
-  - 13
-  version: 1.0.13
+  - 14
+  version: 1.0.14
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -07:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ files:
 - lib/bundler/dsl.rb
 - lib/bundler/environment.rb
 - lib/bundler/gem_helper.rb
+- lib/bundler/gem_tasks.rb
 - lib/bundler/graph.rb
 - lib/bundler/index.rb
 - lib/bundler/installer.rb
@@ -196,6 +197,8 @@ files:
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
 - lib/bundler/man/bundle
+- lib/bundler/man/bundle-benchmark
+- lib/bundler/man/bundle-benchmark.txt
 - lib/bundler/man/bundle-config
 - lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle-exec