bundler 1.0.21 → 1.1.rc

data/spec/runtime/with_clean_env_spec.rb

@@ -1,15 +1,68 @@
 require "spec_helper"
 
-describe "Bundler.with_clean_env" do
+describe "Bundler.with_env helpers" do
 
-  it "should reset and restore the environment" do
-    gem_path = ENV['GEM_PATH']
+  shared_examples_for "Bundler.with_*_env" do
+    it "should reset and restore the environment" do
+      gem_path = ENV['GEM_PATH']
 
-    Bundler.with_clean_env do
-      `echo $GEM_PATH`.strip.should_not == gem_path
+      Bundler.with_clean_env do
+        `echo $GEM_PATH`.strip.should_not == gem_path
+      end
+
+      ENV['GEM_PATH'].should == gem_path
     end
+  end
+
+  around do |example|
+    bundle_path = Bundler::ORIGINAL_ENV['BUNDLE_PATH']
+    Bundler::ORIGINAL_ENV['BUNDLE_PATH'] = "./Gemfile"
+    example.run
+    Bundler::ORIGINAL_ENV['BUNDLE_PATH'] = bundle_path
+  end
+
+  describe "Bundler.with_clean_env" do
+
+    it_should_behave_like "Bundler.with_*_env"
 
-    ENV['GEM_PATH'].should == gem_path
+    it "should not pass any bundler environment variables" do
+      Bundler.with_clean_env do
+        `echo $BUNDLE_PATH`.strip.should_not == './Gemfile'
+      end
+    end
+
+    it "should not change ORIGINAL_ENV" do
+      Bundler::ORIGINAL_ENV['BUNDLE_PATH'].should == './Gemfile'
+    end
+
+  end
+
+  describe "Bundler.with_original_env" do
+
+    it_should_behave_like "Bundler.with_*_env"
+
+    it "should pass bundler environment variables set before Bundler was run" do
+      Bundler.with_original_env do
+        `echo $BUNDLE_PATH`.strip.should == './Gemfile'
+      end
+    end
+  end
+
+  describe "Bundler.clean_system" do
+    it "runs system inside with_clean_env" do
+      Bundler.clean_system(%{echo 'if [ "$BUNDLE_PATH" = "" ]; then exit 42; else exit 1; fi' | /bin/sh})
+      $?.exitstatus.should == 42
+    end
+  end
+
+  describe "Bundler.clean_exec" do
+    it "runs exec inside with_clean_env" do
+      pid = Kernel.fork do
+        Bundler.clean_exec(%{echo 'if [ "$BUNDLE_PATH" = "" ]; then exit 42; else exit 1; fi' | /bin/sh})
+      end
+      Process.wait(pid)
+      $?.exitstatus.should == 42
+    end
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'fileutils'
 require 'rubygems'
 require 'bundler'
 require 'rspec'
+require 'uri'
 
 # Require the correct version of popen for the current platform
 if RbConfig::CONFIG['host_os'] =~ /mingw|mswin/
@@ -25,7 +26,7 @@ else
 end
 
 Dir["#{File.expand_path('../support', __FILE__)}/*.rb"].each do |file|
-  require file
+  require file unless file =~ /fakeweb\/.*\.rb/
 end
 
 $debug    = false
@@ -52,6 +53,12 @@ RSpec.configure do |config|
     config.filter_run_excluding :sudo => true
   end
 
+  if ENV['BUNDLER_REALWORLD_TESTS']
+    config.filter_run :realworld => true
+  else
+    config.filter_run_excluding :realworld => true
+  end
+
   config.filter_run :focused => true unless ENV['CI']
   config.run_all_when_everything_filtered = true
   config.alias_example_to :fit, :focused => true

data/spec/support/artifice/endopint_marshal_fail_basic_authentication.rb

@@ -0,0 +1,13 @@
+require File.expand_path("../endpoint_marshal_fail", __FILE__)
+
+Artifice.deactivate
+
+class EndpointMarshalFailBasicAuthentication < EndpointMarshalFail
+  before do
+    unless env["HTTP_AUTHORIZATION"]
+      halt 401, "Authentication info not supplied"
+    end
+  end
+end
+
+Artifice.activate_with(EndpointMarshalFailBasicAuthentication)

