Put redis library in lib/vendor/ and adjust LOAD_PATHuse-redis-rb-client

19 files changed, 26 insertions, 34 deletions

diff --git a/.gitignore b/.gitignore
index 277c4b4..62e2cd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ coverage/
 .bundle
 tags
 .bundle/
-*.orig
diff --git a/.rubocop.yml b/.rubocop.yml
index ac0d91e..88bc7b2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -964,7 +964,7 @@ AllCops:
     - 'bin/**/*'
     - 'lib/backup/**/*'
     - 'lib/tasks/**/*'
-    - 'lib/vendor/**/*'
     - 'lib/email_validator.rb'
     - 'lib/gitlab/upgrader.rb'
     - 'lib/gitlab/seeder.rb'
+    - 'lib/vendor/**/*'
diff --git a/Makefile b/Makefile
index 17ff653..2a78178 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,12 @@
 REDIS_RB_VERSION=v3.3.0
-REDIS_RB_TMP_DIR := $(shell mktemp -d)
-REDIS_RB_VENDOR_DIR=lib/vendor
+REDIS_RB_VENDOR_DIR=lib/vendor/redis
 PWD=`pwd`
 
 all:
 
 update-redis:
-	git clone https://github.com/redis/redis-rb.git $(REDIS_RB_TMP_DIR)
-	cd $(REDIS_RB_TMP_DIR); git checkout $(REDIS_RB_VERSION)
-	cd $(PWD)
-	mkdir -p $(REDIS_RB_VENDOR_DIR)
-	cp -r $(REDIS_RB_TMP_DIR)/lib/* $(REDIS_RB_VENDOR_DIR)
-	# Adjust all 'require redis/' paths to relative paths
-	sed -i.orig -e 's/require "redis/require_relative "redis/g' $(REDIS_RB_VENDOR_DIR)/redis.rb
-	find $(REDIS_RB_VENDOR_DIR)/redis -name \*.rb -maxdepth 1 -exec sed -i.orig -e "s/require \"redis\//require_relative \"/g" {} \;
-	find $(REDIS_RB_VENDOR_DIR)/redis/connection -name \*.rb -maxdepth 1 -exec sed -i.orig -e 's/require "redis\/connection\//require_relative "/g' *.rb {} \;
-	find $(REDIS_RB_VENDOR_DIR)/redis/connection -name \*.rb -maxdepth 1 -exec sed -i.orig -e 's/require "redis\//require_relative "..\//g' *.rb {} \;
+	rm -rf $(REDIS_RB_VENDOR_DIR)
+	git clone -b $(REDIS_RB_VERSION) https://github.com/redis/redis-rb.git $(REDIS_RB_VENDOR_DIR)
+	rm -rf $(REDIS_RB_VENDOR_DIR)/.git
 
 .PHONY=update-redis
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index ebf72d6..690c40e 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -1,3 +1,4 @@
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
 require 'yaml'
 
 class GitlabConfig
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index e9f8ffd..8e1fe39 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -1,12 +1,12 @@
 require 'net/http'
 require 'openssl'
 require 'json'
+require 'redis'
 
 require_relative 'gitlab_config'
 require_relative 'gitlab_logger'
 require_relative 'gitlab_access'
 require_relative 'httpunix'
-require_relative 'vendor/redis'
 
 class GitlabNet
   class ApiUnreachableError < StandardError; end
diff --git a/lib/vendor/redis.rb b/lib/vendor/redis/lib/redis.rb
index c4fae37..62dcab7 100644
--- a/lib/vendor/redis.rb
+++ b/lib/vendor/redis/lib/redis.rb
@@ -1,5 +1,5 @@
 require "monitor"
-require_relative "redis/errors"
+require "redis/errors"
 
 class Redis
 
@@ -2766,8 +2766,8 @@ private
 
 end
 
-require_relative "redis/version"
-require_relative "redis/connection"
-require_relative "redis/client"
-require_relative "redis/pipeline"
-require_relative "redis/subscribe"
+require "redis/version"
+require "redis/connection"
+require "redis/client"
+require "redis/pipeline"
+require "redis/subscribe"
diff --git a/lib/vendor/redis/client.rb b/lib/vendor/redis/lib/redis/client.rb
index 4a5691d..c867f63 100644
--- a/lib/vendor/redis/client.rb
+++ b/lib/vendor/redis/lib/redis/client.rb
@@ -1,4 +1,4 @@
-require_relative "errors"
+require "redis/errors"
 require "socket"
 require "cgi"
 
@@ -478,7 +478,7 @@ class Redis
 
       if driver.kind_of?(String)
         begin
-          require_relative "connection/#{driver}"
+          require "redis/connection/#{driver}"
           driver = Connection.const_get(driver.capitalize)
         rescue LoadError, NameError
           raise RuntimeError, "Cannot load driver #{driver.inspect}"
diff --git a/lib/vendor/redis/connection.rb b/lib/vendor/redis/lib/redis/connection.rb
index d8a51b3..badff22 100644
--- a/lib/vendor/redis/connection.rb
+++ b/lib/vendor/redis/lib/redis/connection.rb
@@ -1,4 +1,4 @@
-require_relative "connection/registry"
+require "redis/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
@@ -6,4 +6,4 @@ require_relative "connection/registry"
 # 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_relative "connection/ruby" if Redis::Connection.drivers.empty?
+require "redis/connection/ruby" if Redis::Connection.drivers.empty?
\ No newline at end of file
diff --git a/lib/vendor/redis/connection/command_helper.rb b/lib/vendor/redis/lib/redis/connection/command_helper.rb
index 74e89dc..74e89dc 100644
--- a/lib/vendor/redis/connection/command_helper.rb
+++ b/lib/vendor/redis/lib/redis/connection/command_helper.rb
diff --git a/lib/vendor/redis/connection/hiredis.rb b/lib/vendor/redis/lib/redis/connection/hiredis.rb
index f7baf31..f4056d3 100644
--- a/lib/vendor/redis/connection/hiredis.rb
+++ b/lib/vendor/redis/lib/redis/connection/hiredis.rb
@@ -1,5 +1,5 @@
-require_relative "registry"
-require_relative "../errors"
+require "redis/connection/registry"
+require "redis/errors"
 require "hiredis/connection"
 require "timeout"
 
diff --git a/lib/vendor/redis/connection/registry.rb b/lib/vendor/redis/lib/redis/connection/registry.rb
index 69ca63d..69ca63d 100644
--- a/lib/vendor/redis/connection/registry.rb
+++ b/lib/vendor/redis/lib/redis/connection/registry.rb
diff --git a/lib/vendor/redis/connection/ruby.rb b/lib/vendor/redis/lib/redis/connection/ruby.rb
index 7aa2808..e3cf002 100644
--- a/lib/vendor/redis/connection/ruby.rb
+++ b/lib/vendor/redis/lib/redis/connection/ruby.rb
@@ -1,6 +1,6 @@
-require_relative "registry"
-require_relative "command_helper"
-require_relative "../errors"
+require "redis/connection/registry"
+require "redis/connection/command_helper"
+require "redis/errors"
 require "socket"
 require "timeout"
 
diff --git a/lib/vendor/redis/connection/synchrony.rb b/lib/vendor/redis/lib/redis/connection/synchrony.rb
index c8b3dab..9f0b67c 100644
--- a/lib/vendor/redis/connection/synchrony.rb
+++ b/lib/vendor/redis/lib/redis/connection/synchrony.rb
@@ -1,6 +1,6 @@
-require_relative "command_helper"
-require_relative "registry"
-require_relative "../errors"
+require "redis/connection/command_helper"
+require "redis/connection/registry"
+require "redis/errors"
 require "em-synchrony"
 require "hiredis/reader"
 
diff --git a/lib/vendor/redis/distributed.rb b/lib/vendor/redis/lib/redis/distributed.rb
index 774c754..4bda232 100644
--- a/lib/vendor/redis/distributed.rb
+++ b/lib/vendor/redis/lib/redis/distributed.rb
@@ -1,4 +1,4 @@
-require_relative "hash_ring"
+require "redis/hash_ring"
 
 class Redis
   class Distributed
diff --git a/lib/vendor/redis/errors.rb b/lib/vendor/redis/lib/redis/errors.rb
index 85b222e..85b222e 100644
--- a/lib/vendor/redis/errors.rb
+++ b/lib/vendor/redis/lib/redis/errors.rb
diff --git a/lib/vendor/redis/hash_ring.rb b/lib/vendor/redis/lib/redis/hash_ring.rb
index 2a199bd..2a199bd 100644
--- a/lib/vendor/redis/hash_ring.rb
+++ b/lib/vendor/redis/lib/redis/hash_ring.rb
diff --git a/lib/vendor/redis/pipeline.rb b/lib/vendor/redis/lib/redis/pipeline.rb
index a77f86d..a77f86d 100644
--- a/lib/vendor/redis/pipeline.rb
+++ b/lib/vendor/redis/lib/redis/pipeline.rb
diff --git a/lib/vendor/redis/subscribe.rb b/lib/vendor/redis/lib/redis/subscribe.rb
index 3029d04..3029d04 100644
--- a/lib/vendor/redis/subscribe.rb
+++ b/lib/vendor/redis/lib/redis/subscribe.rb
diff --git a/lib/vendor/redis/version.rb b/lib/vendor/redis/lib/redis/version.rb
index 3f1fbc0..3f1fbc0 100644
--- a/lib/vendor/redis/version.rb
+++ b/lib/vendor/redis/lib/redis/version.rb