net-smb 0.0.2 → 0.0.3

data/README.md

@@ -0,0 +1,29 @@
+Ruby Net::SMB - SMB/CIFS client class for Ruby
+======================================================================
+
+Synopsis
+----------------------------------------------------------------------
+
+This is a Samba libsmbclient binding, i.e., SMB/CIFS client class
+for Ruby.
+
+Requirement
+----------------------------------------------------------------------
+
+* Ruby 1.9.3+
+* Samba 3.5+ (libsmbclient)
+* C compiler
+
+Development Resources
+----------------------------------------------------------------------
+
+* Source: https://github.com/fumiyas/ruby-net-smb
+* Issues: https://github.com/fumiyas/ruby-net-smb/issues
+
+Copyright
+----------------------------------------------------------------------
+
+Copyright (C) 2012 SATOH Fumiyas @ OSS Technology Corp., Japan
+
+Licensed under the GNU General Public License version 3
+

data/Rakefile

@@ -9,18 +9,15 @@ rescue LoadError => e
 end
 
 require 'rake/clean'
+require 'rake/extensiontask'
 require 'rake/testtask'
 
-Rake::TestTask.new
+GEMSPEC = eval(File.read(File.dirname(__FILE__) + '/net-smb.gemspec'))
 
-CLEAN.include('ext/**/*.{log,o,so}')
-CLEAN.include('ext/**/Makefile')
-CLEAN.include('lib/**/*.so')
-CLOBBER.include('pkg/*')
-CLOBBER.include('test/log')
-CLOBBER.include('test/log.[0-9]')
+Rake::ExtensionTask.new("net_smb", GEMSPEC)
+Rake::TestTask.new
 
-EXT_PATH = 'net/smb'
+EXT_PATH = 'net_smb'
 
 file "lib/#{EXT_PATH}.so" => Dir.glob("ext/#{EXT_PATH}/*.{rb,c,h}") do
   Dir.chdir("ext/#{EXT_PATH}") do
@@ -32,3 +29,10 @@ end
 
 task :test => "lib/#{EXT_PATH}.so"
 
+CLEAN.include('ext/**/*.{log,o,so}')
+CLEAN.include('ext/**/Makefile')
+CLEAN.include('lib/**/*.so')
+CLOBBER.include('pkg/*')
+CLOBBER.include('test/log')
+CLOBBER.include('test/log.[0-9]')
+

data/ext/{net/smb → net_smb}/extconf.rb

@@ -14,7 +14,7 @@ $CFLAGS += " " + ENV["CFLAGS"] if ENV["CFLAGS"]
 $CPPFLAGS += " " + ENV["CPPFLAGS"] if ENV["CPPFLAGS"]
 $LDFLAGS += " " + ENV["LDFLAGS"] if ENV["LDFLAGS"]
 
-dir_config "smb"
+dir_config "net_smb"
 
 h = have_header("libsmbclient.h")
 l = have_library("smbclient", "smbc_new_context")
@@ -32,5 +32,5 @@ if try_link(<<-'EOS')
   $defs << "-DHAVE_SMBC_ALLOWDEBUGCHANGE"
 end
 
-create_makefile "smb"
+create_makefile "net_smb"
 

data/ext/{net/smb → net_smb}/rb_smb.h

@@ -50,8 +50,15 @@
 
 #define RB_SMBFILE_BUFFER_SIZE 8192
 
-typedef struct rb_smb_data	RB_SMB_DATA;
-typedef struct rb_smbfile_data	RB_SMBFILE_DATA;
+typedef struct rb_smb_data		RB_SMB_DATA;
+typedef struct rb_smbfile_data		RB_SMBFILE_DATA;
+
+struct rb_smb_data {
+  rb_encoding	*enc;
+  SMBCCTX	*smbcctx;
+  VALUE		auth_callback;
+  RB_SMBFILE_DATA *smbfile_data_list;
+};
 
 struct rb_smbfile_data {
   rb_encoding	*enc;
@@ -71,13 +78,6 @@ struct rb_smbfile_data {
   RB_SMBFILE_DATA *next, *prev;
 };
 
-struct rb_smb_data {
-  rb_encoding	*enc;
-  SMBCCTX	*smbcctx;
-  VALUE		auth_callback;
-  RB_SMBFILE_DATA *smbfile_data_list;
-};
-
 #define RB_SMB_DATA_FROM_OBJ(obj, data) \
   RB_SMB_DATA *data; \
   Data_Get_Struct(obj, RB_SMB_DATA, data);
@@ -89,10 +89,12 @@ struct rb_smb_data {
 extern VALUE rb_cSMB;
 extern VALUE rb_eSMBError;
 extern VALUE rb_cSMBDir;
+extern VALUE rb_cSMBDirEntry;
 extern VALUE rb_cSMBFile;
 
-void Init_smbdir(void);
-void Init_smbfile(void);
+void Init_net_smbdir(void);
+void Init_net_smbdirentry(void);
+void Init_net_smbfile(void);
 
 #define _RB_SMB_H_
 

data/ext/{net/smb → net_smb}/smb.c

@@ -50,12 +50,14 @@ static void smbcctx_auth_fn(SMBCCTX *smbcctx,
   if (TYPE(cred_obj) != T_ARRAY) {
     rb_raise(rb_eTypeError,
 	RB_SMB_NAME
-	"#on_auth proc must return an array of username, passsword, and optional workgroup name");
+	"#auth_callback must return an array of username, "
+	"passsword, and optional workgroup name");
   }
   if (RARRAY_LEN(cred_obj) < 2 || RARRAY_LEN(cred_obj) > 3) {
     rb_raise(rb_eArgError,
 	RB_SMB_NAME
-	"#on_auth proc must return an array of username, passsword, and optional workgroup name");
+	"#auth_callback must return an array of username, "
+	"passsword, and optional workgroup name");
   }
 
   username_obj = RARRAY_PTR(cred_obj)[0];
@@ -197,7 +199,7 @@ static VALUE rb_smb_use_kerberos_set(VALUE self, VALUE flag)
   return flag;
 }
 
-static VALUE rb_smb_on_auth(int argc, VALUE* argv, VALUE self)
+static VALUE rb_smb_auth_callback(int argc, VALUE* argv, VALUE self)
 {
   RB_SMB_DATA_FROM_OBJ(self, data);
 
@@ -257,7 +259,7 @@ static VALUE rb_smb_open(int argc, VALUE *argv, VALUE self)
 
 /* ====================================================================== */
 
-void Init_smb(void)
+void Init_net_smb(void)
 {
   VALUE rb_mNet = rb_define_module("Net");
 
@@ -269,8 +271,8 @@ void Init_smb(void)
   rb_define_method(rb_cSMB, "debug=", rb_smb_debug_set, 1);
   rb_define_method(rb_cSMB, "use_kerberos", rb_smb_use_kerberos_get, 0);
   rb_define_method(rb_cSMB, "use_kerberos=", rb_smb_use_kerberos_set, 1);
-  rb_define_method(rb_cSMB, "on_auth", rb_smb_on_auth, -1);
-  rb_define_alias(rb_cSMB, "on_authentication", "on_auth");
+  rb_define_method(rb_cSMB, "auth_callback", rb_smb_auth_callback, -1);
+  rb_define_alias(rb_cSMB, "auth", "auth_callback");
   rb_define_method(rb_cSMB, "opendir", rb_smb_opendir, 1);
   rb_define_method(rb_cSMB, "open", rb_smb_open, -1);
 
@@ -304,7 +306,8 @@ void Init_smb(void)
     smbc_init_context(smbcctx);
   }
 
-  Init_smbdir();
-  Init_smbfile();
+  Init_net_smbdir();
+  Init_net_smbdirentry();
+  Init_net_smbfile();
 }
 

data/ext/{net/smb → net_smb}/smbdir.c

@@ -200,13 +200,25 @@ static VALUE rb_smbdir_read(VALUE self)
     return Qnil;
   }
 
