Fix up requires and confusing environment variable names.

Author: djanowski

.travis.yml

@@ -18,13 +18,13 @@ env:
     - VERBOSE=true
     - TIMEOUT=1
   matrix:
-    - conn=ruby      REDIS_BRANCH=3.0
-    - conn=ruby      REDIS_BRANCH=3.2
-    - conn=hiredis   REDIS_BRANCH=3.0
-    - conn=hiredis   REDIS_BRANCH=3.2
-    - conn=synchrony REDIS_BRANCH=3.0
-    - conn=synchrony REDIS_BRANCH=3.2
-    - conn=ruby      REDIS_BRANCH=unstable
+    - DRIVER=ruby      REDIS_BRANCH=3.0
+    - DRIVER=ruby      REDIS_BRANCH=3.2
+    - DRIVER=hiredis   REDIS_BRANCH=3.0
+    - DRIVER=hiredis   REDIS_BRANCH=3.2
+    - DRIVER=synchrony REDIS_BRANCH=3.0
+    - DRIVER=synchrony REDIS_BRANCH=3.2
+    - DRIVER=ruby      REDIS_BRANCH=unstable
 
 branches:
   only:
@@ -35,30 +35,30 @@ matrix:
     # hiredis
     - rvm: jruby-9
       gemfile: .travis/Gemfile
-      env: conn=hiredis REDIS_BRANCH=3.0
+      env: DRIVER=hiredis REDIS_BRANCH=3.0
     - rvm: jruby-9
       gemfile: .travis/Gemfile
-      env: conn=hiredis REDIS_BRANCH=3.2
+      env: DRIVER=hiredis REDIS_BRANCH=3.2
     - rvm: jruby-9
       gemfile: .travis/Gemfile
-      env: conn=hiredis REDIS_BRANCH=3.0
+      env: DRIVER=hiredis REDIS_BRANCH=3.0
     - rvm: jruby-9
       gemfile: .travis/Gemfile
-      env: conn=hiredis REDIS_BRANCH=3.2
+      env: DRIVER=hiredis REDIS_BRANCH=3.2
 
     # synchrony
     - rvm: jruby-9
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=3.0
+      env: DRIVER=synchrony REDIS_BRANCH=3.0
     - rvm: jruby-9
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=3.2
+      env: DRIVER=synchrony REDIS_BRANCH=3.2
     - rvm: jruby-9
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=3.0
+      env: DRIVER=synchrony REDIS_BRANCH=3.0
     - rvm: jruby-9
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=3.2
+      env: DRIVER=synchrony REDIS_BRANCH=3.2
   allow_failures:
     - rvm: rbx-3
 

redis.gemspec

@@ -35,4 +35,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   s.add_development_dependency("test-unit", "3.1.5")
+  s.add_development_dependency("hiredis")
+  s.add_development_dependency("em-synchrony")
 end

test/client_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class TestClient < Test::Unit::TestCase
 

test/helper.rb

@@ -4,13 +4,13 @@
 
 $VERBOSE = true
 
-ENV["conn"] ||= "ruby"
+ENV["DRIVER"] ||= "ruby"
 
 require_relative "../lib/redis"
-require_relative "../lib/redis/connection/#{ENV["conn"]}"
+require_relative "../lib/redis/connection/#{ENV["DRIVER"]}"
 
 require_relative "support/redis_mock"
-require_relative "support/connection/#{ENV["conn"]}"
+require_relative "support/connection/#{ENV["DRIVER"]}"
 
 PORT    = 6381
 OPTIONS = {:port => PORT, :db => 15, :timeout => Float(ENV["TIMEOUT"] || 0.1)}
@@ -45,7 +45,7 @@ def init(redis)
 end
 
 def driver(*drivers, &blk)
-  if drivers.map(&:to_s).include?(ENV["conn"])
+  if drivers.map(&:to_s).include?(ENV["DRIVER"])
     class_eval(&blk)
   end
 end
@@ -172,7 +172,7 @@ def _format_options(options)
     end
 
     def _new_client(options = {})
-      Redis.new(_format_options(options).merge(:driver => ENV["conn"]))
+      Redis.new(_format_options(options).merge(:driver => ENV["DRIVER"]))
     end
   end
 

test/sentinel_command_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class SentinelCommandsTest < Test::Unit::TestCase
 

test/ssl_test.rb

@@ -1,6 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class SslTest < Test::Unit::TestCase
 

test/support/connection/hiredis.rb

@@ -1 +1 @@
-require "support/wire/thread"
+require_relative "../wire/thread"

test/support/connection/synchrony.rb

@@ -1,4 +1,4 @@
-require "support/wire/synchrony"
+require_relative "../wire/synchrony"
 
 module Helper
   def around

test/synchrony_driver.rb

@@ -1,11 +1,10 @@
-require 'em-synchrony'
-require 'em-synchrony/connection_pool'
+require "em-synchrony"
+require "em-synchrony/connection_pool"
 
-require 'redis'
-require 'redis/connection/synchrony'
+require_relative "../lib/redis"
+require_relative "../lib/redis/connection/synchrony"
 
-
-require_relative "./helper"
+require_relative "helper"
 
 PORT    = 6381
 OPTIONS = {:port => PORT, :db => 15}