sambala 0.9.5 → 0.9.6

data/lib/sambala.rb

@@ -28,8 +28,7 @@
 #                       :host     =>  'sambaserver',
 #                       :share    =>  'sambashare',
 #                       :user     =>  'walrus', 
-#                       :password =>  'eggman', 
-#                       :threads  =>  2 )
+#                       :password =>  'eggman')
 #                       
 #   samba.cd('myfolder')   # =>  true
 #   samba.put(:from => 'aLocalFile.txt')    # =>  [false, "aLocalFile.txt does not exist\r\n"]
@@ -60,19 +59,16 @@ class Sambala
   # * :host = the hostname of the smb server, may be IP or fully qualified domain name
   # * :user = the user name to log into the server
   # * :password = the password to log into the server
-  # * :threads = how many parallel operations you want initiated, !!! higher than 4 at you own risk !!!
   # === Example
   #   samba = Sambala.new(  :domain   =>  'NTDOMAIN', 
   #                       :host     =>  'sambaserver',
   #                       :share    =>  'sambashare',
   #                       :user     =>  'walrus', 
-  #                       :password =>  'eggman', 
-  #                       :threads  =>  2 )
-  def initialize(options={:domain => '', :host => '', :share => '', :user => '', :password => '', :threads => 1})
+  #                       :password =>  'eggman')
+  def initialize(options={:domain => '', :host => '', :share => '', :user => '', :password => ''})
     $log_sambala = GlobaLog.logger(STDERR,:warn)
 		begin
-      options[:threads] = 4 if options[:threads] > 4
-      options[:init_timeout] = options[:threads]
+      options[:init_timeout] = 1
       @options = options; gardener_ok
     rescue
       @gardener.close unless @gardener.nil? || @gardener.class != 'Gardener'

data/lib/sambala_gardener.rb

@@ -106,14 +106,14 @@ class Sambala
 
     # The +init_gardener+ method initialize a gardener class object
     def init_gardener
-      @gardener = Abundance.gardener(:rows => @options[:threads], :init_timeout => @options[:init_timeout]) do
+      @gardener = Abundance.gardener(:rows => 1, :init_timeout => @options[:init_timeout]) do
 				
 				PTY.spawn("smbclient //#{@options[:host]}/#{@options[:share]} #{@options[:password]} -W #{@options[:domain]} -U #{@options[:user]}") do |r,w,pid|
           w.sync = true
           $expect_verbose = false
           catch :init do
             loop do
-              r.expect(/.*\xD\xAsmb:[ \x5C]*\x3E.*/) do |text|
+              r.expect(/.*\xD\xAsmb\x3A\s[\x5C]*\x3E.*/) do |text|
                 if text != nil
                   text[0] =~ /.*Server=.*/i ? Abundance.init_status(true,"#{text.inspect}") : Abundance.init_status(false,"#{text.inspect}")
                   throw :init
@@ -122,18 +122,27 @@ class Sambala
             end
           end
           Abundance.grow do |seed|
+						prompt = false
+						until prompt
+							w.print "\r"
+							r.expect(/.*\xD\xAsmb\x3A\s[\x5C]*\w*[\x5C]+\x3E.*/) do |text|
+								if text != nil
+									prompt = true
+								end
+							end
+						end
             w.print "#{seed.sprout}\r"; $log_sambala.debug("smbclient") {"sprout: -- #{seed.sprout} --"}
             catch :result do
 							iter = 1
               loop do
-                r.expect(/.*\xD\xAsmb: [\x5C]*\w*[\x5C]+\x3E.*/) do |text|
-									$log_sambala.debug("smbclient") {"expect: -- #{text} --"}
+                r.expect(/.*\xD\xAsmb\x3A\s[\x5C]*\w*[\x5C]+\x3E.*/) do |text|
+									$log_sambala.debug("smbclient") {"expect: -- #{text.inspect} --"}
                   if text != nil
                     msg = text[0]
 										
-                    msg.gsub!(/smb: \w*\x5C\x3E\s*$/, '')
+                    msg.gsub!(/smb\x3A\s\w*\x5C\x3E\s*$/, '')
                     msg.gsub!(/^\s*#{seed.sprout}/, '')
-                    msg.lstrip!; $log_sambala.debug("smbclient") {"msg: -- #{msg} --"}
+                    msg.lstrip!; $log_sambala.debug("smbclient") {"msg: -- #{msg.inspect} --"}
 
                     success = case seed.sprout
                       when /^put/
@@ -150,11 +159,12 @@ class Sambala
 
                     seed.crop(success, msg)
                     throw :result
-									elsif iter > 20
+									elsif iter > 9999
 										$log_sambala.warn("Failed to #{seed.sprout}")
 										seed.crop(false, "Failed to #{seed.sprout}")
 										throw :result
 									else
+										$log_sambala.debug("smbclient") {"jumped iter: #{iter.to_s}"}
 										iter += 1
                   end
                 end
@@ -176,7 +186,7 @@ class Sambala
 				pids.each { |pid| Process.kill('HUP', pid)}
 			end
 			@gardener = nil
-      @options[:threads] -= 1 unless @options[:threads] == 1; @options[:init_timeout] += 1
+      @options[:init_timeout] += 1
 		end
 		
 		def posix?(init_message)

data/test/tc_sambala_main.rb

@@ -16,7 +16,6 @@ WELCOME = <<TITLE
 
 /////////////////////////////////////////////////////////////
 TITLE
-THREADS = 4
 
 class TestSambalaMain < Test::Unit::TestCase
   
@@ -100,8 +99,7 @@ class TestSambalaMain < Test::Unit::TestCase
                           :host => @host, 
                           :share => @share,
                           :user => @user, 
-                          :password => @password, 
-                          :threads => THREADS)
+                          :password => @password)
     puts "Connection successfull,\nnow proceding with test:"
   end
   
@@ -175,14 +173,14 @@ class TestSambalaMain < Test::Unit::TestCase
 	end
 	
 	def check_queue
-		jobs = 300
+		jobs = 20
 		@log_test.info("Testing queue... (be patient, this will take a couple minutes)")
 		assert_equal(true, @samba.queue_empty?)
 		assert_equal(true, @samba.queue_done?)
 		assert_equal(0,@samba.queue_waiting)
 		
 		files = Array.new(jobs) { |id| "file_" + id.to_s }
-		content = "01" * 10000
+		content = "01" * 10000000
 		files.each do |file|
 			f = File.new("#{TESTDIR}/#{file}",'w')
 			f.puts content
@@ -211,11 +209,11 @@ class TestSambalaMain < Test::Unit::TestCase
 		result = @samba.queue_completed
 		@log_test.debug("queue completed results is: #{result.inspect}")
 		assert_kind_of(Array,result)
-		60.times do |n|
+		301.times do |n|
 			break unless result[0].nil?
 			sleep 1
 			result = @samba.queue_completed
-			flunk("Could not get any queue done...") if n == 59 
+			flunk("Could not get any queue done...") if n == 300
 		end
 		assert_kind_of(Array,result[0])
 		assert_equal(4,result[0].size)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sambala
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -04:00
+date: 2009-03-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency