Merge pull request celluloid#48 from Asmod4n/patch-1

Use celluloid-redis by default
vgololobov · Jul 6, 2013 · 66d9af4 · 66d9af4
2 parents 2257aa2 + faca202
commit 66d9af4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,10 @@
 source "http://rubygems.org"
 
-gem 'celluloid',     github: 'celluloid/celluloid',     branch: 'master'
+gem 'celluloid',        github: 'celluloid/celluloid',        branch: 'master'
-gem 'celluloid-io',  github: 'celluloid/celluloid-io',  branch: 'master'
+gem 'celluloid-io',     github: 'celluloid/celluloid-io',     branch: 'master'
-gem 'celluloid-zmq', github: 'celluloid/celluloid-zmq', branch: 'master'
+gem 'celluloid-zmq',    github: 'celluloid/celluloid-zmq',    branch: 'master'
-gem 'reel',          github: 'celluloid/reel',          branch: 'master'
+gem 'celluloid-redis',  github: 'celluloid/celluloid-redis',  branch: 'master'
+gem 'reel',             github: 'celluloid/reel',             branch: 'master'
 
 #gem 'ffi-rzmq', github: 'chuckremes/ffi-rzmq'
 

diff --git a/dcell.gemspec b/dcell.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "celluloid",     ">= 0.13.0"
   gem.add_runtime_dependency "celluloid-zmq", ">= 0.13.0"
   gem.add_runtime_dependency "reel"
-  gem.add_runtime_dependency "redis"
+  gem.add_runtime_dependency "celluloid-redis"
   gem.add_runtime_dependency "redis-namespace"
 
   gem.add_development_dependency "rake"

diff --git a/lib/dcell/registries/redis_adapter.rb b/lib/dcell/registries/redis_adapter.rb
@@ -1,4 +1,5 @@
-require 'redis'
+require 'celluloid/redis'
+require 'redis/connection/celluloid'
 require 'redis-namespace'
 
 module DCell