sambala 0.8.2 → 0.8.3

data/lib/sambala.rb

@@ -49,8 +49,16 @@ class Sambala
   #                       :password =>  'eggman', 
   #                       :threads  =>  2 )
   def initialize(options={:domain => '', :host => '', :user => '', :password => '', :threads => 1})
-    options[:threads] = 4 if options[:threads] > 4
-    @options = options; init_gardener
+    begin
+      options[:threads] = 4 if options[:threads] > 4
+      options[:init_timeout] = options[:threads] * 2
+      @options = options; gardener_ok
+    rescue SmbInitError
+      raise SmbInitError.exception("Failed smbclient initialisation")
+    rescue
+      @gardener.close unless @gardener.nil? || @gardener.class != 'Gardener'
+      raise RuntimeError.exception("Unknown Process Failed!!")
+    end
   end
   # The +cd+ instance method takes only one argument, the path to which you wish to change directory
   # Its one of the only implemented command where queue mode is not available, for the simple reason that

data/lib/sambala_gardener.rb

@@ -1,4 +1,5 @@
 class Sambala
+  class SmbInitError < StandardError; end
   # The Sambala::Gardener module bings Abundance into Sambala.
   # A bunch of mixins used inside Sambala to access Abundance Non-Blocking Threading.
   # These methods are a higher level abstraction of Abundance methods,
@@ -56,13 +57,27 @@ class Sambala
     def exec_queue(command,data)
       @gardener.seed("#{command} #{data}").integer? ? [true,true] : [false,false]
     end
+    
+    # The +gardener_ok+ method does the +init_gardener+ invocation, degrading the options parameters until
+    # it initializes, or raise SmbInitError exception after 4 try.
+    def gardener_ok
+      init = []
+      catch :gardener do
+        4.times do |num|
+          init_gardener; init = @init_status = @gardener.init_status
+          init.map! { |result| result[:success] }
+          throw :gardener if init.uniq.size == 1 and init[0] == true
+          @gardener.close; @gardener = nil
+          @options[:threads] -= 1 unless @options[:threads] == 1; @options[:init_timeout] += 1
+        end
+        raise SmbInitError.exception("Couldn't set smbclient properly")
+      end
+    end
 
     # The +init_gardener+ method initialize a gardener class object
     def init_gardener
-      # To Implement:
-      # workgroup -W WORKGROUP
-      @gardener = Abundance.gardener(:seed_size => 8192, :rows => @options[:threads], :init_timeout => @options[:threads] + 1) do
-        PTY.spawn("smbclient //#{@options[:host]}/#{@options[:share]} #{@options[:password]} -U #{@options[:user]}") do |r,w,pid|
+      @gardener = Abundance.gardener(:seed_size => 8192, :rows => @options[:threads], :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
           
@@ -70,7 +85,7 @@ class Sambala
             loop do
               r.expect(/.*\xD\xAsmb:[ \x5C]*\x3E.*/) do |text|
                 if text != nil
-                  Abundance.init_status(true,"#{text.inspect}")
+                  text[0] =~ /.*Server=.*/i ? Abundance.init_status(true,"#{text.inspect}") : Abundance.init_status(false,"#{text.inspect}")
                   throw :init
                 end
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sambala
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 -05:00
+date: 2008-12-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency