bundler 1.2.3 → 1.2.4

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -1,61 +1,46 @@
-before_script:
-  - sudo apt-get install groff -y
-  - rake spec:deps
-
+language: ruby
+script: rake spec:travis
+before_script: rake spec:travis:deps
+notifications:
+  email:
+    - mail@arko.net
+    - hone02@gmail.com
+  irc:
+    on_success: change
+    on_failure: always
+    channels:
+      - "irc.freenode.org#bundler"
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
 # Rubygems versions MUST be available as rake tasks
 # see Rakefile:66 for the list of possible RGV values
 env:
-  - RGV=v1.3.6
-  - RGV=v1.3.7
-  - RGV=v1.4.2
-  - RGV=v1.5.3
-  - RGV=v1.6.2
-  - RGV=v1.7.2
+  # test the supported rubygems release with all of our supported rubies
   - RGV=v1.8.24
-
-language: ruby
-
 matrix:
-  exclude:
-    # 2.0.0-preview1 shipped with Rubygems 1.8.24, so start there.
-    - rvm: 2.0.0-preview1
-      env: RGV=v1.4.2
-    - rvm: 2.0.0-preview1
-      env: RGV=v1.3.6
-    - rvm: 2.0.0-preview1
-      env: RGV=v1.3.7
-    - rvm: 2.0.0-preview1
-      env: RGV=v1.4.2
-    - rvm: 2.0.0-preview1
-      env: RGV=v1.5.3
-    - rvm: 2.0.0-preview1
-      env: RGV=v1.6.2
-    - rvm: 2.0.0-preview1
-      env: RGV=v1.7.2
-    # 1.9.2 and 1.9.3 both shipped with Rubygems 1.3.7
-    # Unfortunately, Rubygems 1.4 wasn't compatible.
+  allow_failures:
+    # 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
+    - rvm: 1.9.2
+  include:
+    # Bundler 1.x supports Rubygems down to 1.5.3 on Ruby 1.9.3
     - rvm: 1.9.3
-      env: RGV=v1.3.6
+      env: RGV=v1.7.2
     - rvm: 1.9.3
-      env: RGV=v1.3.7
+      env: RGV=v1.6.2
     - rvm: 1.9.3
+      env: RGV=v1.5.3
+    # Bundler 1.x supports Rubygems down to 1.3.6 on Ruby 1.8.7
+    - rvm: 1.8.7
+      env: RGV=v1.7.2
+    - rvm: 1.8.7
+      env: RGV=v1.6.2
+    - rvm: 1.8.7
+      env: RGV=v1.5.3
+    - rvm: 1.8.7
       env: RGV=v1.4.2
-    - rvm: 1.9.2
-      env: RGV=v1.3.6
-    - rvm: 1.9.2
+    - rvm: 1.8.7
       env: RGV=v1.3.7
