bundler 1.1.pre.5 → 1.1.pre.7

data/spec/other/exec_spec.rb

@@ -101,7 +101,7 @@ describe "bundle exec" do
     bundle "exec foobarbaz", :exitstatus => true
     exitstatus.should eq(127)
     out.should include("bundler: command not found: foobarbaz")
-    out.should include("Install missing gem binaries with `bundle install`")
+    out.should include("Install missing gem executables with `bundle install`")
   end
 
   it "errors nicely when the argument is not executable" do
@@ -115,7 +115,7 @@ describe "bundle exec" do
     out.should include("bundler: not executable: ./foo")
   end
 
-  describe "with gem binaries" do
+  describe "with gem executables" do
     describe "run from a random directory" do
       before(:each) do
         install_gemfile <<-G

data/spec/other/gem_helper_spec.rb

@@ -118,7 +118,7 @@ describe "Bundler::GemHelper tasks" do
           `git config user.name "name"`
           `git remote add origin file://#{gem_repo1}`
           `git commit -a -m "initial commit"`
-          Open3.popen3("git push origin master") # use popen3 to silence output...
+          sys_exec("git push origin master", true)
           `git commit -a -m "another commit"`
         }
         @helper.release_gem

data/spec/runtime/setup_spec.rb

@@ -214,7 +214,7 @@ describe "Bundler.setup" do
         out.should == "WIN"
       end
 
-      it "version_requirement is now deprecated in rubygesm 1.4.0+  when the version is wrong" do
+      it "version_requirement is now deprecated in rubygems 1.4.0+ when the version is wrong" do
         run <<-R, :expect_err => true
           begin
             gem "rack", "1.0.0"

data/spec/support/artifice/endpoint.rb

@@ -13,9 +13,9 @@ require 'sinatra/base'
 class Endpoint < Sinatra::Base
 
   helpers do
-    def dependencies_for(gem_names)
+    def dependencies_for(gem_names, marshal = gem_repo1("Marshal.4.8"))
       require 'rubygems'
-      Marshal.load(File.open(gem_repo1("Marshal.4.8")).read).map do |gem, spec|
+      Marshal.load(File.open(marshal).read).map do |gem, spec|
         if gem_names.include?(spec.name)
           {
             :name         => spec.name,

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_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/helpers.rb

@@ -13,7 +13,7 @@ module Spec
       FileUtils.mkdir_p(tmp)
       FileUtils.mkdir_p(home)
       Gem.sources = ["file://#{gem_repo1}/"]
-      Gem.configuration.write
+      # Gem.configuration.write
     end
 
     attr_reader :out, :err, :exitstatus
@@ -45,17 +45,18 @@ module Spec
       options["no-color"] = true unless options.key?("no-color") || cmd.to_s[0..3] == "exec"
 
       bundle_bin = File.expand_path('../../../bin/bundle', __FILE__)
-      fake_file = options.delete(:fakeweb)
-      fakeweb = fake_file ? "-r#{File.expand_path('../fakeweb/'+fake_file+'.rb', __FILE__)}" : nil
-      artifice_file = options.delete(:artifice)
-      artifice = artifice_file ? "-r#{File.expand_path('../artifice/'+artifice_file+'.rb', __FILE__)}" : nil
+
+      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
 
-      cmd = "#{env}#{Gem.ruby} -I#{lib} #{fakeweb} #{artifice} #{bundle_bin} #{cmd}#{args}"
+      cmd = "#{env}#{Gem.ruby} -I#{lib} #{requires_str} #{bundle_bin} #{cmd}#{args}"
 
       if exitstatus
         sys_status(cmd)

metadata

@@ -1,51 +1,66 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bundler
-version: !ruby/object:Gem::Version
-  version: 1.1.pre.5
-  prerelease: 4
+version: !ruby/object:Gem::Version 
+  hash: 1923831887
+  prerelease: true
+  segments: 
+  - 1
+  - 1
+  - pre
+  - 7
+  version: 1.1.pre.7
 platform: ruby
-authors:
-- André Arko
+authors: 
+- "Andr\xC3\xA9 Arko"
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-11 00:00:00.000000000 -05:00
+
+date: 2011-08-08 00:00:00 -05:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ronn
-  requirement: &19160300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *19160300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &19192600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
-  prerelease: false
-  version_requirements: *19192600
-description: Bundler manages an application's dependencies through its entire life,
-  across many machines, systematically and repeatably
-email:
+  version_requirements: *id002
+description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
+email: 
 - andre@arko.net
-executables:
+executables: 
 - bundle
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -98,6 +113,7 @@ files:
 - lib/bundler/vendor/thor.rb
 - lib/bundler/vendor/thor/actions.rb
 - lib/bundler/vendor/thor/actions/create_file.rb
+- lib/bundler/vendor/thor/actions/create_link.rb
 - lib/bundler/vendor/thor/actions/directory.rb
 - lib/bundler/vendor/thor/actions/empty_directory.rb
 - lib/bundler/vendor/thor/actions/file_manipulation.rb
@@ -107,12 +123,15 @@ files:
 - lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb
 - lib/bundler/vendor/thor/core_ext/ordered_hash.rb
 - lib/bundler/vendor/thor/error.rb
+- lib/bundler/vendor/thor/group.rb
 - lib/bundler/vendor/thor/invocation.rb
 - lib/bundler/vendor/thor/parser.rb
 - lib/bundler/vendor/thor/parser/argument.rb
 - lib/bundler/vendor/thor/parser/arguments.rb
 - lib/bundler/vendor/thor/parser/option.rb
 - lib/bundler/vendor/thor/parser/options.rb
+- lib/bundler/vendor/thor/rake_compat.rb
+- lib/bundler/vendor/thor/runner.rb
 - lib/bundler/vendor/thor/shell.rb
 - lib/bundler/vendor/thor/shell/basic.rb
 - lib/bundler/vendor/thor/shell/color.rb
@@ -171,7 +190,6 @@ files:
 - spec/other/open_spec.rb
 - spec/other/outdated_spec.rb
 - spec/other/show_spec.rb
-- spec/pack/gems_spec.rb
 - spec/quality_spec.rb
 - spec/resolver/basic_spec.rb
 - spec/resolver/platform_spec.rb
@@ -183,7 +201,10 @@ files:
 - 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
@@ -221,26 +242,38 @@ files:
 has_rdoc: true
 homepage: http://gembundler.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: bundler
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
 test_files: []
+

data/spec/pack/gems_spec.rb

@@ -1,22 +0,0 @@
-require "spec_helper"
-
-describe "bundle pack with gems" do
-  describe "when there are only gemsources" do
-    before :each do
-      gemfile <<-G
-        gem 'rack'
-      G
-
-      system_gems "rack-1.0.0"
-      bundle :pack
-    end
-
-    it "locks the gemfile" do
-      bundled_app("Gemfile.lock").should exist
-    end
-
-    it "caches the gems" do
-      bundled_app("vendor/cache/rack-1.0.0.gem").should exist
-    end
-  end
-end