sambala 0.9.0 → 0.9.1

data/lib/sambala.rb

@@ -20,6 +20,25 @@
 # with the +queue_results+ method, returning an array containing your commands and their respective results.
 #
 # When in doubt about what each command does, please refer to smbclient man page for help.
+# ///////////////////////////////////////////////////////////////////////////////////////
+# 
+# Example:
+# 
+#   samba = Sambala.new(  :domain   =>  'NTDOMAIN', 
+#                       :host     =>  'sambaserver',
+#                       :share    =>  'sambashare',
+#                       :user     =>  'walrus', 
+#                       :password =>  'eggman', 
+#                       :threads  =>  2 )
+#                       
+#   samba.cd('myfolder')   # =>  true
+#   samba.put(:from => 'aLocalFile.txt')    # =>  [false, "aLocalFile.txt does not exist\r\n"]
+#   
+# 
+# For detailed documentation refer to the online ruby-doc:
+# http://sambala.rubyforge.org/ruby-doc/
+# 
+# ///////////////////////////////////////////////////////////////////////////////////////
 # 
 # Author:: lp (mailto:lp@spiralix.org)
 # Copyright:: 2008 Louis-Philippe Perron - Released under the terms of the MIT license
@@ -56,7 +75,7 @@ class Sambala
       @options = options; gardener_ok
     rescue
       @gardener.close unless @gardener.nil? || @gardener.class != 'Gardener'
-      raise RuntimeError.exception("Unknown Process Failed!!")
+      raise RuntimeError.exception("Unknown Process Failed!! (#{$!.to_s})")
     end
   end
 
@@ -68,7 +87,7 @@ class Sambala
   # === Example
   #   samba.cd('aFolder/anOtherFolder/')   # =>  true
   def cd(to='.')
-		execute_all('cd',to)
+		execute_all('cd',clean_path(to))
   end
   
   # The +du+ instance method does exactly what _du_ usually does: estimates file space usage.
@@ -117,7 +136,7 @@ class Sambala
   #   samba.get(:from => 'aFile.txt')   # => [true, "getting file \\aFile.txt.rb of size 3877 as test.rb (99.6 kb/s) (average 89.9 kb/s)\r\n"]
   def get(opts={:from => nil, :to => nil, :queue => false})
     opts[:to].nil? ? strng = opts[:from] : strng = opts[:from] + ' ' + opts[:to]
-    execute('get', strng, opts[:queue])
+    execute('get', clean_path(strng), opts[:queue])
   end
   
   # The +lcd+ instance method changes the current working directory on the local machine to the directory specified. 
@@ -128,7 +147,7 @@ class Sambala
   # === Example
   #   samba.lcd('aLocalFolder/anOtherFolder/')   # => true
   def lcd(to='.')
-		execute_all('lcd', to)
+		execute_all('lcd', clean_path(to))
   end
   
   # The +lowercase+ method toggles lowercasing of filenames for the get command.
@@ -188,7 +207,7 @@ class Sambala
   # === Example
   #   samba.mkdir('aFolder/aNewFolder')  # => true
   def mkdir(path, queue=false)
-    execute('mkdir' ,path, queue)[0]
+    execute('mkdir' , clean_path(path), queue)[0]
   end
   alias md mkdir
   
@@ -218,7 +237,7 @@ class Sambala
 
   def put(opts={:from => nil, :to => nil, :queue => false})
     opts[:to].nil? ? strng = opts[:from] : strng = opts[:from] + ' ' + opts[:to]
-    execute('put' ,strng, opts[:queue])
+    execute('put' , clean_path(strng), opts[:queue])
   end
   
   # The +recurse+ method toggles directory recursion
@@ -240,7 +259,7 @@ class Sambala
   # === Example
 	# 	samba.rmdir('mydir')		# => true
 	def rmdir(path,queue=false)
-		execute('rmdir' , path, queue)[0]
+		execute('rmdir' , clean_path(path), queue)[0]
 	end
   
   # The +volume+ method returns remote volume information.

data/lib/sambala_gardener.rb

@@ -13,6 +13,19 @@ class Sambala
   module Gardener
 		require 'timeout'
     
+		# The +clean_path+ method cleans the slashes, as backslashes, for the Windows servers.
+		# === Parameters
+		# * _path_ = the path to be cleaned
+		# === Example
+		# 	cleaned = clean_path('/My/Path/')		# => '\My\Path'
+		def clean_path(path)
+			if @posix_support
+				return path
+			else
+				return path.gsub(/\//,'\\')
+			end
+		end
+		
     # The +execute+ method splits the execution according to the operation mode: queue or interactive.
     # === Parameters
     # * _command_ = the command as a string
@@ -68,15 +81,16 @@ class Sambala
           init_gardener; sleep 1
 					begin
 						Timeout.timeout(2) { @init_status = @gardener.init_status }
-						init = @init_status
+						init = Array.new(@init_status)
           	init.map! { |result| result[:success] }
           	throw :gardener if init.uniq.size == 1 and init[0] == true
 					rescue Timeout::Error
 					end
 					kill_gardener_and_incr
         end
-        raise SmbInitError.exception("Couldn't set smbclient properly")
+        raise SmbInitError.exception("Couldn't set smbclient properly (#{$!.to_s})")
       end
+			@posix_support = posix?(@init_status[0][:message])
     end
 
     # The +init_gardener+ method initialize a gardener class object
@@ -138,6 +152,14 @@ class Sambala
       @options[:threads] -= 1 unless @options[:threads] == 1; @options[:init_timeout] += 1
 		end
 		
+		def posix?(init_message)
+			if init_message =~ /windows/i
+				return false
+			else
+				return true
+			end
+		end
+		
   end
   
 end

data/test/tc_sambala_main.rb

@@ -4,7 +4,7 @@ require 'sambala'
 
 TESTFILE = 'sambala_test'
 TESTDIR = 'sambala_temp'
-WELCOME = "
+WELCOME = <<TITLE
   .|'''.|                     '||              '||          
   ||..  '   ....   .. .. ..    || ...   ....    ||   ....   
    ''|||.  '' .||   || || ||   ||'  || '' .||   ||  '' .||  
@@ -12,7 +12,8 @@ WELCOME = "
  |'....|'  '|..'|' .|| || ||.  '|...'  '|..'|' .||. '|..'|' 
 
 
-/////////////////////////////////////////////////////////////"
+/////////////////////////////////////////////////////////////
+TITLE
 
 class TestSambalaMain < Test::Unit::TestCase
   
@@ -31,7 +32,7 @@ class TestSambalaMain < Test::Unit::TestCase
 		ls_two = check_ls
 		assert(ls_one != ls_two)
 		check_lcd_put_get
-		# check_exist
+
 		check_cd('..')
 		check_rmdir(TESTDIR)
   end
@@ -125,6 +126,8 @@ class TestSambalaMain < Test::Unit::TestCase
 		assert_kind_of(Array,re)
 		assert_equal(true,re[0])
 		
+		check_exist(TESTFILE)
+		
 		@samba.local("rm #{TESTFILE}")
 		after2_2 = @samba.local('ls')
 		assert(before2 == after2_2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sambala
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-28 00:00:00 -05:00
+date: 2009-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: 1.3.2
     version: 
 description: 
 email: lp@spiralix.org