From ef66567984780b2ce8daa155c367bcf7e049ab77 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Mon, 27 Dec 2010 23:25:12 +0000
Subject: coolio*: favor Coolio over Rev

We still use and define Rev internally, but that's
mostly just manual labor of converting stuff over.
---
 lib/rainbows/coolio_support.rb | 10 ++++++++++
 lib/rainbows/fiber/rev.rb      |  7 +------
 lib/rainbows/rev.rb            | 10 +---------
 3 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 lib/rainbows/coolio_support.rb

(limited to 'lib/rainbows')

diff --git a/lib/rainbows/coolio_support.rb b/lib/rainbows/coolio_support.rb
new file mode 100644
index 0000000..d345395
--- /dev/null
+++ b/lib/rainbows/coolio_support.rb
@@ -0,0 +1,10 @@
+# -*- encoding: binary -*-
+# :enddoc:
+begin
+  require "coolio"
+  Coolio::VERSION >= "1.0.0" or abort "cool.io >= 1.0.0 is required"
+  Rev = Coolio
+rescue LoadError
+  require "rev"
+  Rev::VERSION >= "0.3.0" or abort "rev >= 0.3.0 is required"
+end
diff --git a/lib/rainbows/fiber/rev.rb b/lib/rainbows/fiber/rev.rb
index cf70367..00e439e 100644
--- a/lib/rainbows/fiber/rev.rb
+++ b/lib/rainbows/fiber/rev.rb
@@ -1,11 +1,6 @@
 # -*- encoding: binary -*-
 # :enddoc:
-begin
-  require 'coolio'
-rescue LoadError
-  require 'rev'
-end
-require 'rev' if defined?(Coolio)
+require 'rainbows/coolio_support'
 require 'rainbows/fiber'
 require 'rainbows/fiber/io'
 
diff --git a/lib/rainbows/rev.rb b/lib/rainbows/rev.rb
index 1e425fe..16d00aa 100644
--- a/lib/rainbows/rev.rb
+++ b/lib/rainbows/rev.rb
@@ -1,13 +1,5 @@
 # -*- encoding: binary -*-
-begin
-  require 'coolio'
-  Coolio::VERSION >= '1.0.0' or abort 'cool.io >= 1.0.0 is required'
-rescue LoadError
-  require 'rev'
-  Rev::VERSION >= '0.3.0' or abort 'rev >= 0.3.0 is required'
-end
-require 'rev' if defined?(Coolio)
-
+require 'rainbows/coolio_support'
 # Coolio is the new version of this, use that instead.
 #
 # Implements a basic single-threaded event model with
-- 
cgit v1.2.3-24-ge0c7