From 62fc74fb1234cba1b2c1db3014849584f52be040 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Mon, 27 Jun 2011 09:46:23 +0000
Subject: resync with Rainbows! 4.0.0

There are some internal changes in Unicorn and Rainbows! 4.x
---
 lib/zbatery.rb    | 5 +++--
 t/test_isolate.rb | 6 +++---
 zbatery.gemspec   | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/zbatery.rb b/lib/zbatery.rb
index f038f63..48cf63e 100644
--- a/lib/zbatery.rb
+++ b/lib/zbatery.rb
@@ -33,7 +33,7 @@ module Rainbows
       after_fork.call(self, worker)
       worker.user(*user) if user.kind_of?(Array) && ! worker.switched
       build_app! unless preload_app
-      Rainbows::Response.setup(self.class)
+      Rainbows::Response.setup
       Rainbows::MaxBody.setup
       Rainbows::ProcessClient.const_set(:APP, @app)
 
@@ -72,6 +72,7 @@ module Rainbows
 
     # no-op
     def maintain_worker_count; end
+    def spawn_missing_workers; end
     def init_self_pipe!; end
 
     # can't just do a graceful exit if reopening logs fails, so we just
@@ -107,7 +108,7 @@ module Rainbows
         self.ready_pipe = nil
       end
       extend(Rainbows.const_get(@use))
-      worker = Worker.new(0, DeadIO.new)
+      worker = Worker.new(0)
       before_fork.call(self, worker)
       worker_loop(worker) # runs forever
     end
diff --git a/t/test_isolate.rb b/t/test_isolate.rb
index dd79a58..9515598 100644
--- a/t/test_isolate.rb
+++ b/t/test_isolate.rb
@@ -14,8 +14,8 @@ old_out = $stdout.dup
 $stdout.reopen($stderr)
 
 Isolate.now!(opts) do
-  gem 'rainbows', '3.4.0'
-  gem 'raindrops', '0.6.1'
+  gem 'rainbows', '4.0.0'
+  gem 'raindrops', '0.7.0'
 
   if engine == "ruby"
     gem 'sendfile', '1.1.0' # next Rubinius should support this
@@ -34,7 +34,7 @@ Isolate.now!(opts) do
   end
 
   if RUBY_PLATFORM =~ /linux/
-    gem 'sleepy_penguin', '3.0.0'
+    gem 'sleepy_penguin', '3.0.1'
 
     # is 2.6.32 new enough?
     gem 'io_splice', '4.1.1' if `uname -r`.strip > '2.6.32'
diff --git a/zbatery.gemspec b/zbatery.gemspec
index de26057..32337b2 100644
--- a/zbatery.gemspec
+++ b/zbatery.gemspec
@@ -32,9 +32,9 @@ Gem::Specification.new do |s|
   #   espace-neverblock + eventmachine
   #   async_sinatra + sinatra + eventmachine
   #
-  s.add_dependency(%q<rainbows>, ["~> 3.4.0"])
+  s.add_dependency(%q<rainbows>, ["~> 4.0"])
   s.add_development_dependency(%q<wrongdoc>, "~> 1.5")
-  s.add_development_dependency(%q<isolate>, "~> 3.0.0")
+  s.add_development_dependency(%q<isolate>, "~> 3.1")
 
   # s.licenses = %w(GPLv2 Ruby) # accessor not compatible with older RubyGems
 end
-- 
cgit v1.2.3-24-ge0c7