sambala 0.9.6 → 0.9.7

data/lib/sambala.rb

@@ -84,7 +84,7 @@ class Sambala
   # === Example
   #   samba.cd('aFolder/anOtherFolder/')   # =>  true
   def cd(to='.')
-		execute_all('cd',clean_path(to))
+		execute('cd',clean_path(to))[0]
   end
   
   # The +du+ instance method does exactly what _du_ usually does: estimates file space usage.
@@ -144,7 +144,7 @@ class Sambala
   # === Example
   #   samba.lcd('aLocalFolder/anOtherFolder/')   # => true
   def lcd(to='.')
-		execute_all('lcd', to)
+		execute('lcd', to)[0]
   end
   
   # The +lowercase+ method toggles lowercasing of filenames for the get command.
@@ -155,7 +155,7 @@ class Sambala
   # === Example
   #   samba.lowercase   # => true      # toggle from files all UPPERCASE to all lowercase
   def lowercase
-    execute_all('lowercase' ,'')
+    execute('lowercase' ,'')[0]
   end
   
   # The method +ls+ or its alias _dir_, list the files and directories matching :mask in the current working directory on the smb server.
@@ -179,7 +179,7 @@ class Sambala
   # === Example
   #   samba.mask('filter*')  # => true
   def mask(mask)
-    execute_all('mask' ,mask)
+    execute('mask' ,mask)[0]
   end
   
   # The +mget+ method copy all files matching :mask from the server to the client machine
@@ -244,7 +244,7 @@ class Sambala
   # === Example
   #   samba.recurse   # => true
   def recurse
-    execute_all('recurse' ,'')
+    execute('recurse' ,'')[0]
   end
 
 	# The +rmdir+ method deletes the specified directory

data/lib/sambala_gardener.rb

@@ -33,23 +33,9 @@ class Sambala
     # * _queue_ = the command operation mode
     # === Example
     #   result = execute('cd','dir/otherDir*',false)  # =>  true
-    def execute(command,data,queue)
+    def execute(command,data,queue=false)
       (queue.is_a? TrueClass) ? exec_queue(command,data) : exec_interactive(command,data)
     end
-    
-    # The +execute_all+ method does a special command invocation where all smbclient workers running in parallel
-    # are all sent the same command.  The method returns one boolean value for all workers success.
-    # === Parameters
-    # * _command_ = the command as a string
-    # * _data_ = the command argument as a string
-    # === Example
-    #   result = execute_all('mask','match*')   # =>  true
-    def execute_all(command,data)
-      result = @gardener.seed_all("#{command} #{data}")
-			$log_sambala.debug("execute_all result") {"#{result.inspect}"}
-      bools = result.map { |row| row[:success] }
-      bools.uniq.size == 1 ? true : false
-    end
 
     # The +exec_interactive+ method follows +execute+ when queue=false.
     # === Parameters

data/test/tc_sambala_main.rb

@@ -20,7 +20,7 @@ TITLE
 class TestSambalaMain < Test::Unit::TestCase
   
   def setup
-		@log_test = GlobaLog.logger(STDERR,:info)
+		@log_test = GlobaLog.logger(STDERR,:info,true)
     check_smbclient_presence
     get_samba_param_from_input
     init_sambala
@@ -173,7 +173,7 @@ class TestSambalaMain < Test::Unit::TestCase
 	end
 	
 	def check_queue
-		jobs = 20
+		jobs = 30
 		@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?)
@@ -201,6 +201,12 @@ class TestSambalaMain < Test::Unit::TestCase
 		result = @samba.queue_processing
 		@log_test.debug("queue processing result is: #{result.inspect}")
 		assert_kind_of(Array,result)
+		301.times do |n|
+			break unless result[0].nil?
+			sleep 1
+			result = @samba.queue_completed
+			flunk("Could not get any queue done...") if n == 300
+		end
 		assert_kind_of(Array,result[0])
 		assert_equal(2,result[0].size)
 		assert_kind_of(Integer,result[0][0])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sambala
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Louis-Philippe Perron