Update Vendored Rack to 1.2.0

Also update tests for itextomml 1.3.25.

vendor/plugins/rack/Rakefile

@@ -1,16 +1,13 @@
 # Rakefile for Rack.  -*-ruby-*-
 require 'rake/rdoctask'
-require 'rake/testtask'
-
 
 desc "Run all the tests"
 task :default => [:test]
 
 desc "Make an archive as .tar.gz"
 task :dist => [:chmod, :changelog, :rdoc, "SPEC"] do
-  FileUtils.touch("RDOX")
   sh "git archive --format=tar --prefix=#{release}/ HEAD^{tree} >#{release}.tar"
-  sh "pax -waf #{release}.tar -s ':^:#{release}/:' RDOX SPEC ChangeLog doc rack.gemspec"
+  sh "pax -waf #{release}.tar -s ':^:#{release}/:' SPEC ChangeLog doc rack.gemspec"
   sh "gzip -f -9 #{release}.tar"
 end
 
@@ -23,19 +20,19 @@ task :officialrelease do
   sh "mv stage/#{release}.tar.gz stage/#{release}.gem ."
 end
 
-task :officialrelease_really => [:fulltest, "RDOX", "SPEC", :dist, :gem] do
+task :officialrelease_really => ["SPEC", :dist, :gem] do
   sh "sha1sum #{release}.tar.gz #{release}.gem"
 end
 
 def release
   require File.dirname(__FILE__) + "/lib/rack"
-  "rack-#{Rack.release}"
+  "rack-#{Rack.release}.0"
 end
 
 desc "Make binaries executable"
 task :chmod do
   Dir["bin/*"].each { |binary| File.chmod(0775, binary) }
-  Dir["test/cgi/test*"].each { |binary| File.chmod(0775, binary) }
+  Dir["spec/cgi/spec*"].each { |binary| File.chmod(0775, binary) }
 end
 
 desc "Generate a ChangeLog"
@@ -57,11 +54,6 @@ task :changelog do
 end
 
 
-desc "Generate RDox"
-task "RDOX" do
-  sh "specrb -Ilib:test -a --rdox >RDOX"
-end
-
 desc "Generate Rack Specification"
 task "SPEC" do
   File.open("SPEC", "wb") { |file|
@@ -75,24 +67,29 @@ end
 
 desc "Run all the fast tests"
 task :test do
-  sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS'] || '-t "^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)"'}"
+  opts     = ENV['TEST'] || '-a'
+  specopts = ENV['TESTOPTS'] ||
+    "-q -t '^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|rackup)'"
+
+  sh "bacon -I./lib:./spec -w #{opts} #{specopts}"
 end
 
 desc "Run all the tests"
 task :fulltest => [:chmod] do
-  sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS']}"
+  opts     = ENV['TEST'] || '-a'
+  specopts = ENV['TESTOPTS'] || '-q'
+  sh "bacon -I./lib:./spec -w #{opts} #{specopts}"
 end
 
 task :gem => ["SPEC"] do
-  FileUtils.touch("RDOX")
   sh "gem build rack.gemspec"
 end
 
 desc "Generate RDoc documentation"
-task :rdoc do
+task :rdoc => ["SPEC"] do
   sh(*%w{rdoc --line-numbers --main README
               --title 'Rack\ Documentation' --charset utf-8 -U -o doc} +
-              %w{README KNOWN-ISSUES SPEC RDOX} +
+              %w{README KNOWN-ISSUES SPEC} +
               Dir["lib/**/*.rb"])
 end