Use require_relative.

Author: djanowski

lib/redis.rb

@@ -1,5 +1,5 @@
 require "monitor"
-require "redis/errors"
+require_relative "redis/errors"
 
 class Redis
 
@@ -2612,8 +2612,8 @@ def _subscription(method, channels, block)
 
 end
 
-require "redis/version"
-require "redis/connection"
-require "redis/client"
-require "redis/pipeline"
-require "redis/subscribe"
+require_relative "redis/version"
+require_relative "redis/connection"
+require_relative "redis/client"
+require_relative "redis/pipeline"
+require_relative "redis/subscribe"

lib/redis/client.rb

@@ -1,4 +1,4 @@
-require "redis/errors"
+require_relative "errors"
 require "socket"
 require "cgi"
 
@@ -517,11 +517,16 @@ def _parse_driver(driver)
 
       if driver.kind_of?(String)
         begin
-          require "redis/connection/#{driver}"
-          driver = Connection.const_get(driver.capitalize)
-        rescue LoadError, NameError
-          raise RuntimeError, "Cannot load driver #{driver.inspect}"
+          require_relative "connection/#{driver}"
+        rescue LoadError, NameError => e
+          begin
+            require "connection/#{driver}"
+          rescue LoadError, NameError => e
+            raise RuntimeError, "Cannot load driver #{driver.inspect}: #{e.message}"
+          end
         end
+
+        driver = Connection.const_get(driver.capitalize)
       end
 
       driver

lib/redis/connection.rb

@@ -1,9 +1,9 @@
-require "redis/connection/registry"
+require_relative "connection/registry"
 
 # If a connection driver was required before this file, the array
 # Redis::Connection.drivers will contain one or more classes. The last driver
 # in this array will be used as default driver. If this array is empty, we load
 # the plain Ruby driver as our default. Another driver can be required at a
 # later point in time, causing it to be the last element of the #drivers array
 # and therefore be chosen by default.
-require "redis/connection/ruby" if Redis::Connection.drivers.empty?
+require_relative "connection/ruby" if Redis::Connection.drivers.empty?

lib/redis/connection/ruby.rb

@@ -1,6 +1,6 @@
-require "redis/connection/registry"
-require "redis/connection/command_helper"
-require "redis/errors"
+require_relative "registry"
+require_relative "command_helper"
+require_relative "../errors"
 require "socket"
 
 class Redis

lib/redis/distributed.rb

@@ -1,4 +1,4 @@
-require "redis/hash_ring"
+require_relative "hash_ring"
 
 class Redis
   class Distributed

redis.gemspec

@@ -1,6 +1,4 @@
-$:.unshift File.expand_path("../lib", __FILE__)
-
-require "redis/version"
+require_relative "lib/redis/version"
 
 Gem::Specification.new do |s|
   s.name = "redis"

test/bitpos_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("helper", File.dirname(__FILE__))
+require_relative "helper"
 
 unless defined?(Enumerator)
   Enumerator = Enumerable::Enumerator

test/blocking_commands_test.rb

@@ -1,5 +1,5 @@
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/blocking_commands"
+require_relative "helper"
+require_relative "lint/blocking_commands"
 
 class TestBlockingCommands < Test::Unit::TestCase
 

test/command_map_test.rb

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

test/commands_on_hashes_test.rb

@@ -1,5 +1,5 @@
-require File.expand_path("helper", File.dirname(__FILE__))
-require "lint/hashes"
+require_relative "helper"
+require_relative "lint/hashes"
 
 class TestCommandsOnHashes < Test::Unit::TestCase