From 604dc05809e14c41f148962cc7d6849a941f8e8f Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Mon, 16 May 2011 14:28:29 -0700
Subject: [PATCH] Zbatery 3.3.0 - another Rainbows! resync

Like Rainbows! 3.3.0, we've added the GPLv3 to our license
(in addition to GPLv2 and Ruby terms).  See Rainbows! 3.3.0
release notes and news for more infor on changes:

http://rainbows.rubyforge.org/NEWS.html
---
 lib/zbatery.rb    |  4 ++--
 t/GNUmakefile     |  6 ++++++
 t/test_isolate.rb | 19 ++++++++++++-------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/lib/zbatery.rb b/lib/zbatery.rb
index b81ad23..07566fa 100644
--- a/lib/zbatery.rb
+++ b/lib/zbatery.rb
@@ -1,10 +1,10 @@
 # -*- encoding: binary -*-
 # :enddoc:
 require 'rainbows'
-
+Rainbows.forked = true
 module Zbatery
 
-  VERSION = "3.1.0"
+  VERSION = "3.3.0"
 
   class << self
 
diff --git a/t/GNUmakefile b/t/GNUmakefile
index 598437b..0035d9a 100644
--- a/t/GNUmakefile
+++ b/t/GNUmakefile
@@ -19,6 +19,12 @@ endif
 RUBY_ENGINE := $(shell $(RUBY) -e 'puts((RUBY_ENGINE rescue "ruby"))')
 export RUBY_VERSION RUBY_ENGINE
 
+ifeq (Linux,$(shell uname -s))
+  models += XEpoll
+  models += XEpollThreadSpawn
+  models += XEpollThreadPool
+  models += Epoll
+endif
 models += WriterThreadPool
 models += WriterThreadSpawn
 models += ThreadPool
diff --git a/t/test_isolate.rb b/t/test_isolate.rb
index 8e7e8f7..516752d 100644
--- a/t/test_isolate.rb
+++ b/t/test_isolate.rb
@@ -14,26 +14,31 @@ old_out = $stdout.dup
 $stdout.reopen($stderr)
 
 Isolate.now!(opts) do
-  gem 'rainbows', '3.1.0'
+  gem 'rainbows', '3.3.0'
+  gem 'raindrops', '0.6.1'
 
   if engine == "ruby"
-    gem 'sendfile', '1.0.0' # next Rubinius should support this
-
-    gem 'iobuffer', '0.1.3'
+    gem 'sendfile', '1.1.0' # next Rubinius should support this
     gem 'cool.io', '1.0.0'
 
     gem 'eventmachine', '0.12.10'
-    gem 'sinatra', '1.0.0'
-    gem 'async_sinatra', '0.2.1'
+    gem 'sinatra', '1.2.0'
+    gem 'async_sinatra', '0.5.0'
 
     gem 'neverblock', '0.1.6.2'
   end
 
   if defined?(::Fiber) && engine == "ruby"
-    gem 'case', '0.5'
     gem 'revactor', '0.1.5'
     gem 'rack-fiber_pool', '0.9.0'
   end
+
+  if RUBY_PLATFORM =~ /linux/
+    gem 'sleepy_penguin', '2.0.0'
+
+    # is 2.6.32 new enough?
+    gem 'io_splice', '4.1.0' if `uname -r`.strip > '2.6.32'
+  end
 end
 
 $stdout.reopen(old_out)
-- 
2.11.4.GIT