-    - rvm: 1.9.2
-      env: RGV=v1.4.2
-
-notifications:
-  email:
-    - travis-ci@andrearko.com
-    - hone02@gmail.com
-    - sferik@gmail.com
-
-rvm:
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
-
-script: rake spec:travis
+    - rvm: 1.8.7
+      env: RGV=v1.3.6

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.2.4 (Feb 12, 2013)
+
+Features:
+
+  - warn about Ruby 2.0 and Rubygems 2.0
+  - inform users when the resolver starts
+  - disable reverse DNS to speed up API requests (@raggi)
+
+Bugfixes:
+
+  - don't send user/pass when redirected to another host (@perplexes)
+  - load gemspecs containing unicode (@gaffneyc, #2301)
+  - support any ruby version in --standalone
+  - resolve some ruby -w warnings (@chastell, #2193)
+  - don't scare users with an error message during API fallback
+
 ## 1.2.3 (Nov 29, 2012)
 
 Bugfixes:

data/Rakefile

@@ -1,7 +1,23 @@
 # -*- encoding: utf-8 -*-
 $:.unshift File.expand_path("../lib", __FILE__)
-require 'rubygems'
 require 'bundler/gem_tasks'
+require 'rubygems'
+require 'shellwords'
+require 'benchmark'
+
+# Benchmark task execution
+module Rake
+  class Task
+    alias_method :real_invoke, :invoke
+
+    def invoke(*args)
+      time = Benchmark.measure(@name) do
+        real_invoke(*args)
+      end
+      puts "#{@name} ran for #{time}"
+    end
+  end
+end
 
 task :release => ["man:clean", "man:build"]
 
@@ -12,15 +28,31 @@ rescue
   false
 end
 
-def sudo_task(task)
-  system("sudo -E rake #{task}")
-end
-
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
-    sh "#{Gem.ruby} -S gem list ronn | (grep 'ronn' 1> /dev/null) || #{Gem.ruby} -S gem install ronn --no-ri --no-rdoc"
-    sh "#{Gem.ruby} -S gem list rspec | (grep 'rspec (2.' 1> /dev/null) || #{Gem.ruby} -S gem install rspec --no-ri --no-rdoc"
+    gem_cmd = "#{Gem.ruby} -S gem"
+    {"rspec" => "~> 2.11", "ronn" => "~> 0.7.3"}.each do |name, version|
+      sh "#{gem_cmd} list #{name} -i -v '#{version}' || #{gem_cmd} install #{name} -v '#{version}' --no-ri --no-rdoc"
+    end
+  end
+
+  namespace :travis do
+    task :deps do
+      # Give the travis user a name so that git won't fatally error
+      system("sudo sed -i 's/1000::/1000:Travis:/g' /etc/passwd")
+      # Strip secure_path so that RVM paths transmit through sudo -E
+      system("sudo sed -i '/secure_path/d' /etc/sudoers")
+      # Install groff for the ronn gem
+      system("sudo apt-get install groff -y")
+      # Recompile ruby-head, because the VM version is quite old
+      if ENV['RUBY_VERSION'] == 'ruby-head'
+        system("rvm reinstall ruby-head")
+        system("ruby --version")
+      end
+      # Install the other gem deps, etc.
+      Rake::Task["spec:deps"].invoke
+    end
   end
 end
 
@@ -84,13 +116,17 @@ begin
 
           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
+            if rg == "master"
+              system("git checkout origin/master")
+            else
+              system("git checkout #{rg}")
+            end
+            hash = `git rev-parse HEAD`.chomp
           end
 
-          puts "Running bundler specs against rubygems '#{rg}' at #{hash}"
+          puts "Checked out rubygems '#{rg}' at #{hash}"
           ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
+          puts "RUBYOPT=#{ENV['RUBYOPT']}"
         end
 
         task rg => ["clone_rubygems_#{rg}", "man:build"]
@@ -113,7 +149,7 @@ begin
 
     desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
     task :travis do
-      rg = ENV['RGV'] || 'master'
+      rg = ENV['RGV'] || 'v1.8.24'
 
       puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
       specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }
@@ -121,16 +157,25 @@ begin
       Rake::Task["spec:rubygems:#{rg}"].reenable
 
       puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
-      sudos = sudo_task "spec:rubygems:#{rg}:sudo"
-      chown = system("sudo chown -R #{ENV['USER']} #{File.join(File.dirname(__FILE__), 'tmp')}")
+      sudos = system("sudo -E rake spec:rubygems:#{rg}:sudo")
+      # clean up by chowning the newly root-owned tmp directory back to the travis user
+      system("sudo chown -R #{ENV['USER']} #{File.join(File.dirname(__FILE__), 'tmp')}")
 
       Rake::Task["spec:rubygems:#{rg}"].reenable
 
       puts "\n\e[1;33m[Travis CI] Running bundler real world specs against rubygems #{rg}\e[m\n\n"
       realworld = safe_task { Rake::Task["spec:rubygems:#{rg}:realworld"].invoke }
 
+      {"specs" => specs, "sudo" => sudos, "realworld" => realworld}.each do |name, passed|
+        if passed
+          puts "\e[0;32m[Travis CI] #{name} passed\e[m"
+        else
+          puts "\e[0;31m[Travis CI] #{name} failed\e[m"
+        end
+      end
+
       unless specs && sudos && realworld
-        fail "Bundler tests failed, please review the log for more information"
+        fail "Spec run failed, please review the log for more information"
       end
     end
   end
@@ -162,29 +207,6 @@ begin
     end
   end
 
-  begin
-    require 'ci/reporter/rake/rspec'
-
-    namespace :ci do
-      desc "Run specs with Hudson output"
-      RSpec::Core::RakeTask.new(:spec)
-      task :spec => ["ci:setup:rspec", "man:build"]
-    end
-
-  rescue LoadError
-    namespace :ci do
-      task :spec do
-        abort "Run `rake ci:deps` to be able to run the CI specs"
-      end
-
-      desc "Install CI dependencies"
-      task :deps do
-        sh "#{Gem.ruby} -S gem list ci_reporter | (grep 'ci_reporter' 1> /dev/null) || #{Gem.ruby} -S gem install ci_reporter --no-ri --no-rdoc"
-      end
-      task :deps => "spec:deps"
-    end
-  end
-
 rescue LoadError
   task :spec do
     abort "Run `rake spec:deps` to be able to run the specs"

data/lib/bundler.rb

@@ -99,9 +99,9 @@ module Bundler
     def bin_path
       @bin_path ||= begin
         path = settings[:bin] || "bin"
-        path = Pathname.new(path).expand_path(root)
+        path = Pathname.new(path).expand_path(root).expand_path
         FileUtils.mkdir_p(path)
-        Pathname.new(path).expand_path
+        path
       end
     end
 
@@ -291,7 +291,7 @@ module Bundler
       Dir.chdir(path.dirname.to_s) do
         contents = File.read(path.basename.to_s)
 
-        if contents =~ /\A---/ # try YAML
+        if contents[0..2] == "---" # YAML header
           begin
             Gem::Specification.from_yaml(contents)
           rescue ArgumentError, YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception
@@ -326,7 +326,6 @@ module Bundler
 
     def configure_gem_home_and_path
       blank_home = ENV['GEM_HOME'].nil? || ENV['GEM_HOME'].empty?
-
       if settings[:disable_shared_gems]
         ENV['GEM_PATH'] = ''
         configure_gem_home

data/lib/bundler/cli.rb

@@ -12,6 +12,7 @@ module Bundler
       Bundler.ui = UI::Shell.new(the_shell)
       Bundler.ui.debug! if options["verbose"]
       Bundler.rubygems.ui = UI::RGProxy.new(Bundler.ui)
+      warn_on_incompatible_ruby_or_rubygems
     end
 
     check_unknown_options!(:except => [:config, :exec])
@@ -218,7 +219,7 @@ module Bundler
       Bundler.settings[:no_prune] = true if opts["no-prune"]
       Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
       Bundler.settings.without = opts[:without]
-      Bundler.ui.be_quiet! if opts[:quiet]
+      Bundler.ui.quiet = opts[:quiet]
       Bundler.settings[:clean] = opts[:clean] if opts[:clean]
 
       Bundler::Fetcher.disable_endpoint = opts["full-index"]
@@ -272,7 +273,7 @@ module Bundler
         "Use the rubygems modern index instead of the API endpoint"
     def update(*gems)
       sources = Array(options[:source])
-      Bundler.ui.be_quiet! if options[:quiet]
+      Bundler.ui.quiet = options[:quiet]
 
       if gems.empty? && sources.empty?
         # We're doing a full update
@@ -687,5 +688,17 @@ module Bundler
       spec.full_gem_path
     end
 
+    def warn_on_incompatible_ruby_or_rubygems
+      ruby2 = "Ruby 2.0" if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.pre')
+      rg2 = "Rubygems 2.0" if Gem::Version.new(Gem::VERSION.dup) >= Gem::Version.new('2.0.pre')
+      upgrade = [ruby2, rg2].compact
+
+      if upgrade.any?
+        Bundler.ui.warn "Bundler is not compatible with #{upgrade.join(' or ')}."
+        Bundler.ui.error "Please upgrade to Bundler 1.3 or higher."
+        exit 1
+      end
+    end
+
   end
 end

data/lib/bundler/definition.rb

@@ -230,7 +230,7 @@ module Bundler
       end
 
       File.open(file, 'wb'){|f| f.puts(contents) }
-    rescue Errno::EACCES => e
+    rescue Errno::EACCES
       raise Bundler::InstallError,
         "There was an error while trying to write to Gemfile.lock. It is likely that \n" \
         "you need to allow write permissions for the file at path: \n" \

data/lib/bundler/dsl.rb

@@ -104,6 +104,9 @@ module Bundler
     def source(source, options = {})
       case source
       when :gemcutter, :rubygems, :rubyforge then
+        Bundler.ui.warn "The source :#{source} is deprecated because HTTP " \
+          "requests are insecure.\nPlease change your source to 'https://" \
+          "rubygems.org' if possible, or 'http://rubygems.org' if not."
         @rubygems_source.add_remote "http://rubygems.org"
         return
       when String

data/lib/bundler/fetcher.rb

@@ -7,6 +7,7 @@ module Bundler
     REDIRECT_LIMIT = 5
     # how long to wait for each gemcutter API call
     API_TIMEOUT    = 10
+    class FallbackError < Bundler::HTTPError; end
 
     attr_reader :has_api
 
@@ -47,6 +48,8 @@ module Bundler
       @has_api    = true # will be set to false if the rubygems index is ever fetched
       @@connection ||= Net::HTTP::Persistent.new nil, :ENV
       @@connection.read_timeout = API_TIMEOUT
+
+      Socket.do_not_reverse_lookup = true
     end
 
     # fetch a gem specification
@@ -79,11 +82,11 @@ module Bundler
           # new line now that the dots are over
           Bundler.ui.info "" unless Bundler.ui.debug?
 
-          if @remote_uri.to_s.include?("rubygems.org")
-            Bundler.ui.info "Error #{e.class} during request to dependency API"
+          if FallbackError === e
+            Bundler.ui.debug "API refused request: #{e.message}"
+          else
+            Bundler.ui.debug "Error during API request. #{e.class}: #{e.message}"
           end
-          Bundler.ui.debug e.message
-          Bundler.ui.debug e.backtrace
 
           Bundler.ui.info "Fetching full source index from #{strip_user_pass_from_uri(@remote_uri)}"
           specs = fetch_all_remote_specs
@@ -147,15 +150,18 @@ module Bundler
       when Net::HTTPRedirection
         Bundler.ui.debug("HTTP Redirection")
         new_uri = URI.parse(response["location"])
-        new_uri.user = uri.user
-        new_uri.password = uri.password
+        if new_uri.host == uri.host
+          new_uri.user = uri.user
+          new_uri.password = uri.password
+        end
         fetch(new_uri, counter + 1)
       when Net::HTTPSuccess
         Bundler.ui.debug("HTTP Success")
         response.body
+      when Net::HTTPRequestEntityTooLarge
+        raise FallbackError, response.body
       else
-        Bundler.ui.debug("HTTP Error")
-        raise HTTPError
+        raise HTTPError, "#{response.class}: #{response.body}"
       end
     end
 

data/lib/bundler/installer.rb

@@ -66,11 +66,13 @@ module Bundler
       end
 
       if Bundler.default_lockfile.exist? && !options["update"]
+        real_ui, Bundler.ui = Bundler.ui, Bundler::UI.new
         begin
           tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil)
           local = true unless tmpdef.new_platform? || tmpdef.missing_specs.any?
         rescue BundlerError
         end
+        Bundler.ui = real_ui
       end
 
       # Since we are installing, we can resolve the definition
@@ -175,12 +177,16 @@ module Bundler
 
         spec.require_paths.each do |path|
           full_path = File.join(spec.full_gem_path, path)
-          paths << Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path))
+          gem_path = Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path))
+          paths << gem_path.to_s.sub("#{SystemRubyVersion.new.engine}/#{RbConfig::CONFIG['ruby_version']}", '#{ruby_engine}/#{ruby_version}')
         end
       end
 
 
       File.open File.join(bundler_path, "setup.rb"), "w" do |file|
+        file.puts "# ruby 1.8.7 doesn't define RUBY_ENGINE"
+        file.puts "ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'"
+        file.puts "ruby_version = RbConfig::CONFIG[\"ruby_version\"]"
         file.puts "path = File.expand_path('..', __FILE__)"
         paths.each do |path|
           file.puts %{$:.unshift File.expand_path("\#{path}/#{path}")}

data/lib/bundler/resolver.rb

@@ -122,6 +122,7 @@ module Bundler
     # <GemBundle>,nil:: If the list of dependencies can be resolved, a
     #   collection of gemspecs is returned. Otherwise, nil is returned.
     def self.resolve(requirements, index, source_requirements = {}, base = [])
+      Bundler.ui.info "Resolving dependencies..."
       base = SpecSet.new(base) unless base.is_a?(SpecSet)
       resolver = new(index, source_requirements, base)
       result = catch(:success) do

data/lib/bundler/source.rb

@@ -106,8 +106,8 @@ module Bundler
           Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/specifications"
           Bundler.sudo "cp -R #{Bundler.tmp}/gems/#{spec.full_name} #{Bundler.rubygems.gem_dir}/gems/"
           Bundler.sudo "cp -R #{Bundler.tmp}/specifications/#{spec.full_name}.gemspec #{Bundler.rubygems.gem_dir}/specifications/"
+          Bundler.mkdir_p Bundler.system_bindir
           spec.executables.each do |exe|
-            Bundler.mkdir_p Bundler.system_bindir
             Bundler.sudo "cp -R #{Bundler.tmp}/bin/#{exe} #{Bundler.system_bindir}"
           end
         end
@@ -513,6 +513,7 @@ module Bundler
           @allow    = allow || Proc.new { true }
         end
 
+        remove_method :revision if method_defined? :revision
         def revision
           @revision ||= allowed_in_path { git("rev-parse #{ref}").strip }
         end

data/lib/bundler/ui.rb

@@ -22,6 +22,7 @@ module Bundler
     end
 
     class Shell < UI
