bundler 1.1.pre.10 → 1.1.rc

data/spec/realworld/edgecases_spec.rb

@@ -0,0 +1,12 @@
+describe "real world edgecases", :realworld => true do
+  if RUBY_VERSION < "1.9"
+    # there is no rbx-relative-require gem that will install on 1.9
+    it "ignores extra gems with bad platforms" do
+      install_gemfile <<-G
+        source :rubygems
+        gem "linecache", "0.46"
+      G
+      err.should eq("")
+    end
+  end
+end

data/spec/runtime/executable_spec.rb

@@ -36,6 +36,16 @@ describe "Running bin/* commands" do
     out.should == "1.0.0"
   end
 
+  it "uses the default ruby install name when shebang is not specified" do
+   bundle "install --binstubs"
+   File.open("bin/rackup").gets.should == "#!/usr/bin/env #{RbConfig::CONFIG['ruby_install_name']}\n"
+  end
+
+  it "allows the name of the shebang executable to be specified" do
+    bundle "install --binstubs --shebang ruby-foo"
+    File.open("bin/rackup").gets.should == "#!/usr/bin/env ruby-foo\n"
+  end
+
   it "runs the bundled command when out of the bundle" do
     bundle "install --binstubs"
 

data/spec/runtime/require_spec.rb

@@ -82,14 +82,11 @@ describe "Bundler.require" do
       gem "two", :require => 'fail'
     G
 
-    run <<-R
-      begin
-        Bundler.require
-      rescue LoadError => e
-        puts e.message
-      end
+    load_error_run <<-R, 'fail'
+      Bundler.require
     R
-    out.should == 'no such file to load -- fail'
+
+    err.should == "ZOMG LOAD ERROR"
   end
 
   describe "using bundle exec" do
@@ -191,8 +188,10 @@ describe "Bundler.require" do
           gem "busted_require"
         G
 
-        run "Bundler.require", :expect_err => true
-        err.should include("no such file to load -- no_such_file_omg")
+        load_error_run <<-R, 'no_such_file_omg'
+          Bundler.require
+        R
+        err.should == 'ZOMG LOAD ERROR'
       end
     end
   end

data/spec/spec_helper.rb

@@ -53,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_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/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
@@ -73,6 +87,17 @@ module Spec
       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)
       lib = File.expand_path("../../../lib", __FILE__)
       old, ENV['RUBYOPT'] = ENV['RUBYOPT'], "#{ENV['RUBYOPT']} -I#{lib}"

data/spec/support/rubygems_ext.rb

@@ -12,7 +12,8 @@ module Spec
       unless File.exist?("#{Path.base_system_gems}")
         FileUtils.mkdir_p(Path.base_system_gems)
         puts "fetching fakeweb, artifice, sinatra, rake, and builder for the tests to use..."
