From e3a8072170de81f164d02cbfa59a3de18a63513e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 14 May 2014 20:06:37 +0000 Subject: update for Rainbows! compatibility Recent versions of Rainbows! and unicorn broke compatibility during shutdown. --- lib/zbatery.rb | 1 + t/test_isolate.rb | 15 ++++++++------- zbatery.gemspec | 4 ++-- 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, ["~> 4.3"]) - s.add_development_dependency(%q, "~> 1.6") + s.add_dependency(%q, ["~> 4.6"]) + s.add_development_dependency(%q, "~> 1.8") s.add_development_dependency(%q, "~> 3.1") s.licenses = %w(GPLv2+ Ruby) -- cgit v1.2.3-24-ge0c7