+      attr_reader :quiet
       attr_writer :shell
 
       def initialize(shell)
@@ -46,8 +47,8 @@ module Bundler
         tell_me(msg, :red, newline)
       end
 
-      def be_quiet!
-        @quiet = true
+      def quiet=(value)
+        @quiet = value
       end
 
       def debug?

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

data/man/bundle-update.ronn

@@ -39,7 +39,7 @@ When you run [bundle install(1)][bundle-install] the first time, bundler will re
 all of the dependencies, all the way down, and install what you need:
 
     Fetching source index for http://rubygems.org/
-    Installing rake (0.8.7)
+    Installing rake (10.0.2)
     Installing abstract (1.0.0)
     Installing activesupport (3.0.0.rc)
     Installing builder (2.1.2)

data/spec/bundler/bundler_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 require 'bundler'
 
@@ -15,5 +16,30 @@ GEMSPEC
         Bundler.load_gemspec_uncached(tmp("test.gemspec"))
       }.should raise_error(Bundler::GemspecError)
     end
+
+    it "can load a gemspec with unicode characters with default ruby encoding" do
+      # spec_helper forces the external encoding to UTF-8 but that's not the
+      # ruby default.
+      encoding = nil
+
+      if defined?(Encoding)
+        encoding = Encoding.default_external
+        Encoding.default_external = "ASCII"
+      end
+
+      File.open(tmp("test.gemspec"), "wb") do |file|
+        file.puts <<-G.gsub(/^\s+/, '')
+          # -*- encoding: utf-8 -*-
+          Gem::Specification.new do |gem|
+            gem.author = "André the Giant"
+          end
+        G
+      end
+
+      gemspec = Bundler.load_gemspec_uncached(tmp("test.gemspec"))
+      gemspec.author.should == "André the Giant"
+
+      Encoding.default_external = encoding if defined?(Encoding)
+    end
   end
 end

