Fix require issues when gem is packaged in JAR for JRuby use

acrosa · Nov 18, 2010 · 3eb0f55 · 3eb0f55
1 parent 816668f
commit 3eb0f55
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/MIT-LICENSE → LICENSE b/MIT-LICENSE → LICENSE
diff --git a/Rakefile b/Rakefile
@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 
 GEM = 'Voldemort Client'
 GEM_NAME = 'voldemort_client'
-GEM_VERSION = '0.1'
+GEM_VERSION = '0.1.4'
 AUTHORS = ['Alejandro Crosa']
 EMAIL = "alejandrocrosa@gmail.com"
 HOMEPAGE = "http://github.com/acrosa/Voldemort-Ruby-Client"

diff --git a/lib/connection/tcp_connection.rb b/lib/connection/tcp_connection.rb
@@ -1,7 +1,7 @@
 require 'socket'
 require 'timeout'
 
-require File.join(File.dirname(__FILE__), "..", "protos", "voldemort-client.pb")
+require 'protos/voldemort-client.pb'
 
 class TCPConnection < Connection
   include Voldemort

diff --git a/lib/voldemort-rb.rb b/lib/voldemort-rb.rb
@@ -1,7 +1,10 @@
-require File.join(File.dirname(__FILE__), "connection", "voldemort_node")
-require File.join(File.dirname(__FILE__), "connection", "connection")
-require File.join(File.dirname(__FILE__), "connection", "tcp_connection")
-require File.join(File.dirname(__FILE__), "voldemort-serializer")
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'connection/voldemort_node' 
+require 'connection/connection' 
+require 'connection/tcp_connection' 
+require 'voldemort-serializer'
 
 class VoldemortClient
   attr_accessor :connection