bundler 1.0.22 → 1.1.pre

data/spec/support/artifice/endpoint.rb

@@ -0,0 +1,50 @@
+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)
+      require 'rubygems'
+      Marshal.load(File.open(gem_repo1("Marshal.4.8")).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
+end
+
+Artifice.activate_with(Endpoint)

data/spec/support/artifice/endpoint_fallback.rb

@@ -0,0 +1,22 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointFallback < Endpoint
+  DEPENDENCY_LIMIT = 60
+
+  get "/specs.4.8.gz" do
+    File.read("#{gem_repo1}/specs.4.8.gz")
+  end
+
+  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,11 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointRedirect < Endpoint
+  get "/fetch/actual/gem/:id" do
+    redirect "/fetch/actual/gem/#{params[:id]}"
+  end
+end
+
+Artifice.activate_with(EndpointRedirect)

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",           "0.8.7"
+          s.add_dependency "rake"
           s.add_dependency "actionpack",     "2.3.2"
           s.add_dependency "activerecord",   "2.3.2"
           s.add_dependency "actionmailer",   "2.3.2"
@@ -167,12 +167,7 @@ module Spec
         # The yard gem iterates over Gem.source_index looking for plugins
         build_gem "yard" do |s|
           s.write "lib/yard.rb", <<-Y
-            if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("1.8.10")
-              specs = Gem::Specification
-            else
-              specs = Gem.source_index.find_name('')
-            end
-            specs.each do |gem|
+            Gem.source_index.find_name('').each do |gem|
               puts gem.full_name
             end
           Y
@@ -222,12 +217,6 @@ module Spec
           s.add_dependency "net_d"
         end
 
-        # Capistrano did this (at least until version 2.5.10)
-        build_gem "double_deps" do |s|
-          s.add_dependency "net-ssh", ">= 1.0.0"
-          s.add_dependency "net-ssh"
-        end
-
         build_gem "foo"
       end
     end
@@ -327,9 +316,6 @@ module Spec
 
       Array(versions).each do |version|
         spec = builder.new(self, name, version)
-        if !spec.authors or spec.authors.empty?
-          spec.authors = ["no one"]
-        end
         yield spec if block_given?
         spec._build(options)
       end
@@ -462,8 +448,6 @@ module Spec
           @files = _default_files.merge(@files)
         end
 
-        @spec.authors = ["no one"]
-
         @files.each do |file, source|
           file = Pathname.new(path).join(file)
           FileUtils.mkdir_p(file.dirname)
@@ -489,8 +473,6 @@ 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
@@ -575,11 +557,6 @@ module Spec
         Dir.chdir(lib_path) do
           destination = opts[:path] || _default_path
           FileUtils.mkdir_p(destination)
-
-          if !@spec.authors or @spec.authors.empty?
-            @spec.authors = ["that guy"]
-          end
-
           Gem::Builder.new(@spec).build
           if opts[:to_system]
             `gem install --ignore-dependencies #{@spec.full_name}.gem`

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

@@ -3,7 +3,7 @@ module Spec
     def reset!
       @in_p, @out_p, @err_p = nil, nil, nil
       Dir["#{tmp}/{gems/*,*}"].each do |dir|
-        next if %(base remote1 gems rubygems).include?(File.basename(dir))
+        next if %(base remote1 gems rubygems_v1.3.5 rubygems_v1.3.6 rubygems_v1.3.7 rubygems_v1.4.0 rubygems_v1.4.1 rubygems_master).include?(File.basename(dir))
         unless ENV['BUNDLER_SUDO_TESTS']
           FileUtils.rm_rf(dir)
         else
@@ -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
@@ -44,12 +44,18 @@ 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__)
+      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
+
       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} #{fakeweb} #{artifice} #{bundle_bin} #{cmd}#{args}"
 
       if exitstatus
         sys_status(cmd)
@@ -62,7 +68,8 @@ 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 gembin(cmd)

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+/)
-        Gem::Version.new(actual_version).should eq(Gem::Version.new(version))
+        check Gem::Version.new(actual_version).should == Gem::Version.new(version)
         actual_platform.should == platform
       end
     end
@@ -67,11 +67,23 @@ module Spec
       bundled_app("Gemfile.lock").should exist
     end
 
