A bit of refactoring and address issue #17

.rspec

@@ -1,4 +1,5 @@
 --color
 --format documentation
 --backtrace
---default_path spec
+--tty
+--require spec_helper

.travis.yml

@@ -1,17 +1,24 @@
+language: ruby
+bundler_args: --jobs=3 --retry=3
+cache: bundler
+sudo: false
+
+services:
+  - redis-server
+
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.4
+  - 2.2.2
   - ruby-head
-  - jruby-19mode
-  - rbx-19mode
-  - jruby-head
+  - jruby
+  - rbx-2
 
 matrix:
   allow_failures:
-    - rvm: 2.0.0
     - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: rbx-19mode
+    - rvm: jruby
+    - rvm: rbx-2
 
 notifications:
   irc: "irc.freenode.org#celluloid"

Gemfile

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

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       = CELLULOID_REDIS_VERSION
   spec.authors       = ["Tony Arcieri"]
   spec.email         = ["[email protected]"]
   spec.description   = "Celluloid::IO support for the redis-rb library"
@@ -18,11 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "redis"
-  spec.add_runtime_dependency "celluloid-io", ">= 0.13.0.pre"
+  spec.add_runtime_dependency "redis",          "~> 3.2"
+  spec.add_runtime_dependency "celluloid-io",   "~> 0.16"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "rake",       "~> 10.4"
+  spec.add_development_dependency "rspec",      "~> 3.0"
 end

lib/celluloid/redis.rb

@@ -1,4 +1,3 @@
 require "redis"
 
 require "celluloid/redis/version"
-require "celluloid/redis/redis_ext"

lib/celluloid/redis/version.rb

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

spec/redis/connection/celluloid_spec.rb

@@ -1,6 +1,4 @@
-require "spec_helper"
-
-describe Redis::Connection::Celluloid do
+RSpec.describe Redis::Connection::Celluloid do
   let(:example_key)   { 'foobar' }
   let(:example_value) { 'baz' }
 
@@ -9,10 +7,10 @@
 
     # FIXME: perhaps some better tests are in order here?
     redis.set(example_key, '')
-    redis.get(example_key).should eq ''
+    expect(redis.get(example_key)).to eq('')
 
     redis.set(example_key, example_value)
-    redis.get(example_key).should eq example_value
+    expect(redis.get(example_key)).to eq(example_value)
   end
 
   it "cleanly shuts down an instance" do

spec/spec_helper.rb

@@ -1,9 +1,15 @@
 require "celluloid/redis"
-require "redis/connection/celluloid"
+
 require "redis_instance"
 require "coveralls"
 Coveralls.wear!
 
+RSpec.configure(&:disable_monkey_patching!)
+
+# Trick to test new redis-rb connection driver
+# that must load redis/connection/celluloid
+Redis.new(driver: :celluloid)
+
 def with_new_instance(opts = {})
   begin
     instance = RedisInstance.new(opts)