abundance 1.0.8 → 1.0.9

data/lib/abundance.rb

@@ -105,7 +105,7 @@ class Abundance
   # === Example
   #   Abundance.init_status(true,'Initialisation Successfull!!!')
   def Abundance.init_status(success,message)
-    $seed = {:id => Process.pid, :seed => 'init_status', :success => success, :message => message}
+    $init = {:id => Process.pid, :seed => 'init_status', :success => success, :message => message}
   end
   
 end

data/lib/garden.rb

@@ -31,7 +31,7 @@ class Garden
   
   def initialize
     @pid = fork do
-      @quit = false; @full_crop = false; @do_init = false; @seed_all = nil
+      @quit = false; @full_crop = false; @do_init = nil; @seed_all = nil; @init_all_crop = []
       @harvest = []; @rows_port = []; @init_done = []; @seed_all_done = []; @seed_all_crop = []
       @seeds = []; @sprouts = []; @crops = []; @id = 0
       @socket_server = Toolshed.socket_server(Toolshed::garden_port)
@@ -47,6 +47,14 @@ class Garden
               else
                 @rows_port << row_port
               end
+            elsif ! @do_init.nil? && ! @rows_port.empty? && @init_done.size != @do_init
+              row_port = @rows_port.shift
+              unless @init_done.include?( row_port )
+                socket_client_temp(:init,'init_status',row_port)
+                @init_done << row_port
+              else
+                @rows_port << row_port
+              end
             elsif ! @seeds.empty? && ! @rows_port.empty?
               seed = @seeds.shift
               @sprouts[seed[:id]] = seed
@@ -56,14 +64,6 @@ class Garden
               seed = nil
               row_port = @rows_port.shift
               socket_client_temp(:quit,seed,row_port)
-            elsif @do_init && ! @rows_port.empty?
-              row_port = @rows_port.shift
-              unless @init_done.include?( row_port )
-                socket_client_temp(:init,seed,row_port)
-                @init_done << row_port; @do_init = nil
-              else
-                @rows_port << row_port
-              end
             else
               throw :fill_rows
             end               
@@ -143,12 +143,15 @@ class Garden
             end
           end
         when :init
-          @do_init = true
+          @do_init = data
           @init_return = {:clientaddr => clientaddr, :clientport => clientport}
         when :init_crop
           socket_server_send(command,true,clientaddr,clientport)
-          socket_server_send(command,data, @init_return[:clientaddr], @init_return[:clientport])
-          @init_return = Hash.new; @init_done = Array.new
+          @init_all_crop << data
+          if @init_all_crop.size == @do_init
+            socket_server_send(command,@init_all_crop, @init_return[:clientaddr], @init_return[:clientport])
+            @init_return = Hash.new; @init_done = Array.new; @do_init = nil; @init_all_crop = Array.new
+          end
         when :seed_all
           @seed_all = data
           @seed_all_return = {:clientaddr => clientaddr, :clientport => clientport, :data => []}
@@ -244,15 +247,15 @@ class Garden
                     @seed_all = true
                     $seed = {:id => Process.pid, :seed => data}
                   when :init
-                    command, data = socket_client_perm_duplex(:init_crop,$seed)
-                    $seed = nil;
+                    $init = {:seed => 'init_status', :message => 'No Init Message', :id => Process.pid} if $init.nil?
+                    command, data = socket_client_perm_duplex(:init_crop,$init)
                   end
                 end
-              elsif $seed.include?(:success)
+              elsif ! $seed[:success].nil?
                 if @seed_all
                   command, data = socket_client_perm_duplex(:seed_all_crop,$seed)
                   @seed_all = false
-                else 
+                else
                   command, data = socket_client_perm_duplex(:crop,$seed)
                 end
                 $seed = nil;

data/lib/gardener.rb

@@ -46,12 +46,11 @@ class Gardener
   # === Example
   #   puts gardener.init_status.inspect   # => [{:message=>"init ok", :success=>true, :pid=>4760}, {:message=>"init failed", :success=>false, :pid=>4761}] 
   def init_status
-    status = []
-    @garden_rows.pids.each do |pid|
-      command, data = socket_client_perm_duplex(:init,pid)
-      status << {:success => data[:success], :message => data[:message], :pid => data[:id]}
+    command, data = socket_client_perm_duplex(:init,@garden_rows.pids.size)
+    data.map! do |row|
+      {:success => row[:success], :message => row[:message], :pid => row[:id]}
     end
-    return status
+    return data
   end
   
   # The +seed+ method for the Gardener instance allow to sow a command in the Gardener's Garden.

metadata

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