-  return rb_external_str_new_with_enc(smbcdent->name, strlen(smbcdent->name), data->enc);
+  VALUE args[4];
+  args[0] = rb_external_str_new_with_enc(smbcdent->name,
+      strlen(smbcdent->name), data->enc);
+  args[1] = INT2NUM(smbcdent->smbc_type);
+  args[2] = rb_str_new2(data->url);
+  rb_str_cat2(args[2], "/"); /* FIXME: Unless if the last char is not "/" */
+  rb_str_cat2(args[2], smbcdent->name); /* FIXME: Must be URL encoding */
+  args[3] = rb_str_new(smbcdent->comment, smbcdent->commentlen);
+  VALUE entry_obj = rb_class_new_instance(4, args, rb_cSMBDirEntry);
+
+  return entry_obj;
 }
 
 static VALUE rb_smbdir_each(VALUE self)
 {
   VALUE name;
 
+  rb_smbdir_rewind(self);
+
   RETURN_ENUMERATOR(self, 0, 0);
 
   while (!NIL_P(name = rb_smbdir_read(self))) {
@@ -218,10 +230,11 @@ static VALUE rb_smbdir_each(VALUE self)
 
 /* ====================================================================== */
 
-void Init_smbdir(void)
+void Init_net_smbdir(void)
 {
   rb_cSMBDir = rb_define_class_under(rb_cSMB, "Dir", rb_cObject);
   rb_define_alloc_func(rb_cSMBDir, rb_smbdir_data_alloc);
+  rb_include_module(rb_cSMBDir, rb_mEnumerable);
   rb_define_method(rb_cSMBDir, "initialize", rb_smbdir_initialize, 2);
   rb_define_method(rb_cSMBDir, "smb", rb_smbdir_smb, 0);
   rb_define_method(rb_cSMBDir, "url", rb_smbdir_url, 0);
@@ -232,5 +245,15 @@ void Init_smbdir(void)
   rb_define_method(rb_cSMBDir, "rewind", rb_smbdir_rewind, 0);
   rb_define_method(rb_cSMBDir, "read", rb_smbdir_read, 0);
   rb_define_method(rb_cSMBDir, "each", rb_smbdir_each, 0);
+
+  rb_define_const(rb_cSMB, "SMBC_WORKGROUP", INT2FIX(SMBC_WORKGROUP));
+  rb_define_const(rb_cSMB, "SMBC_SERVER", INT2FIX(SMBC_SERVER));
+  rb_define_const(rb_cSMB, "SMBC_FILE_SHARE", INT2FIX(SMBC_FILE_SHARE));
+  rb_define_const(rb_cSMB, "SMBC_PRINTER_SHARE", INT2FIX(SMBC_PRINTER_SHARE));
+  rb_define_const(rb_cSMB, "SMBC_COMMS_SHARE", INT2FIX(SMBC_COMMS_SHARE));
+  rb_define_const(rb_cSMB, "SMBC_IPC_SHARE", INT2FIX(SMBC_IPC_SHARE));
+  rb_define_const(rb_cSMB, "SMBC_DIR", INT2FIX(SMBC_DIR));
+  rb_define_const(rb_cSMB, "SMBC_FILE", INT2FIX(SMBC_FILE));
+  rb_define_const(rb_cSMB, "SMBC_LINK", INT2FIX(SMBC_LINK));
 }
 

data/ext/net_smb/smbdirentry.c

@@ -0,0 +1,145 @@
+/*
+ * Ruby/Net::SMB - SMB/CIFS client (Samba libsmbclient binding) for Ruby
+ * Net::SMB::DirEntry class
+ * Copyright (C) 2012 SATOH Fumiyas @ OSS Technology Corp., Japan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rb_smb.h"
+
+VALUE rb_cSMBDirEntry;
+
+VALUE sym_name;
+VALUE sym_type;
+VALUE sym_url;
+VALUE sym_comment;
+
+/* ====================================================================== */
+
+static VALUE rb_smbdirentry_initialize(VALUE self,
+    VALUE name_obj, VALUE type_obj, VALUE url_obj, VALUE comment_obj)
+{
+  rb_call_super(0, 0);
+
+  rb_hash_aset(self, sym_name, name_obj);
+  rb_hash_aset(self, sym_type, type_obj);
+  rb_hash_aset(self, sym_url, comment_obj);
+  rb_hash_aset(self, sym_comment, comment_obj);
+
+  return self;
+}
+
+static VALUE rb_smbdirentry_name(VALUE self)
+{
+  return rb_hash_lookup(self, sym_name);
+}
+
+static VALUE rb_smbdirentry_type(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type);
+}
+
+static VALUE rb_smbdirentry_url(VALUE self)
+{
+  return rb_hash_lookup(self, sym_url);
+}
+
+static VALUE rb_smbdirentry_comment(VALUE self)
+{
+  return rb_hash_lookup(self, sym_comment);
+}
+
+static VALUE rb_smbdirentry_workgroup_p(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type) == INT2FIX(SMBC_WORKGROUP) ?
+      Qtrue : Qfalse;
+}
+
+static VALUE rb_smbdirentry_server_p(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type) == INT2FIX(SMBC_SERVER) ?
+      Qtrue : Qfalse;
+}
+
+static VALUE rb_smbdirentry_file_share_p(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type) == INT2FIX(SMBC_FILE_SHARE) ?
+      Qtrue : Qfalse;
+}
+
+static VALUE rb_smbdirentry_printer_share_p(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type) == INT2FIX(SMBC_PRINTER_SHARE) ?
+      Qtrue : Qfalse;
+}
+
+static VALUE rb_smbdirentry_comms_share_p(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type) == INT2FIX(SMBC_COMMS_SHARE) ?
+      Qtrue : Qfalse;
+}
+
+static VALUE rb_smbdirentry_ipc_share_p(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type) == INT2FIX(SMBC_IPC_SHARE) ?
+      Qtrue : Qfalse;
+}
+
+static VALUE rb_smbdirentry_dir_p(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type) == INT2FIX(SMBC_DIR) ?
+      Qtrue : Qfalse;
+}
+
+static VALUE rb_smbdirentry_file_p(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type) == INT2FIX(SMBC_FILE) ?
+      Qtrue : Qfalse;
+}
+
+static VALUE rb_smbdirentry_link_p(VALUE self)
+{
+  return rb_hash_lookup(self, sym_type) == INT2FIX(SMBC_LINK) ?
+      Qtrue : Qfalse;
+}
+
+/* ====================================================================== */
+
+void Init_net_smbdirentry(void)
+{
+  rb_cSMBDirEntry = rb_define_class_under(rb_cSMB, "DirEntry", rb_cHash);
+  rb_define_method(rb_cSMBDirEntry, "initialize", rb_smbdirentry_initialize, 4);
+  rb_define_method(rb_cSMBDirEntry, "name", rb_smbdirentry_name, 0);
+  rb_define_alias(rb_cSMBDirEntry, "to_s", "name");
+  rb_define_method(rb_cSMBDirEntry, "type", rb_smbdirentry_type, 0);
+  rb_define_method(rb_cSMBDirEntry, "url", rb_smbdirentry_url, 0);
+  rb_define_method(rb_cSMBDirEntry, "comment", rb_smbdirentry_comment, 0);
+  rb_define_method(rb_cSMBDirEntry, "workgroup?", rb_smbdirentry_workgroup_p, 0);
+  rb_define_method(rb_cSMBDirEntry, "server?", rb_smbdirentry_server_p, 0);
+  rb_define_method(rb_cSMBDirEntry, "file_share?", rb_smbdirentry_file_share_p, 0);
+  rb_define_method(rb_cSMBDirEntry, "printer_share?", rb_smbdirentry_printer_share_p, 0);
+  rb_define_method(rb_cSMBDirEntry, "comms_share?", rb_smbdirentry_comms_share_p, 0);
+  rb_define_method(rb_cSMBDirEntry, "ipc_share?", rb_smbdirentry_ipc_share_p, 0);
+  rb_define_method(rb_cSMBDirEntry, "directory?", rb_smbdirentry_dir_p, 0);
+  rb_define_alias(rb_cSMBDirEntry, "dir?", "directory?");
+  rb_define_method(rb_cSMBDirEntry, "file?", rb_smbdirentry_file_p, 0);
+  rb_define_method(rb_cSMBDirEntry, "link?", rb_smbdirentry_link_p, 0);
+
+  sym_name = ID2SYM(rb_intern("name"));
+  sym_type = ID2SYM(rb_intern("type"));
+  sym_url = ID2SYM(rb_intern("url"));
+  sym_comment = ID2SYM(rb_intern("comment"));
+}
+

data/ext/{net/smb → net_smb}/smbfile.c

@@ -202,6 +202,11 @@ static VALUE rb_smbfile_url(VALUE self)
   return rb_str_new2(data->url);
 }
 
+static VALUE rb_smbfile_read_buffer_size(VALUE self)
+{
+  return INT2NUM(RB_SMBFILE_BUFFER_SIZE);
+}
+
 static VALUE rb_smbfile_close(VALUE self)
 {
   RB_SMBFILE_DATA_FROM_OBJ(self, data);
@@ -336,13 +341,14 @@ static VALUE rb_smbfile_read(int argc, VALUE *argv, VALUE self)
 
 /* ====================================================================== */
 
-void Init_smbfile(void)
+void Init_net_smbfile(void)
 {
   rb_cSMBFile = rb_define_class_under(rb_cSMB, "File", rb_cObject);
   rb_define_alloc_func(rb_cSMBFile, rb_smbfile_data_alloc);
   rb_define_method(rb_cSMBFile, "initialize", rb_smbfile_initialize, -1);
   rb_define_method(rb_cSMBFile, "smb", rb_smbfile_smb, 0);
   rb_define_method(rb_cSMBFile, "url", rb_smbfile_url, 0);
+  rb_define_method(rb_cSMBFile, "read_buffer_size", rb_smbfile_read_buffer_size, 0);
   rb_define_method(rb_cSMBFile, "close", rb_smbfile_close, 0);
   rb_define_method(rb_cSMBFile, "tell", rb_smbfile_tell, 0);
   rb_define_alias(rb_cSMBFile, "pos", "tell");

data/lib/net/smb/version.rb

@@ -1,5 +1,5 @@
 module Net #:nodoc:
-  module SMB #:nodoc:
-    VERSION = "0.0.2" #:nodoc:
+  class SMB #:nodoc:
+    VERSION = "0.0.3" #:nodoc:
   end
 end

data/lib/net/smb.rb

@@ -0,0 +1,3 @@
+require "net/smb/version"
+require "net_smb"
+

data/net-smb.gemspec

@@ -16,5 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.extensions    = `git ls-files -- ext/*.rb`.split("\n")
   s.require_paths = ["lib"]
+
+  s.add_development_dependency 'rake-compiler'
 end
 

data/test/test_net_smb.rb

@@ -32,7 +32,7 @@ class SMBTest < Test::Unit::TestCase
     @dirs_readable =	[@dir_readable]
     @dir_noaccess =	"dir.noaccess"
     @dirs_noaccess =	[@dir_noaccess]
-    @dirs = @dirs_readable + @dirs_writeable + @dirs_noaccess
+    @dirs = [".", ".."] + @dirs_readable + @dirs_writeable + @dirs_noaccess
     @file_noexist =	"file.noexist"
     @file_writeable =	"file.writeable"
     @file_writeable_m =	"ファイル.writeable"
@@ -128,9 +128,18 @@ class SMBTest < Test::Unit::TestCase
     return smbstatus_r
   end
 
+  def smb
+    smb = Net::SMB.new
+    smb.auth_callback {|server, share|
+      [@username, @password]
+    }
+
+    return smb
+  end
+
   def test_auth
     smb = Net::SMB.new
-    smb.on_auth {|server, share|
+    smb.auth_callback {|server, share|
       [@username, @password]
     }
     assert_nothing_raised do
@@ -139,7 +148,7 @@ class SMBTest < Test::Unit::TestCase
     end
 
     smb = Net::SMB.new
-    smb.on_auth {|server, share|
+    smb.auth_callback {|server, share|
       [@username, 'invalid-password']
     }
     assert_raise(Errno::EPERM) do
@@ -147,7 +156,7 @@ class SMBTest < Test::Unit::TestCase
     end
 
     smb = Net::SMB.new
-    smb.on_auth {|server, share|
+    smb.auth_callback {|server, share|
       ['invalid-user', @password]
     }
     assert_raise(Errno::EACCES) do
@@ -155,7 +164,7 @@ class SMBTest < Test::Unit::TestCase
     end
 
     smb = Net::SMB.new
-    smb.on_auth {|server, share|
+    smb.auth_callback {|server, share|
       'blah-blah'
     }
     assert_raise(TypeError) do
@@ -163,7 +172,7 @@ class SMBTest < Test::Unit::TestCase
     end
 
     smb = Net::SMB.new
-    smb.on_auth {|server, share|
+    smb.auth_callback {|server, share|
       [@username]
     }
     assert_raise(ArgumentError) do
@@ -172,10 +181,7 @@ class SMBTest < Test::Unit::TestCase
   end
 
   def test_dir_open_close
-    smb = Net::SMB.new
-    smb.on_auth {|server, share|
-      [@username, @password]
-    }
+    smb = self.smb
 
     smbdir = smb.opendir(@share_public)
     assert_equal(smb.object_id, smbdir.smb.object_id)
@@ -199,66 +205,123 @@ class SMBTest < Test::Unit::TestCase
   end ## test_dir_open_close
 
   def test_dir_read
-    dents_all = [".", "..", *@dirs, *@files]
+    smb = self.smb
+    dent_names_all = [*@dirs, *@files]
 
-    smb = Net::SMB.new
-    smb.on_auth {|server, share|
-      [@username, @password]
-    }
+    smbdir = smb.opendir(@share_private)
+    dent_names = dent_names_all.clone
+    while dent = smbdir.read
+      assert_equal(dent.name, dent_names.delete(dent.name),
+	  "Unexpected directory entry: #{dent.name}")
+      if @dirs.include?(dent.name)
+	assert(dent.dir?)
+      elsif @files.include?(dent.name)
+	assert(dent.file?)
+      end
+    end
+    assert_empty(dent_names)
+    smbdir.close
+
+    smb.opendir(@share_public) do |smbdir|
+      dent_names = dent_names_all.clone
+      while dent = smbdir.read
+	assert_equal(dent.name, dent_names.delete(dent.name),
+	    "Unexpected directory entry: #{dent.name}")
+      end
+      assert_empty(dent_names)
+    end
+  end ## test_dir_read
+
+  def test_dir_seek
+    smb = self.smb
+    dent_names_all = [*@dirs, *@files]
 
     smbdir = smb.opendir(@share_private)
-    smbdir_pos = [smbdir.pos]
-    dents = dents_all.clone
-    while fname = smbdir.read
-      smbdir_pos << smbdir.pos
-      assert_equal(fname, dents.delete(fname), "Unexpected directory entry: #{fname}")
+
+    smbdir_pos_all = Array.new
+    fname_by_pos = Hash.new
+    loop do
+      pos = smbdir.pos
+      smbdir_pos_all << pos
+      dent = smbdir.read
+      fname_by_pos[pos] = dent ? dent.name : nil;
+      break unless dent
     end
-    assert_empty(dents)
 
     smbdir.rewind
-    assert_equal(smbdir_pos.shift, smbdir.tell)
-    dents = dents_all.clone
-    while fname = smbdir.read
-      assert_equal(smbdir_pos.shift, smbdir.tell)
-      assert_equal(fname, dents.delete(fname), "Unexpected directory entry: #{fname}")
+    dent_names = dent_names_all.clone
+    smbdir_pos = smbdir_pos_all.clone
+    loop do
+      pos = smbdir.pos
+      assert_equal(smbdir_pos.shift, pos)
+      unless dent = smbdir.read
+	break
+      end
+      assert_equal(dent.name, dent_names.delete(dent.name),
+	  "Unexpected directory entry: #{dent.name}")
+      assert_equal(fname_by_pos[pos], dent.name,
+	  "Unexpected directory entry: #{dent.name} #{pos}")
+    end
+    assert_empty(dent_names)
+
+    smbdir_pos_all.each do |pos|
+      smbdir.seek(pos)
+      dent = smbdir.read
+      dent_name = dent ? dent.name : nil;
+      assert_equal(fname_by_pos[pos], dent_name,
+	  "Unexpected directory entry: #{dent_name} #{pos}")
+    end
+
+    smbdir_pos_all.reverse.each do |pos|
+      smbdir.seek(pos)
+      dent = smbdir.read
+      dent_name = dent ? dent.name : nil;
+      assert_equal(fname_by_pos[pos], dent_name,
+	  "Unexpected directory entry: #{dent_name} #{pos}")
     end
-    assert_empty(dents)
 
     smbdir.close
+  end ## test_dir_seek
 
-    smb.opendir(@share_public) do |smbdir|
-      dents = dents_all.clone
-      while fname = smbdir.read
-	assert_equal(fname, dents.delete(fname), "Unexpected directory entry: #{fname}")
-      end
-      assert_empty(dents)
+  def test_dir_enum
+    smb = self.smb
+    dent_names_all = [*@dirs, *@files]
+
+    smbdir = smb.opendir(@share_private)
+    dent_names = dent_names_all.clone
+    smbdir.each do |dent|
+      assert(dent_names.delete(dent.name) != nil)
     end
+    assert_empty(dent_names)
+    smbdir.close
 
     smbdir = smb.opendir(@share_private)
-    dents = dents_all.clone
-    smbdir.each do |fname|
-      assert(dents.delete(fname) != nil)
+    dent_names = dent_names_all.clone
+    smbdir.read
+    smbdir.read
+    smbdir.each do |dent|
+      assert(dent_names.delete(dent.name) != nil)
     end
-    assert_empty(dents)
+    assert_empty(dent_names)
+    smbdir.close
 
     smbdir = smb.opendir(@share_private)
-    dents = dents_all.clone
+    dent_names = dent_names_all.clone
     smbdir_enum = smbdir.each
-    dents.size.times do |n|
-      fname = smbdir_enum.next
-      assert_equal(fname, dents.delete(fname), "Unexpected directory entry: #{fname}")
+    dent_names.size.times do |n|
+      dent = smbdir_enum.next
+      assert_equal(dent.name, dent_names.delete(dent.name),
+	  "Unexpected directory entry: #{dent.name}")
     end
     assert_raise(StopIteration) do
       smbdir_enum.next
     end
-    assert_empty(dents)
-  end ## test_dir_read
+    assert_empty(dent_names)
+    smbdir.close
+  end ## test_dir_enum
 
   def test_file_open_read_close
-    smb = Net::SMB.new
-    smb.on_auth {|server, share|
-      [@username, @password]
-    }
+    smb = self.smb
 
     @files_readable.each do |filename|
       url = @share_public + '/' + filename
@@ -280,34 +343,36 @@ class SMBTest < Test::Unit::TestCase
     end
   end ## test_file_open_read_close
 
-  def test_file_read
-    smb = Net::SMB.new
-    smb.on_auth {|server, share|
-      [@username, @password]
-    }
+  def test_file_read_sequential
+    smb = self.smb
 
     file = File.open(@share_dir + '/' + @file_large)
     smbfile = smb.open(@share_public + '/' + @file_large)
 
-    buffer_size = 8192
-    1.upto(buffer_size * 4) do |read_size|
+    buffer_size = smbfile.read_buffer_size
+    [
+      1..16,
+      (buffer_size/3-16)..(buffer_size/3+16),
+      (buffer_size/2-16)..(buffer_size/2+16),
+      (buffer_size  -16)..(buffer_size  +16),
+      (buffer_size*2-16)..(buffer_size*2+16),
+      (buffer_size*3-16)..(buffer_size*3+16),
+    ].each do |read_size_range| read_size_range.each do |read_size|
       file.rewind
       smbfile.rewind
-      (buffer_size / read_size * 3).times do |n|
+      (buffer_size / read_size * 4).times do |n|
 	file_data = file.read(read_size)
 	smbfile_data = smbfile.read(read_size)
 	assert_equal(file_data, smbfile_data, "read_size #{read_size}, n=#{n}")
+	assert_equal(file.pos, smbfile.pos, "read_size #{read_size}, n=#{n}")
       end
-    end
+    end end
 
     smbfile.close
-  end ## test_file_read
+  end ## test_file_read_sequential
 
   def test_file_read_eof
-    smb = Net::SMB.new
-    smb.on_auth {|server, share|
-      [@username, @password]
-    }
+    smb = self.smb
 
     smbfile = smb.open(@share_public + '/' + @file_readable)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-smb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,46 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
-dependencies: []
+date: 2012-07-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: SMB/CIFS client (Samba libsmbclient binding)
 email:
 - fumiyas@osstech.co.jp
 executables: []
 extensions:
-- ext/net/smb/extconf.rb
+- ext/net_smb/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
 - Makefile
+- README.md
 - Rakefile
 - Rakefile.local.example
-- ext/net/smb/dlinklist.h
-- ext/net/smb/extconf.rb
-- ext/net/smb/rb_smb.h
-- ext/net/smb/smb.c
-- ext/net/smb/smbdir.c
-- ext/net/smb/smbfile.c
+- ext/net_smb/dlinklist.h
+- ext/net_smb/extconf.rb
+- ext/net_smb/rb_smb.h
+- ext/net_smb/smb.c
+- ext/net_smb/smbdir.c
+- ext/net_smb/smbdirentry.c
+- ext/net_smb/smbfile.c
+- lib/net/smb.rb
 - lib/net/smb/version.rb
 - net-smb.gemspec
 - test/bin/smbd.wrapper