-        `gem install fakeweb artifice sinatra --no-rdoc --no-ri`
+        `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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 1923831893
+  hash: 7712070
   prerelease: true
   segments: 
   - 1
   - 1
-  - pre
-  - 10
-  version: 1.1.pre.10
+  - rc
+  version: 1.1.rc
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -19,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 -07:00
+date: 2011-10-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +74,7 @@ files:
 - lib/bundler/capistrano.rb
 - lib/bundler/cli.rb
 - lib/bundler/definition.rb
+- lib/bundler/dep_proxy.rb
 - lib/bundler/dependency.rb
 - lib/bundler/deployment.rb
 - lib/bundler/dsl.rb
@@ -82,6 +82,7 @@ files:
 - lib/bundler/environment.rb
 - lib/bundler/fetcher.rb
 - lib/bundler/gem_helper.rb
+- lib/bundler/gem_helpers.rb
 - lib/bundler/gem_installer.rb
 - lib/bundler/gem_tasks.rb
 - lib/bundler/graph.rb
@@ -89,6 +90,7 @@ files:
 - lib/bundler/installer.rb
 - lib/bundler/lazy_specification.rb
 - lib/bundler/lockfile_parser.rb
+- lib/bundler/match_platform.rb
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
 - lib/bundler/rubygems_ext.rb
@@ -193,6 +195,7 @@ files:
 - spec/other/outdated_spec.rb
 - spec/other/show_spec.rb
 - spec/quality_spec.rb
+- spec/realworld/edgecases_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
 - spec/runtime/executable_spec.rb
@@ -202,7 +205,9 @@ files:
 - spec/runtime/setup_spec.rb
 - spec/runtime/with_clean_env_spec.rb
 - spec/spec_helper.rb
+- spec/support/artifice/endopint_marshal_fail_basic_authentication.rb
 - spec/support/artifice/endpoint.rb
+- spec/support/artifice/endpoint_500.rb
 - spec/support/artifice/endpoint_api_missing.rb
 - spec/support/artifice/endpoint_basic_authentication.rb
 - spec/support/artifice/endpoint_extra.rb
@@ -225,20 +230,22 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
 - lib/bundler/man/bundle-exec
-- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/bundle
 - lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
+- lib/bundler/man/gemfile.5
+- lib/bundler/man/bundle-benchmark
 - lib/bundler/man/bundle-package
-- lib/bundler/man/bundle-package.txt
 - lib/bundler/man/bundle-update
+- lib/bundler/man/bundle-exec.txt
+- lib/bundler/man/gemfile.5.txt
 - lib/bundler/man/bundle-update.txt
+- lib/bundler/man/bundle-config
+- lib/bundler/man/bundle-config.txt
+- lib/bundler/man/bundle-benchmark.txt
 - lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
+- lib/bundler/man/bundle-package.txt
+- lib/bundler/man/bundle-install.txt
 has_rdoc: true
 homepage: http://gembundler.com
 licenses: []
@@ -275,78 +282,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: 
-- spec/bundler/dsl_spec.rb
-- spec/bundler/gem_helper_spec.rb
-- spec/bundler/source_spec.rb
-- spec/cache/gems_spec.rb
-- spec/cache/git_spec.rb
-- spec/cache/path_spec.rb
-- spec/cache/platform_spec.rb
-- spec/install/deploy_spec.rb
-- spec/install/deprecated_spec.rb
-- spec/install/gems/c_ext_spec.rb
-- spec/install/gems/dependency_api_spec.rb
-- spec/install/gems/env_spec.rb
-- spec/install/gems/flex_spec.rb
-- spec/install/gems/groups_spec.rb
-- spec/install/gems/packed_spec.rb
-- spec/install/gems/platform_spec.rb
-- spec/install/gems/post_install_spec.rb
-- spec/install/gems/resolving_spec.rb
-- spec/install/gems/simple_case_spec.rb
-- spec/install/gems/standalone_spec.rb
-- spec/install/gems/sudo_spec.rb
-- spec/install/gems/win32_spec.rb
-- spec/install/gemspec_spec.rb
-- spec/install/git_spec.rb
-- spec/install/invalid_spec.rb
-- spec/install/path_spec.rb
-- spec/install/upgrade_spec.rb
-- spec/lock/git_spec.rb
-- spec/lock/lockfile_spec.rb
-- spec/other/check_spec.rb
-- spec/other/clean_spec.rb
-- spec/other/config_spec.rb
-- spec/other/console_spec.rb
-- spec/other/exec_spec.rb
-- spec/other/ext_spec.rb
-- spec/other/help_spec.rb
-- spec/other/init_spec.rb
-- spec/other/newgem_spec.rb
-- spec/other/open_spec.rb
-- spec/other/outdated_spec.rb
-- spec/other/show_spec.rb
-- spec/quality_spec.rb
-- spec/resolver/basic_spec.rb
-- spec/resolver/platform_spec.rb
-- spec/runtime/executable_spec.rb
-- spec/runtime/load_spec.rb
-- spec/runtime/platform_spec.rb
-- spec/runtime/require_spec.rb
-- spec/runtime/setup_spec.rb
-- spec/runtime/with_clean_env_spec.rb
-- spec/spec_helper.rb
-- spec/support/artifice/endpoint.rb
-- spec/support/artifice/endpoint_api_missing.rb
-- spec/support/artifice/endpoint_basic_authentication.rb
-- spec/support/artifice/endpoint_extra.rb
-- spec/support/artifice/endpoint_extra_missing.rb
-- spec/support/artifice/endpoint_fallback.rb
-- spec/support/artifice/endpoint_marshal_fail.rb
-- spec/support/artifice/endpoint_redirect.rb
-- spec/support/builders.rb
-- spec/support/fakeweb/rack-1.0.0.marshal
-- spec/support/fakeweb/windows.rb
-- spec/support/helpers.rb
-- spec/support/indexes.rb
-- spec/support/matchers.rb
-- spec/support/path.rb
-- spec/support/platforms.rb
-- spec/support/ruby_ext.rb
-- spec/support/rubygems_ext.rb
-- spec/support/rubygems_hax/platform.rb
-- spec/support/sudo.rb
-- spec/update/gems_spec.rb
-- spec/update/git_spec.rb
-- spec/update/source_spec.rb
+test_files: []
+