hadoop-jruby-connector 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/hjc/hadoop_streaming.rb

@@ -22,10 +22,10 @@ module Hjc
     def input=(input)
       # input param seems to explain exact path on Hadoop streaming..
       file = Util.to_temp_file('input', input)
-      @input_path = file.path
+      @input_path = Util.rel_path(file)
       unless @local # path seems on HDFS
         sh = FsShell.new
-        sh.put(file.path, file.path)
+        sh.put(file.path, Util.rel_path(file))
       end
     end
 

data/lib/hjc/util.rb

@@ -4,38 +4,44 @@ module Hjc
   class Util
     TMP_DIR = 'tmp'
 
-    def self.setup
-      hadoop_jars.each do |jar|
-        require jar # fro JRuby
+    class << self
+      def setup
+        hadoop_jars.each do |jar|
+          require jar # fro JRuby
+        end
+        
+        $CLASSPATH << "#{hadoop_home}/conf"
       end
-      
-      $CLASSPATH << "#{hadoop_home}/conf"
-    end
 
-    def self.hadoop_jars
-      jars = []
-      ['', 'lib', 'contrib/streaming'].each do |path|
-        jars.concat Dir.glob(File.join(hadoop_home, path, "*.jar"))
+      def hadoop_jars
+        jars = []
+        ['', 'lib', 'contrib/streaming'].each do |path|
+          jars.concat Dir.glob(File.join(hadoop_home, path, "*.jar"))
+        end
+        jars
       end
-      jars
-    end
 
-    def self.hadoop_home
-      ENV['HADOOP_HOME']
-    end
+      def hadoop_home
+        ENV['HADOOP_HOME']
+      end
 
-    def self.to_temp_file(filename, body, options={})
-      file = Tempfile.new(filename, TMP_DIR)
-      file.print body
-      file.close
+      def to_temp_file(filename, body, options={})
+        file = Tempfile.new(filename, TMP_DIR)
+        file.print body
+        file.close
 
-      unless options.empty?
-        if options.keys.include? :mod
-          File.chmod(options[:mod], file.path)
+        unless options.empty?
+          if options.keys.include? :mod
+            File.chmod(options[:mod], file.path)
+          end
         end
+
+        file
       end
 
-      file
+      def rel_path(file)
+        File.join(TMP_DIR, File.basename(file.path))
+      end
     end
   end
 end

data/spec/hjc/util_spec.rb

@@ -14,5 +14,12 @@ module Hjc
 
       FileTest.executable?(f.path).should be_true
     end
+
+    it 'returns relative path from tempfile' do
+      f = Util.to_temp_file('map.rb', 'mapscript', :mod => 0700)
+
+      filename = File.basename(f.path)
+      Util.rel_path(f).should == "tmp/#{filename}"
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 5
-  version: 0.0.5
+    - 6
+  version: 0.0.6
 platform: ruby
 authors: 
   - Koichi Fujikawa
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +09:00
+date: 2011-05-30 00:00:00 +09:00
 default_executable: 
 dependencies: []