-    def lockfile_should_be(expected)
-      should_be_locked
+    RSpec::Matchers.define :be_with_diff do |expected|
       spaces = expected[/\A\s+/, 0] || ""
       expected.gsub!(/^#{spaces}/, '')
-      bundled_app("Gemfile.lock").read.should == expected
+
+      failure_message_for_should do |actual|
+        "The lockfile did not match.\n=== Expected:\n" <<
+          expected << "\n=== Got:\n" << actual << "\n===========\n"
+      end
+
+      match do |actual|
+        expected == actual
+      end
+    end
+
+    def lockfile_should_be(expected)
+      lock = File.read(bundled_app("Gemfile.lock"))
+      lock.should be_with_diff(expected)
     end
   end
 end

data/spec/support/path.rb

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

data/spec/support/rubygems_ext.rb

@@ -1,5 +1,3 @@
-require 'rubygems/user_interaction'
-
 module Spec
   module Rubygems
     def self.setup
@@ -11,10 +9,8 @@ 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`
-        # Rake version has to be consistent for tests to pass
-        `gem install rake --version 0.8.7 --no-rdoc --no-ri`
+        puts "running `gem install rake fakeweb artifice sinatra --no-rdoc --no-ri`"
+        `gem install rake fakeweb artifice sinatra --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/gems_spec.rb

@@ -115,8 +115,7 @@ describe "bundle update when a gem depends on a newer version of bundler" do
 
   it "should explain that bundler conflicted" do
     bundle "update"
-    out.should_not =~ /in snapshot/i
-    out.should =~ /current Bundler version/i
-    out.should =~ /perhaps you need to update bundler/i
+    out.should_not =~ /In snapshot/
+    out.should =~ /Current Bundler version/
   end
 end

data/spec/update/git_spec.rb

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

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
+  hash: 961915928
+  prerelease: true
   segments: 
   - 1
-  - 0
-  - 22
-  version: 1.0.22
+  - 1
+  - pre
+  version: 1.1.pre
 platform: ruby
 authors: 
-- "Andr\xC3\xA9 Arko"
-- Terence Lee
 - Carl Lerche
 - Yehuda Katz
+- "Andr\xC3\xA9 Arko"
+- Terence Lee
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-02-08 00:00:00 -08:00
-default_executable: 
+date: 2011-01-21 00:00:00 -08:00
+default_executable: bundle
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ronn
@@ -41,17 +41,20 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7712058
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        - rc
+        version: 2.0.0.rc
   type: :development
   version_requirements: *id002
 description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
 email: 
-- andre@arko.net
+- carlhuda@engineyard.com
 executables: 
 - bundle
 extensions: []
@@ -60,7 +63,6 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- .travis.yml
 - CHANGELOG.md
 - ISSUES.md
 - LICENSE
@@ -77,9 +79,8 @@ files:
 - lib/bundler/deployment.rb
 - lib/bundler/dsl.rb
 - lib/bundler/environment.rb
+- lib/bundler/fetcher.rb
 - lib/bundler/gem_helper.rb
-- lib/bundler/gem_installer.rb
-- lib/bundler/gem_tasks.rb
 - lib/bundler/graph.rb
 - lib/bundler/index.rb
 - lib/bundler/installer.rb
@@ -88,7 +89,6 @@ files:
 - lib/bundler/remote_specification.rb
 - lib/bundler/resolver.rb
 - lib/bundler/rubygems_ext.rb
-- lib/bundler/rubygems_integration.rb
 - lib/bundler/runtime.rb
 - lib/bundler/settings.rb
 - lib/bundler/setup.rb
@@ -105,10 +105,11 @@ files:
 - lib/bundler/templates/newgem/lib/newgem/version.rb.tt
 - lib/bundler/templates/newgem/newgem.gemspec.tt
 - lib/bundler/ui.rb
+- lib/bundler/vendor/net/http/faster.rb
+- lib/bundler/vendor/net/http/persistent.rb
 - 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
@@ -118,15 +119,12 @@ 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
@@ -134,7 +132,6 @@ files:
 - lib/bundler/vendor/thor/task.rb
 - lib/bundler/vendor/thor/util.rb
 - lib/bundler/vendor/thor/version.rb
-- lib/bundler/vendored_thor.rb
 - lib/bundler/version.rb
 - lib/bundler/vlad.rb
 - man/bundle-config.ronn
@@ -145,7 +142,6 @@ files:
 - man/bundle.ronn
 - man/gemfile.5.ronn
 - man/index.txt
-- spec/bundler/gem_helper_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
 - spec/cache/path_spec.rb
@@ -153,6 +149,7 @@ files:
 - 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
@@ -160,6 +157,7 @@ files:
 - spec/install/gems/platform_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
@@ -170,15 +168,18 @@ files:
 - 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/gem_helper_spec.rb
 - spec/other/help_spec.rb
 - spec/other/init_spec.rb
 - spec/other/newgem_spec.rb
 - spec/other/open_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
@@ -189,7 +190,13 @@ files:
 - 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_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
@@ -253,7 +260,6 @@ signing_key:
 specification_version: 3
 summary: The best way to manage your application's dependencies
 test_files: 
-- spec/bundler/gem_helper_spec.rb
 - spec/cache/gems_spec.rb
 - spec/cache/git_spec.rb
 - spec/cache/path_spec.rb
@@ -261,6 +267,7 @@ test_files:
 - 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
@@ -268,6 +275,7 @@ test_files:
 - spec/install/gems/platform_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
@@ -278,15 +286,18 @@ test_files:
 - 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/gem_helper_spec.rb
 - spec/other/help_spec.rb
 - spec/other/init_spec.rb
 - spec/other/newgem_spec.rb
 - spec/other/open_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
@@ -297,7 +308,13 @@ test_files:
 - 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_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