hdfs_jruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a1cbb43a25387dc8a3ef571e63399526f970413a
-  data.tar.gz: f9e7d92cc52874584f5403ea1630d0ed1bb59668
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTk1YjliNGRlYTE3MzIxODk2NGI5NzRhODkwOTlmMjljYWI0ZmYzZg==
+  data.tar.gz: !binary |-
+    OTI4NjYwNWJmZGEzN2YxNjI4MmVmOWM2YzNiNDkyMzg4OWI3NDFjOQ==
 SHA512:
-  metadata.gz: 977e86a3dde5c17960c346559331f6dfa4418e066f3112a8e0ddc15b350a82388e0367f956a594685dc3fc94ff65d1d27d848224a27d3f415f52da0a3d5cd46e
-  data.tar.gz: 2db1991b8b67829d5efc8ee6843509cd2a7c87e68c9aa7072cff01660850a83916f21bf206d7f78cb2d756d042a4ad04aa253ab0713bc964f449bd2140d70ab3
+  metadata.gz: !binary |-
+    ZGNlOGI1ZGE1ZTdlNGNjZmRlMzdkNWE4NDBmNjg4YWJlOWM2MWViNGY4ZTQ1
+    MThkZDZjZmIzNDIwOWRhMTMyZTE4YTdmMjY1MTEzMjdiNTk0YTllMjI1NTQ1
+    MzU5MTY4NGRkM2Q4MmNhNDI0NTk0NjFhY2UwMzMxNmM0OGM3MmU=
+  data.tar.gz: !binary |-
+    MWYyY2RiOGU2OWFmZjk3YTFmNjU5MmE3NTFhNDk4ZDE3ZjJhZDZmNWZhNjgx
+    ZjVhNDE0ZjVkMTY5YTQ2MzFkOTI2MTViNDU4MGMzMWY5ZWNiZDc4Y2JhYTdm
+    ZTNkYTExZGE5MTE3NGM5OTRmMmExN2VmNTdmMzljNzM5NDZkYzc=

data/README.md

@@ -18,7 +18,14 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+   require 'hdfs_jruby'
+   
+   ...
+
+   Hdfs.ls(path) do | stat |
+     p stat
+   end
+
 
 ## Contributing
 

data/lib/hdfs_jruby/file.rb

@@ -16,7 +16,6 @@ module Hdfs
         @stream = @fs.create(Hdfs::Path.new(path), false)
       elsif mode == "r"
         @stream = @fs.open(Hdfs::Path.new(path))
-        @buf = java.nio.ByteBuffer.allocate(65536)
       elsif mode == "a"
         p = Hdfs::Path.new(path)
         if !@fs.exists(p)
@@ -32,7 +31,12 @@ module Hdfs
     
     def self.open(path, mode = "r")
       if block_given?
-        yield(File.new(path, mode).to_io)
+        io = File.new(path, mode).to_io
+        begin
+          yield(io)
+        ensure
+          io.close
+        end
       else
         return File.new(path, mode).to_io
       end

data/lib/hdfs_jruby/version.rb

@@ -1,3 +1,3 @@
 module Hdfs
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/hdfs_jruby.rb

@@ -35,28 +35,52 @@ module Hdfs
   
   @conf = Hdfs::Configuration.new()
   @fs = Hdfs::FileSystem.get(@conf)
+  
+  def ls(path)
+    p = _path(path)
+    list = @fs.globStatus(p)
+    ret_list = []
+    list.each do |stat|
+      if stat.isDir
+        sub_list = @fs.listStatus(stat.getPath)
+        sub_list.each do | s |
+          if block_given?
+            yield _conv(s)
+          else
+            ret_list << _conv(s)
+          end
+        end
+      else
+        if block_given?
+          yield _conv(stat)
+        else
+          ret_list << _conv(stat)
+        end
+      end
+    end
+    ret_list if ! block_given?
+  end
 
-  def list(path, use_glob=true)
+  def list(path, opts={})
+    use_glob = opts[:glob] ? true : false
     p = _path(path)
-    if ! block_given?
-      raise "error"
+
+    list = nil
+    if use_glob
+      list = @fs.globStatus(p)
     else
-      list = nil
-      if use_glob
-        list = @fs.globStatus(p)
-      else
-        list = @fs.listStatus(p)
+      list = @fs.listStatus(p)
+    end
+      
+    if ! block_given?
+      ret_list = []
+      list.each do | stat |
+        ret_list << _conv(stat)
       end
+      return ret_list
+    else
       list.each do | stat |
-        file_info = {}
-        file_info['path'] = stat.getPath.to_s
-        file_info['length'] = stat.getLen.to_i
-        file_info['modificationTime'] = stat.getModificationTime.to_i
-        file_info['owner'] = stat.getOwner.to_s
-        file_info['group'] = stat.getGroup.to_s
-        file_info['permission'] = stat.getPermission.toShort.to_i
-        file_info['type'] = !stat.isDir ? 'FILE': 'DIRECTORY'
-        yield file_info
+        yield _conv(stat)
       end
     end
   end
@@ -132,6 +156,7 @@ module Hdfs
   module_function :set_permission
   module_function :set_owner
   module_function :list
+  module_function :ls
 
   private
   def _path(path)
@@ -140,6 +165,19 @@ module Hdfs
     end
     Path.new(path)
   end
+  
+  def _conv(stat)
+    file_info = {}
+    file_info['path'] = stat.getPath.to_s
+    file_info['length'] = stat.getLen.to_i
+    file_info['modificationTime'] = stat.getModificationTime.to_i
+    file_info['owner'] = stat.getOwner.to_s
+    file_info['group'] = stat.getGroup.to_s
+    file_info['permission'] = stat.getPermission.toShort.to_i
+    file_info['type'] = !stat.isDir ? 'FILE': 'DIRECTORY'
+    return file_info
+  end
 
   module_function :_path
+  module_function :_conv
 end

data/test/test_ls.rb

@@ -1,8 +1,10 @@
 
 require 'hdfs_jruby'
 
-Hdfs.list(ARGV[0], true) do | stat |
-  p stat
+list = Hdfs.ls(ARGV[0]) 
+
+list.each do |stat|
+  #p stat
   path = stat['path']
   length = stat['length']
   type = stat['type']

data/test/test_write.rb

@@ -5,8 +5,12 @@ require 'hdfs_jruby/file'
 #print f.read
 #f.close
 
-f = Hdfs::File.open("test_w.txt", "w")
-p f.print  "test..\ntest\n"
-p f.print "test..\ntest\n"
+#f = Hdfs::File.open("test_w.txt", "w")
+#p f.print  "test..\ntest\n"
+#p f.print "test..\ntest\n"
+#f.close()
+
+Hdfs::File.open("test_w.txt", "w") do |io|
+  io.print "test\n"
+end
 
-f.close()

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: hdfs_jruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - shinji ikeda
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 description: ''
 email:
 - gm.ikeda@gmail.com
@@ -68,24 +68,24 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.2.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: jruby hdfs api
 test_files: