Detected race condition.

.rspec

@@ -1,4 +1,3 @@
 --color
 --format documentation
 --backtrace
---default_path spec

.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+
 rvm:
   - 1.9.3
   - 2.0.0
@@ -15,3 +17,6 @@ matrix:
 
 notifications:
   irc: "irc.freenode.org#celluloid"
+
+services:
+  - redis-server

Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'coveralls', require: false
-gem 'celluloid',    github: 'celluloid/celluloid'
-gem 'celluloid-io', github: 'celluloid/celluloid-io'
+gem 'celluloid',    github: 'celluloid/celluloid', submodules: true
+gem 'celluloid-io', github: 'celluloid/celluloid-io', submodules: true

celluloid-redis.gemspec

@@ -5,7 +5,7 @@ require 'celluloid/redis/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "celluloid-redis"
-  spec.version       = Celluloid::Redis::VERSION
+  spec.version       = CelluloidRedis::VERSION
   spec.authors       = ["Tony Arcieri"]
   spec.email         = ["[email protected]"]
   spec.description   = "Celluloid::IO support for the redis-rb library"

lib/celluloid/redis.rb

@@ -1,4 +1,25 @@
 require "redis"
 
 require "celluloid/redis/version"
-require "celluloid/redis/redis_ext"
+require "celluloid/io"
+
+module Celluloid
+  class Redis < ::Redis
+    VERSION = CelluloidRedis::VERSION
+
+    def initialize(*args)
+      super
+      if @options[:driver] == :celluloid
+        @latch = Celluloid::IO::Stream::Latch.new
+      end
+    end
+
+    def synchronize
+      if @latch
+        @latch.synchronize { yield @client }
+      else
+        super(&proc)
+      end
+    end
+  end
+end

lib/celluloid/redis/version.rb

@@ -1,5 +1,3 @@
-module Celluloid
-  module Redis
-    VERSION = "0.0.2"
-  end
+module CelluloidRedis
+  VERSION = "0.0.2"
 end

spec/redis/connection/celluloid_spec.rb

@@ -21,4 +21,40 @@
       expect { redis.shutdown }.not_to raise_error
     end
   end
+
+  describe "using inside Celluloid::IO" do
+    before do
+      class Incrementor
+        include Celluloid::IO
+
+        def initialize
+          @redis = Redis.new(:driver => :celluloid)
+        end
+
+        def increment!
+          sleep(rand / 10)
+          @redis.incr 'rabbits'
+        rescue
+          STDERR.puts "I cannot increment rabbits because of #{$!.inspect}!"
+          raise RuntimeError
+        end
+      end
+    end
+
+    let(:actor) {
+      Incrementor.new
+    }
+    let(:count) { 1000 }
+
+    it "just survives" do
+      redis = Redis.new
+      redis.set 'rabbits', 0
+
+      count.times do
+        actor.async.increment! rescue nil
+      end
+      sleep 10
+      expect(redis.get 'rabbits').to eq(count.to_s)
+    end
+  end
 end