jruby-on-hadoop 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/jruby-on-hadoop.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-on-hadoop}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]

data/lib/jruby-on-hadoop/client.rb

@@ -8,9 +8,8 @@ module JRubyOnHadoop
       @args = args
       parse_args
 
-      # env check
-      hadoop_home and hadoop_cmd
-      ENV['HADOOP_CLASSPATH'] = "#{lib_path}:#{File.dirname(@script_path)}"
+      # env get / set and check
+      hadoop_home and hadoop_cmd and hadoop_classpath
     end
 
     def hadoop_home
@@ -26,6 +25,11 @@ module JRubyOnHadoop
       hadoop.chomp
     end
 
+    def hadoop_classpath
+      ENV['HADOOP_CLASSPATH'] =
+        ([lib_path, File.dirname(@script_path)] + jruby_jars).join(':')
+    end
+
     def run
       exec cmd
     end
@@ -50,21 +54,13 @@ module JRubyOnHadoop
       args
     end
 
-    def opt_libjars
-      # jruby jars
-      [JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path].join(',')
-    end
-
-    def opt_files
-      @files.join(',')
+    def jruby_jars
+      [JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path]
     end
 
-    def main_jar_path
-      JRubyOnHadoop.jar_path
-    end
-
-    def lib_path
-      JRubyOnHadoop.lib_path
-    end
+    def opt_libjars; jruby_jars.join(',') end
+    def opt_files; @files.join(',') end
+    def main_jar_path; JRubyOnHadoop.jar_path end
+    def lib_path; JRubyOnHadoop.lib_path end
   end
 end

data/spec/jruby-on-hadoop/client_spec.rb

@@ -76,4 +76,10 @@ describe JRubyOnHadoop::Client do
       ENV['HADOOP_HOME'] = saved_home
     end
   end
+
+  it 'set HADOOP_CLASSPATH env var' do
+      client = JRubyOnHadoop::Client.new
+      client.hadoop_classpath.should match JRubyJars.core_jar_path
+      client.hadoop_classpath.should match JRubyJars.stdlib_jar_path
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jruby-on-hadoop
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Koichi Fujikawa