data/spec/install/gems/dependency_api_spec.rb

@@ -338,7 +338,7 @@ OUTPUT
     out.should include("Fetching gem metadata from #{source_uri}")
   end
 
-  it "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
+  fit "should install when EndpointSpecification with a bin dir owned by root", :sudo => true do
     sudo "mkdir -p #{system_gem_path("bin")}"
     sudo "chown -R root #{system_gem_path("bin")}"
 
@@ -347,6 +347,7 @@ OUTPUT
       gem "rails"
     G
     bundle :install, :artifice => "endpoint"
+    puts out, err
     should_be_installed "rails 2.3.2"
   end
 

data/spec/install/gems/flex_spec.rb

@@ -194,6 +194,7 @@ describe "bundle flex_install" do
     it "suggests bundle update when the Gemfile requires different versions than the lock" do
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
         Fetching source index from file:#{gem_repo2}/
+        Resolving dependencies...
         Bundler could not find compatible versions for gem "rack":
           In snapshot (Gemfile.lock):
             rack (0.9.1)

data/spec/install/gems/simple_case_spec.rb

@@ -658,6 +658,7 @@ describe "bundle install with gem sources" do
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
         Fetching source index from file:#{gem_repo2}/
+        Resolving dependencies...
         Bundler could not find compatible versions for gem "bundler":
           In Gemfile:
             bundler (= 0.9.2) ruby
@@ -715,6 +716,7 @@ describe "bundle install with gem sources" do
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
         Fetching source index from file:#{gem_repo2}/
+        Resolving dependencies...
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
             activemerchant (>= 0) ruby depends on
@@ -735,6 +737,7 @@ describe "bundle install with gem sources" do
 
       nice_error = <<-E.strip.gsub(/^ {8}/, '')
         Fetching source index from file:#{gem_repo2}/
+        Resolving dependencies...
         Bundler could not find compatible versions for gem "activesupport":
           In Gemfile:
             rails_fail (>= 0) ruby depends on

data/spec/install/gems/sudo_spec.rb

@@ -50,24 +50,20 @@ describe "when using sudo", :sudo => true do
     end
   end
 
-  describe "and BUNDLE_PATH is not writable" do
+  describe "and GEM_HOME is not writable" do
     it "installs" do
-      begin
-        gem_home = tmp('sudo_gem_home')
-
-        sudo "mkdir -p #{gem_home}"
-        sudo "chmod ugo-w #{gem_home}"
-        ENV['GEM_HOME'] = gem_home.to_s
-        ENV['GEM_PATH'] = nil
+      gem_home = tmp('sudo_gem_home')
+      sudo "mkdir -p #{gem_home}"
+      sudo "chmod ugo-w #{gem_home}"
 
-        install_gemfile <<-G
-          source "file://#{gem_repo1}"
-          gem "rack", '1.0'
-        G
+      gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "rack", '1.0'
+      G
 
-        gem_home.join('bin/rackup').should exist
-        should_be_installed "rack 1.0"
-      end
+      bundle :install, :env => {'GEM_HOME' => gem_home.to_s, 'GEM_PATH' => nil}
+      gem_home.join('bin/rackup').should exist
+      should_be_installed "rack 1.0", :env => {'GEM_HOME' => gem_home.to_s, 'GEM_PATH' => nil}
     end
   end
 

data/spec/install/gemspec_spec.rb

@@ -114,7 +114,7 @@ describe "bundle install from an existing gemspec" do
     build_lib("foo", :path => tmp.join("foo")) do |s|
       s.write("Gemfile", "source 'file://#{gem_repo1}'\ngemspec")
       s.add_dependency "actionpack", "=2.3.2"
-      s.add_development_dependency "rake", '=0.8.7'
+      s.add_development_dependency "rake", '=10.0.2'
     end
 
     Dir.chdir(tmp.join("foo")) do

data/spec/lock/lockfile_spec.rb

@@ -317,8 +317,8 @@ describe "the lockfile format" do
             actionpack (= 2.3.2)
             activerecord (= 2.3.2)
             activeresource (= 2.3.2)
-            rake (= 0.8.7)
-          rake (0.8.7)
+            rake (= 10.0.2)
+          rake (10.0.2)
 
       PLATFORMS
         #{generic(Gem::Platform.local)}

data/spec/other/newgem_spec.rb

@@ -69,7 +69,7 @@ describe "bundle gem" do
   end
 
   it "runs rake without problems" do
-    system_gems ["rake-0.8.7"]
+    system_gems ["rake-10.0.2"]
 
     rakefile = <<-RAKEFILE
       task :default do

data/spec/other/show_spec.rb

@@ -41,7 +41,7 @@ describe "bundle show" do
 
   it "prints path of all gems in bundle" do
     bundle "show --paths"
-    out.should include(default_bundle_path('gems', 'rake-0.8.7').to_s)
+    out.should include(default_bundle_path('gems', 'rake-10.0.2').to_s)
     out.should include(default_bundle_path('gems', 'rails-2.3.2').to_s)
   end
 end

data/spec/realworld/edgecases_spec.rb

@@ -11,7 +11,7 @@ describe "real world edgecases", :realworld => true do
   end
 
   # https://github.com/carlhuda/bundler/issues/1202
-  it "bundle cache works with rubygems 1.3.7 and pre gems" do
+  it "bundle cache works with rubygems 1.3.7 and pre gems", :ruby => "1.8" do
     install_gemfile <<-G
       source :rubygems
       gem "rack",          "1.3.0.beta2"
@@ -23,7 +23,7 @@ describe "real world edgecases", :realworld => true do
 
   # https://github.com/carlhuda/bundler/issues/1486
   # this is a hash collision that only manifests on 1.8.7
-  it "finds the correct child versions" do
+  it "finds the correct child versions", :ruby => "1.8" do
     install_gemfile <<-G
       source :rubygems
 

data/spec/support/builders.rb

@@ -35,7 +35,7 @@ module Spec
 
         build_gem "rails",          "2.3.2" do |s|
           s.executables = "rails"
-          s.add_dependency "rake",           "0.8.7"
+          s.add_dependency "rake",           "10.0.2"
           s.add_dependency "actionpack",     "2.3.2"
           s.add_dependency "activerecord",   "2.3.2"
           s.add_dependency "actionmailer",   "2.3.2"

data/spec/support/rubygems_ext.rb

@@ -15,7 +15,7 @@ module Spec
         `gem install fakeweb artifice --no-rdoc --no-ri`
         `gem install sinatra --version 1.2.7 --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`
+        `gem install rake --version 10.0.2 --no-rdoc --no-ri`
         # 3.0.0 breaks 1.9.2 specs
         `gem install builder --version 2.1.2 --no-rdoc --no-ri`
         `gem install rack --no-rdoc --no-ri`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
@@ -56,6 +56,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - CHANGELOG.md
 - ISSUES.md
@@ -361,3 +362,4 @@ test_files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
+has_rdoc: