update bundled gems

vendor/gems/environment.rb

@@ -26,8 +26,8 @@ module Bundler
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-1.0.1/lib")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/shotgun-0.4/bin")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/shotgun-0.4/lib")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.1/bin")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.2/bin")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.1/lib")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.2/lib")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/bin")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/lib")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/thin-1.2.5/bin")
@@ -67,78 +67,6 @@ module Bundler
 
   @gemfile = "#{dir}/../../Gemfile"
 
-  require "rubygems"
-
-  @bundled_specs = {}
-  @bundled_specs["rdoc"] = eval(File.read("#{dir}/specifications/rdoc-2.4.3.gemspec"))
-  @bundled_specs["rdoc"].loaded_from = "#{dir}/specifications/rdoc-2.4.3.gemspec"
-  @bundled_specs["configuration"] = eval(File.read("#{dir}/specifications/configuration-1.1.0.gemspec"))
-  @bundled_specs["configuration"].loaded_from = "#{dir}/specifications/configuration-1.1.0.gemspec"
-  @bundled_specs["builder"] = eval(File.read("#{dir}/specifications/builder-2.1.2.gemspec"))
-  @bundled_specs["builder"].loaded_from = "#{dir}/specifications/builder-2.1.2.gemspec"
-  @bundled_specs["daemons"] = eval(File.read("#{dir}/specifications/daemons-1.0.10.gemspec"))
-  @bundled_specs["daemons"].loaded_from = "#{dir}/specifications/daemons-1.0.10.gemspec"
-  @bundled_specs["extlib"] = eval(File.read("#{dir}/specifications/extlib-0.9.13.gemspec"))
-  @bundled_specs["extlib"].loaded_from = "#{dir}/specifications/extlib-0.9.13.gemspec"
-  @bundled_specs["json"] = eval(File.read("#{dir}/specifications/json-1.2.0.gemspec"))
-  @bundled_specs["json"].loaded_from = "#{dir}/specifications/json-1.2.0.gemspec"
-  @bundled_specs["eventmachine"] = eval(File.read("#{dir}/specifications/eventmachine-0.12.10.gemspec"))
-  @bundled_specs["eventmachine"].loaded_from = "#{dir}/specifications/eventmachine-0.12.10.gemspec"
-  @bundled_specs["rack"] = eval(File.read("#{dir}/specifications/rack-1.0.1.gemspec"))
-  @bundled_specs["rack"].loaded_from = "#{dir}/specifications/rack-1.0.1.gemspec"
-  @bundled_specs["shotgun"] = eval(File.read("#{dir}/specifications/shotgun-0.4.gemspec"))
-  @bundled_specs["shotgun"].loaded_from = "#{dir}/specifications/shotgun-0.4.gemspec"
-  @bundled_specs["rack-test"] = eval(File.read("#{dir}/specifications/rack-test-0.5.1.gemspec"))
-  @bundled_specs["rack-test"].loaded_from = "#{dir}/specifications/rack-test-0.5.1.gemspec"
-  @bundled_specs["sinatra"] = eval(File.read("#{dir}/specifications/sinatra-0.9.4.gemspec"))
-  @bundled_specs["sinatra"].loaded_from = "#{dir}/specifications/sinatra-0.9.4.gemspec"
-  @bundled_specs["thin"] = eval(File.read("#{dir}/specifications/thin-1.2.5.gemspec"))
-  @bundled_specs["thin"].loaded_from = "#{dir}/specifications/thin-1.2.5.gemspec"
-  @bundled_specs["sdoc"] = eval(File.read("#{dir}/specifications/sdoc-0.2.14.1.gemspec"))
-  @bundled_specs["sdoc"].loaded_from = "#{dir}/specifications/sdoc-0.2.14.1.gemspec"
-  @bundled_specs["yui-compressor"] = eval(File.read("#{dir}/specifications/yui-compressor-0.9.1.gemspec"))
-  @bundled_specs["yui-compressor"].loaded_from = "#{dir}/specifications/yui-compressor-0.9.1.gemspec"
-  @bundled_specs["polyglot"] = eval(File.read("#{dir}/specifications/polyglot-0.2.9.gemspec"))
-  @bundled_specs["polyglot"].loaded_from = "#{dir}/specifications/polyglot-0.2.9.gemspec"
-  @bundled_specs["treetop"] = eval(File.read("#{dir}/specifications/treetop-1.4.2.gemspec"))
-  @bundled_specs["treetop"].loaded_from = "#{dir}/specifications/treetop-1.4.2.gemspec"
-  @bundled_specs["rake"] = eval(File.read("#{dir}/specifications/rake-0.8.7.gemspec"))
-  @bundled_specs["rake"].loaded_from = "#{dir}/specifications/rake-0.8.7.gemspec"
-  @bundled_specs["launchy"] = eval(File.read("#{dir}/specifications/launchy-0.3.3.gemspec"))
-  @bundled_specs["launchy"].loaded_from = "#{dir}/specifications/launchy-0.3.3.gemspec"
-  @bundled_specs["sprockets"] = eval(File.read("#{dir}/specifications/sprockets-1.0.2.gemspec"))
-  @bundled_specs["sprockets"].loaded_from = "#{dir}/specifications/sprockets-1.0.2.gemspec"
-  @bundled_specs["haml"] = eval(File.read("#{dir}/specifications/haml-2.2.13.gemspec"))
-  @bundled_specs["haml"].loaded_from = "#{dir}/specifications/haml-2.2.13.gemspec"
-  @bundled_specs["diff-lcs"] = eval(File.read("#{dir}/specifications/diff-lcs-1.1.2.gemspec"))
-  @bundled_specs["diff-lcs"].loaded_from = "#{dir}/specifications/diff-lcs-1.1.2.gemspec"
-  @bundled_specs["rspec"] = eval(File.read("#{dir}/specifications/rspec-1.2.9.gemspec"))
-  @bundled_specs["rspec"].loaded_from = "#{dir}/specifications/rspec-1.2.9.gemspec"
-  @bundled_specs["highline"] = eval(File.read("#{dir}/specifications/highline-1.5.1.gemspec"))
-  @bundled_specs["highline"].loaded_from = "#{dir}/specifications/highline-1.5.1.gemspec"
-  @bundled_specs["templater"] = eval(File.read("#{dir}/specifications/templater-1.0.0.gemspec"))
-  @bundled_specs["templater"].loaded_from = "#{dir}/specifications/templater-1.0.0.gemspec"
-  @bundled_specs["term-ansicolor"] = eval(File.read("#{dir}/specifications/term-ansicolor-1.0.4.gemspec"))
-  @bundled_specs["term-ansicolor"].loaded_from = "#{dir}/specifications/term-ansicolor-1.0.4.gemspec"
-  @bundled_specs["cucumber"] = eval(File.read("#{dir}/specifications/cucumber-0.4.4.gemspec"))
-  @bundled_specs["cucumber"].loaded_from = "#{dir}/specifications/cucumber-0.4.4.gemspec"
-  @bundled_specs["sinatra-content-for"] = eval(File.read("#{dir}/specifications/sinatra-content-for-0.2.gemspec"))
-  @bundled_specs["sinatra-content-for"].loaded_from = "#{dir}/specifications/sinatra-content-for-0.2.gemspec"
-  @bundled_specs["compass"] = eval(File.read("#{dir}/specifications/compass-0.8.17.gemspec"))
-  @bundled_specs["compass"].loaded_from = "#{dir}/specifications/compass-0.8.17.gemspec"
-
-  def self.add_specs_to_loaded_specs
-    Gem.loaded_specs.merge! @bundled_specs
-  end
-
-  def self.add_specs_to_index
-    @bundled_specs.each do |name, spec|
-      Gem.source_index.add_spec spec
-    end
-  end
-
-  add_specs_to_loaded_specs
-  add_specs_to_index
 
   def self.require_env(env = nil)
     context = Class.new do
@@ -195,11 +123,36 @@ module Bundler
   end
 end
 
-module Gem
+$" << "rubygems.rb"
-  @loaded_stacks = Hash.new { |h,k| h[k] = [] }
 
-  def source_index.refresh!
+module Kernel
-    super
+  def gem(*)
-    Bundler.add_specs_to_index
+    # Silently ignore calls to gem, since, in theory, everything
+    # is activated correctly already.
   end
 end
+
+# Define all the Gem errors for gems that reference them.
+module Gem
+  def self.ruby ; "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby" ; end
+  class LoadError < ::LoadError; end
+  class Exception < RuntimeError; end
+  class CommandLineError < Exception; end
+  class DependencyError < Exception; end
+  class DependencyRemovalException < Exception; end
+  class GemNotInHomeException < Exception ; end
+  class DocumentError < Exception; end
+  class EndOfYAMLException < Exception; end
+  class FilePermissionError < Exception; end
+  class FormatException < Exception; end
+  class GemNotFoundException < Exception; end
+  class InstallError < Exception; end
+  class InvalidSpecificationException < Exception; end
+  class OperationNotSupportedError < Exception; end
+  class RemoteError < Exception; end
+  class RemoteInstallationCancelled < Exception; end
+  class RemoteInstallationSkipped < Exception; end
+  class RemoteSourceException < Exception; end
+  class VerificationError < Exception; end
+  class SystemExitException < SystemExit; end
+end

vendor/gems/gems/rack-test-0.5.2/History.txt

@@ -1,3 +1,10 @@
+== 0.5.2 / 2009-11-13
+
+* Bug fixes
+
+  * Call close on response body after iteration, not before (Simon Rozet)
+  * Add missing require for time in cookie_jar.rb (Jerry West)
+
 == 0.5.1 / 2009-10-27
 
 * Bug fixes

vendor/gems/gems/rack-test-0.5.2/lib/rack/mock_session.rb

@@ -28,9 +28,10 @@ module Rack
       env["HTTP_COOKIE"] ||= cookie_jar.for(uri)
       @last_request = Rack::Request.new(env)
       status, headers, body = @app.call(@last_request.env)
-      body.close if body.respond_to?(:close)
 
       @last_response = MockResponse.new(status, headers, body, env["rack.errors"].flush)
+      body.close if body.respond_to?(:close)
+
       cookie_jar.merge(last_response.headers["Set-Cookie"], uri)
 
       @after_request.each { |hook| hook.call }

vendor/gems/gems/rack-test-0.5.2/lib/rack/test.rb

@@ -9,7 +9,7 @@ require "rack/test/uploaded_file"
 
 module Rack
   module Test
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
 
     DEFAULT_HOST = "example.org"
     MULTIPART_BOUNDARY = "----------XnJLe9ZIbbGUYtzPQJ16u1"

vendor/gems/gems/rack-test-0.5.2/lib/rack/test/cookie_jar.rb

@@ -1,4 +1,5 @@
 require "uri"
+require "time"
 
 module Rack
   module Test

vendor/gems/gems/rack-test-0.5.2/rack-test.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-test}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2009-11-13}
   s.description = %q{Rack::Test is a small, simple testing API for Rack apps. It can be used on its
 own or as a reusable starting point for Web frameworks and testing libraries
 to build on. Most of its initial functionality is an extraction of Merb 1.0's

vendor/gems/gems/rack-test-0.5.2/spec/rack/test_spec.rb

@@ -106,13 +106,43 @@ describe Rack::Test::Session do
       last_request.env["rack.input"].read.should == "foo[bar]=1"
     end
 
+    context "when the response body responds_to?(:close)" do
+      class CloseableBody
+        def initialize
+          @closed = false
+        end
+
+        def each
+          return if @closed
+          yield "Hello, World!"
+        end
+
+        def close
+          @closed = true
+        end
+      end
+
       it "closes response's body" do
-      body = "Hello, World!"
+        body = CloseableBody.new
         body.should_receive(:close)
-      app = lambda {|env| 
+
+        app = lambda do |env|
           [200, {"Content-Type" => "text/html", "Content-Length" => "13"}, body]
-      }
+        end
-      Rack::Test::Session.new(Rack::MockSession.new(app)).request("/")
+
+        session = Rack::Test::Session.new(Rack::MockSession.new(app))
+        session.request("/")
+      end
+
+      it "closes response's body after iteration" do
+        app = lambda do |env|
+          [200, {"Content-Type" => "text/html", "Content-Length" => "13"}, CloseableBody.new]
+        end
+
+        session = Rack::Test::Session.new(Rack::MockSession.new(app))
+        session.request("/")
+        session.last_response.body.should == "Hello, World!"
+      end
     end
 
     context "when input is given" do

vendor/gems/specifications/rack-test-0.5.2.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-test}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bryan Helmkamp"]
-  s.date = %q{2009-10-26}
+  s.date = %q{2009-11-12}
   s.description = %q{Rack::Test is a small, simple testing API for Rack apps. It can be used on its
 own or as a reusable starting point for Web frameworks and testing libraries
 to build on. Most of its initial functionality is an extraction of Merb 1.0's