abundance 1.0.6 → 1.0.7

data/lib/abundance.rb

@@ -90,7 +90,7 @@ class Abundance
   
   def Abundance.grow(&grow_block)
     loop do
-      unless $seed.nil? || $seed.include?(:message) 
+      unless $seed.nil? || $seed.include?(:message)
         grow_block.call(Seed.new)
       end
       Thread.stop

data/lib/garden.rb

@@ -31,9 +31,8 @@ class Garden
   
   def initialize
     @pid = fork do
-      @quit = false; @full_crop = false
-      @harvest = []
-      @rows_port = []
+      @quit = false; @full_crop = false; @do_init = false
+      @harvest = []; @rows_port = []; @init_done = []
       @seeds = []; @sprouts = []; @crops = []; @id = 0
       @socket_server = Toolshed.socket_server(Toolshed::garden_port)
       @socket_client_temp = Toolshed.socket_client_temp
@@ -49,6 +48,12 @@ 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
+              end
             else
               throw :fill_rows
             end               
@@ -56,7 +61,7 @@ class Garden
         end
         command, data, clientport, clientname, clientaddr = socket_server_recv
         case command
-        when :seed 
+        when :seed
           @id += 1; @seeds << {:id => @id , :seed => data}
           socket_server_send(command,@id,clientaddr,clientport)
         when :row
@@ -71,7 +76,7 @@ class Garden
             @sprouts[seed[:id]] = seed
           end
           socket_server_send(command,seed,clientaddr,clientport)  
-        when :crop 
+        when :crop
           @sprouts[data[:id]] = nil
           @crops[data[:id]] = data; socket_server_send(command,true,clientaddr,clientport)
           if @harvest[data[:id]]
@@ -127,6 +132,12 @@ class Garden
               socket_server_send(command,false,clientaddr,clientport)
             end
           end
+        when :init
+          @do_init = true;
+          @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])
         when :close
           if data[:level] == :garden
             @seeds_pid = data[:pid]
@@ -185,6 +196,7 @@ class Garden
       @pids = []
       rows.times do
         row_port = Toolshed.available_port
+        @socket_client_perm = Toolshed.socket_client_perm
         @pids << fork do
           @socket_server = Toolshed.socket_server(row_port)
           t1 = Thread.new do
@@ -192,7 +204,6 @@ class Garden
           end
 
           t2 = Thread.new do
-            @socket_client_perm = Toolshed.socket_client_perm
             loop do
               if $seed.nil?
                 command, data = socket_client_perm_duplex(:row,row_port)
@@ -204,15 +215,20 @@ class Garden
                 $seed = data
                 if $seed.nil?
                   command, data, clientport, clientname, clientaddr = socket_server_recv
-                  $seed = data
+                  case command
+                  when :sprout
+                    $seed = data
+                  when :init
+                    command, data = socket_client_perm_duplex(:init_crop,$seed)
+                    $seed = nil;
+                  end
                 end
               elsif $seed.include?(:success)
                 command, data = socket_client_perm_duplex(:crop,$seed)
-                $seed = nil
+                $seed = nil;
               else
                 t1.run
               end
-
             end
           end
           t2.join

data/lib/gardener.rb

@@ -48,7 +48,7 @@ class Gardener
   def init_status
     status = []
     @garden_rows.pids.each do |pid|
-      command, data = socket_client_perm_duplex(:harvest,pid)
+      command, data = socket_client_perm_duplex(:init,pid)
       status << {:success => data[:success], :message => data[:message], :pid => data[:id]}
     end
     return status

data/lib/seed.rb

@@ -11,7 +11,6 @@
 # :title:Seed
 
 class Seed
-  $seed = Hash.new
   # The +new+ class method initializes the class.
   # You don't have to initialize it inside of Abundance,
   # as it gets initialized automatically inside the +Abundance.grow+ method

metadata

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