about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2014-05-14 20:06:37 +0000
committerEric Wong <normalperson@yhbt.net>2014-05-14 20:06:37 +0000
commite3a8072170de81f164d02cbfa59a3de18a63513e (patch)
tree240420e843015988a8a5db1b04f3121eaff5a658
parent262ad7228ad146749d8337a682e8486d38df76c2 (diff)
downloadzbatery-e3a8072170de81f164d02cbfa59a3de18a63513e.tar.gz
update for Rainbows! compatibility
Recent versions of Rainbows! and unicorn broke compatibility
during shutdown.
-rw-r--r--lib/zbatery.rb1
-rw-r--r--t/test_isolate.rb15
-rw-r--r--zbatery.gemspec4
3 files changed, 11 insertions, 9 deletions
diff --git a/lib/zbatery.rb b/lib/zbatery.rb
index a4d20e0..62d1779 100644
--- a/lib/zbatery.rb
+++ b/lib/zbatery.rb
@@ -17,6 +17,7 @@ end
 # :stopdoc:
 # override stuff we don't need or can't use portably
 module Rainbows
+  @readers = [] # rainbows 4.6.x compatibility
 
   module Base
     # master == worker in our case
diff --git a/t/test_isolate.rb b/t/test_isolate.rb
index 750834c..9d3492b 100644
--- a/t/test_isolate.rb
+++ b/t/test_isolate.rb
@@ -14,16 +14,17 @@ old_out = $stdout.dup
 $stdout.reopen($stderr)
 
 Isolate.now!(opts) do
-  gem 'kgio', '2.6.0'
-  gem 'kcar', '0.3.0'
-  gem 'rainbows', '4.3.0'
-  gem 'raindrops', '0.7.0'
+  gem 'kgio', '2.9.2'
+  gem 'kcar', '0.4.0'
+  gem 'rainbows', '4.6.2'
+  gem 'raindrops', '0.13.0'
+  gem 'rack', '1.5.2'
 
   if engine == "ruby"
     gem 'sendfile', '1.1.0'
     gem 'cool.io', '1.1.0'
 
-    gem 'eventmachine', '0.12.10'
+    gem 'eventmachine', '1.0.3'
     gem 'sinatra', '1.2.0'
     gem 'async_sinatra', '0.5.0'
 
@@ -36,10 +37,10 @@ Isolate.now!(opts) do
   end
 
   if RUBY_PLATFORM =~ /linux/
-    gem 'sleepy_penguin', '3.0.1'
+    gem 'sleepy_penguin', '3.3.0'
 
     # is 2.6.32 new enough?
-    gem 'io_splice', '4.1.1' if `uname -r`.strip > '2.6.32'
+    gem 'io_splice', '4.2.0' if `uname -r`.strip > '2.6.32'
   end
 end
 
diff --git a/zbatery.gemspec b/zbatery.gemspec
index 40e1b6d..80b6f62 100644
--- a/zbatery.gemspec
+++ b/zbatery.gemspec
@@ -30,8 +30,8 @@ Gem::Specification.new do |s|
   #   espace-neverblock + eventmachine
   #   async_sinatra + sinatra + eventmachine
   #
-  s.add_dependency(%q<rainbows>, ["~> 4.3"])
-  s.add_development_dependency(%q<wrongdoc>, "~> 1.6")
+  s.add_dependency(%q<rainbows>, ["~> 4.6"])
+  s.add_development_dependency(%q<wrongdoc>, "~> 1.8")
   s.add_development_dependency(%q<isolate>, "~> 3.1")
 
   s.licenses = %w(GPLv2+ Ruby)