data/spec/support/artifice/endpoint.rb

@@ -0,0 +1,54 @@
+require File.expand_path("../../path.rb", __FILE__)
+include Spec::Path
+
+# Set up pretend http gem server with FakeWeb
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/artifice*/lib")].first}"
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/rack-*/lib")].first}"
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/rack-*/lib")].last}"
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/tilt*/lib")].first}"
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/sinatra*/lib")].first}"
+require 'artifice'
+require 'sinatra/base'
+
+class Endpoint < Sinatra::Base
+
+  helpers do
+    def dependencies_for(gem_names, marshal = gem_repo1("Marshal.4.8"))
+      require 'rubygems'
+      Marshal.load(File.open(marshal).read).map do |gem, spec|
+        if gem_names.include?(spec.name)
+          {
+            :name         => spec.name,
+            :number       => spec.version.version,
+            :platform     => spec.platform.to_s,
+            :dependencies => spec.dependencies.select {|dep| dep.type == :runtime }.map do |dep|
+              [dep.name, dep.requirement.requirements.map {|a| a.join(" ") }.join(", ")]
+            end
+          }
+        end
+      end.compact
+    end
+  end
+
+  get "/quick/Marshal.4.8/:id" do
+    redirect "/fetch/actual/gem/#{params[:id]}"
+  end
+
+  get "/fetch/actual/gem/:id" do
+    File.read("#{gem_repo1}/quick/Marshal.4.8/#{params[:id]}")
+  end
+
+  get "/gems/:id" do
+    File.read("#{gem_repo1}/gems/#{params[:id]}")
+  end
+
+  get "/api/v1/dependencies" do
+    Marshal.dump(dependencies_for(params[:gems]))
+  end
+
+  get "/specs.4.8.gz" do
+    File.read("#{gem_repo1}/specs.4.8.gz")
+  end
+end
+
+Artifice.activate_with(Endpoint)

data/spec/support/artifice/endpoint_500.rb

@@ -0,0 +1,37 @@
+require File.expand_path("../../path.rb", __FILE__)
+include Spec::Path
+
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/artifice*/lib")].first}"
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/rack-*/lib")].first}"
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/rack-*/lib")].last}"
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/tilt*/lib")].first}"
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/sinatra*/lib")].first}"
+
+require 'artifice'
+require 'sinatra/base'
+
+Artifice.deactivate
+
+class Endpoint500 < Sinatra::Base
+  get "/quick/Marshal.4.8/:id" do
+    halt 500
+  end
+
+  get "/fetch/actual/gem/:id" do
+    halt 500
+  end
+
+  get "/gems/:id" do
+    halt 500
+  end
+
+  get "/api/v1/dependencies" do
+    halt 500
+  end
+
+  get "/specs.4.8.gz" do
+    halt 500
+  end
+end
+
+Artifice.activate_with(Endpoint500)

data/spec/support/artifice/endpoint_api_missing.rb

@@ -0,0 +1,16 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointApiMissing < Endpoint
+  get "/fetch/actual/gem/:id" do
+    $stderr.puts params[:id]
+    if params[:id] == 'rack-1.0.gemspec.rz'
+      halt 404
+    else
+      File.read("#{gem_repo2}/quick/Marshal.4.8/#{params[:id]}")
+    end
+  end
+end
+
+Artifice.activate_with(EndpointApiMissing)

data/spec/support/artifice/endpoint_basic_authentication.rb

@@ -0,0 +1,13 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointBasicAuthentication < Endpoint
+  before do
+    unless env["HTTP_AUTHORIZATION"]
+      halt 401, "Authentication info not supplied"
+    end
+  end
+end
+
+Artifice.activate_with(EndpointBasicAuthentication)

data/spec/support/artifice/endpoint_extra.rb

@@ -0,0 +1,27 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointExtra < Endpoint
+  get "/extra/api/v1/dependencies" do
+    halt 404
+  end
+
+  get "/extra/specs.4.8.gz" do
+    File.read("#{gem_repo2}/specs.4.8.gz")
+  end
+
+  get "/extra/quick/Marshal.4.8/:id" do
+    redirect "/extra/fetch/actual/gem/#{params[:id]}"
+  end
+
+  get "/extra/fetch/actual/gem/:id" do
+    File.read("#{gem_repo2}/quick/Marshal.4.8/#{params[:id]}")
+  end
+
+  get "/extra/gems/:id" do
+    File.read("#{gem_repo2}/gems/#{params[:id]}")
+  end
+end
+
+Artifice.activate_with(EndpointExtra)

data/spec/support/artifice/endpoint_extra_missing.rb

@@ -0,0 +1,15 @@
+require File.expand_path("../endpoint_extra", __FILE__)
+
+Artifice.deactivate
+
+class EndpointExtraMissing < EndpointExtra
+  get "/extra/fetch/actual/gem/:id" do
+    if params[:id] == 'missing-1.0.gemspec.rz'
+      halt 404
+    else
+      File.read("#{gem_repo2}/quick/Marshal.4.8/#{params[:id]}")
+    end
+  end
+end
+
+Artifice.activate_with(EndpointExtraMissing)

data/spec/support/artifice/endpoint_fallback.rb

@@ -0,0 +1,18 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointFallback < Endpoint
+  DEPENDENCY_LIMIT = 60
+
+  get "/api/v1/dependencies" do
+    if params[:gems].size <= DEPENDENCY_LIMIT
+      Marshal.dump(dependencies_for(params[:gems]))
+    else
+      status 413
+      "Too many gems to resolve, please request less than #{DEPENDENCY_LIMIT} gems"
+    end
+  end
+end
+
+Artifice.activate_with(EndpointFallback)

data/spec/support/artifice/endpoint_marshal_fail.rb

@@ -0,0 +1,11 @@
+require File.expand_path("../endpoint_fallback", __FILE__)
+
+Artifice.deactivate
+
+class EndpointMarshalFail < EndpointFallback
+  get "/api/v1/dependencies" do
+    "f0283y01hasf"
+  end
+end
+
+Artifice.activate_with(EndpointMarshalFail)

data/spec/support/artifice/endpoint_redirect.rb

@@ -0,0 +1,15 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointRedirect < Endpoint
+  get "/fetch/actual/gem/:id" do
+    redirect "/fetch/actual/gem/#{params[:id]}"
+  end
+
+  get "/api/v1/dependencies" do
+    status 404
+  end
+end
+
+Artifice.activate_with(EndpointRedirect)

data/spec/support/builders.rb

@@ -16,14 +16,17 @@ module Spec
       build_repo gem_repo1 do
         build_gem "rack", %w(0.9.1 1.0.0) do |s|
           s.executables = "rackup"
+          s.post_install_message = "Rack's post install message"
         end
 
         build_gem "thin" do |s|
           s.add_dependency "rack"
+          s.post_install_message = "Thin's post install message"
         end
 
         build_gem "rack-obama" do |s|
           s.add_dependency "rack"
+          s.post_install_message = "Rack-obama's post install message"
         end
 
         build_gem "rack_middleware", "1.0" do |s|
@@ -164,6 +167,10 @@ module Spec
           s.write "lib/rubygems_plugin.rb", "require 'bundler/omg' ; puts 'FAIL'"
         end
 
+        build_gem "bundler_dep" do |s|
+          s.add_dependency "bundler"
+        end
+
         # The yard gem iterates over Gem.source_index looking for plugins
         build_gem "yard" do |s|
           s.write "lib/yard.rb", <<-Y

data/spec/support/fakeweb/rack-1.0.0.marshal

@@ -0,0 +1,2 @@
+[{	:dependencies[["	thin"	>= 0["ruby-openid"
+1.0.0

data/spec/support/fakeweb/windows.rb

@@ -0,0 +1,23 @@
+require File.expand_path("../../path.rb", __FILE__)
+include Spec::Path
+
+files = [ 'specs.4.8.gz',
+          'prerelease_specs.4.8.gz',
+          'quick/Marshal.4.8/rcov-1.0-mswin32.gemspec.rz',
+          'gems/rcov-1.0-mswin32.gem' ]
+
+# Set up pretend http gem server with FakeWeb
+$LOAD_PATH.unshift "#{Dir[base_system_gems.join("gems/fakeweb*/lib")].first}"
+require 'fakeweb'
+
+FakeWeb.allow_net_connect = false
+
+files.each do |file|
+  FakeWeb.register_uri(:get, "http://localgemserver.test/#{file}",
+    :body => File.read("#{gem_repo1}/#{file}"))
+end
+FakeWeb.register_uri(:get, "http://localgemserver.test/gems/rcov-1.0-x86-mswin32.gem",
+  :status => ["404", "Not Found"])
+
+FakeWeb.register_uri(:get, "http://localgemserver.test/api/v1/dependencies?gems=rcov",
+  :status => ["404", "Not Found"])

data/spec/support/helpers.rb

@@ -35,6 +35,20 @@ module Spec
       @out = ruby(setup + cmd, :expect_err => expect_err, :env => env)
     end
 
+    def load_error_run(ruby, gem, *args)
+      cmd = <<-R
+        begin
+          #{ruby}
+        rescue LoadError => e
+          $stderr.puts "ZOMG LOAD ERROR" if e.message.include?("-- #{gem}")
+        end
+      R
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      opts.merge!(:expect_err => true)
+      args += [opts]
+      run(cmd, *args)
+    end
+
     def lib
       File.expand_path('../../../lib', __FILE__)
     end
@@ -44,12 +58,19 @@ module Spec
       exitstatus = options.delete(:exitstatus)
       options["no-color"] = true unless options.key?("no-color") || cmd.to_s[0..3] == "exec"
 
+      bundle_bin = File.expand_path('../../../bin/bundle', __FILE__)
+
+      requires = options.delete(:requires) || []
+      requires << File.expand_path('../fakeweb/'+options.delete(:fakeweb)+'.rb', __FILE__) if options.key?(:fakeweb)
+      requires << File.expand_path('../artifice/'+options.delete(:artifice)+'.rb', __FILE__) if options.key?(:artifice)
+      requires_str = requires.map{|r| "-r#{r}"}.join(" ")
+
       env = (options.delete(:env) || {}).map{|k,v| "#{k}='#{v}' "}.join
       args = options.map do |k,v|
         v == true ? " --#{k}" : " --#{k} #{v}" if v
       end.join
-      gemfile = File.expand_path('../../../bin/bundle', __FILE__)
-      cmd = "#{env}#{Gem.ruby} -I#{lib} #{gemfile} #{cmd}#{args}"
+
+      cmd = "#{env}#{Gem.ruby} -I#{lib} #{requires_str} #{bundle_bin} #{cmd}#{args}"
 
       if exitstatus
         sys_status(cmd)
@@ -62,7 +83,19 @@ module Spec
       expect_err = options.delete(:expect_err)
       env = (options.delete(:env) || {}).map{|k,v| "#{k}='#{v}' "}.join
       ruby.gsub!(/["`\$]/) {|m| "\\#{m}" }
-      sys_exec(%{#{env}#{Gem.ruby} -I#{lib} -e "#{ruby}"}, expect_err)
+      lib_option = options[:no_lib] ? "" : " -I#{lib}"
+      sys_exec(%{#{env}#{Gem.ruby}#{lib_option} -e "#{ruby}"}, expect_err)
+    end
+
+    def load_error_ruby(ruby, gem, opts = {})
+      cmd = <<-R
+        begin
+          #{ruby}
+        rescue LoadError => e
+          $stderr.puts "ZOMG LOAD ERROR"# if e.message.include?("-- #{gem}")
+        end
+      R
+      ruby(cmd, opts.merge(:expect_err => true))
     end
 
     def gembin(cmd)

data/spec/support/path.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Spec
   module Path
     def root

data/spec/support/rubygems_ext.rb

@@ -11,12 +11,12 @@ 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 fakeweb --no-rdoc --no-ri`
+        puts "fetching fakeweb, artifice, sinatra, rake, and builder for the tests to use..."
+        `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`
         # 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`
       end