abundance 1.0.1 → 1.0.2

data/lib/abundance.rb

@@ -63,6 +63,7 @@ class Abundance
   #     results = processor.parse(command) 
   #     seed.crop( true, results)  
   #   end
+  #  
   #  end
   # 
   #  id1 = gardener.seed('command1')
@@ -92,3 +93,4 @@ class Abundance
   end
   
 end
+

data/lib/garden.rb

@@ -3,8 +3,9 @@
 # The Garden is where the thread concurency is implemented,
 # offering itself as a thread queue manager,
 # dispatching seeds from the Gardener to its Rows child class and back again.
-# Since Ruby doesn't implement Native Threads, and only Native Threads scales to multi-core execution,
-# the way to implement concurent execution is through splitting the task at hand between multiple single threaded parallel executions.
+# it does so using its child class, the Rows.  Since Ruby doesn't implement Native Threads,
+# and only Native Threads scales to multi-core execution, the way to implement concurent execution is
+# through splitting the task at hand between multiple single threaded parallel executions.
 # The Rows system does exactly that, using the Ruby fork function, then connecting the isolated running
 # processes to the Garden, through a simple socket system provided by the Toolshed Module.
 # 
@@ -77,7 +78,8 @@ class Garden
         when :growth
           case data
           when :progress
-            progress = sprintf( "%.2f", @crops.size.to_f / (@crops.size + @sprouts.compact.size + @seeds.size))
+            value = @crops.size.to_f / (@crops.size + @sprouts.compact.size + @seeds.size)
+            value = 1 if value.nan?; progress = sprintf( "%.2f", value)
             socket_server_send(command,progress,clientaddr,clientport)
           when :seed
             socket_server_send(command,@seeds.size,clientaddr,clientport)
@@ -98,10 +100,12 @@ class Garden
             socket_server_send(command,@sprouts.compact,clientaddr,clientport)
           when :crop
             socket_server_send(command,@crops,clientaddr,clientport)
+            @crops.clear
           else
             if data.is_a? Integer
               if @crops[data]
                 socket_server_send(command,@crops[data],clientaddr,clientport)
+                @crops[data] = nil
               else
                 @harvest[data] = {:clientaddr => clientaddr, :clientport => clientport}
               end

data/lib/gardener.rb

@@ -20,17 +20,13 @@ class Gardener
   
   # The +new+ class method initializes the class.
   # As part of the Abundance lib, Gardener is not initialized directly, 
-  # but rather through +Abundance.gardener+.
+  # but rather through Abundance.gardener.
   # === Parameters
   # * :seed_size = allowed seed size in bytes
   # * :rows = garden rows number, the number of concurent threads
   # * :init_timeout = allow to pause execution to allow for larger gardens to initialize
   # === Example
-  #  gardener = Gardener.new({:seed_size => 1024, :rows => 6, :init_timeout => 1}) do
-  #   Abundance.grow do |seed|
-  #     seed.crop(`#{seed.sprout}`)
-  #   end
-  #  end  
+  #  gardener = Gardener.new({:seed_size => 1024, :rows => 6, :init_timeout}) { your_special_garden function }
   # 
   
   def initialize(options,gardener_block)
@@ -47,7 +43,7 @@ class Gardener
   # === Parameter
   # * _command_ = a ruby expression or object
   # === Example
-  #  id_seed_1 = gardener.seed('ruby -v')
+  #  id_seed_1 = gardener.seed(system 'ruby -v')
   
   def seed(command)
     command, data = socket_client_perm_duplex(:seed,command)
@@ -70,17 +66,19 @@ class Gardener
     return data
   end
   
-  # The +harvest+ method for the Gardener instance allow to get arrays of results for each queue level
+  # The +harvest+ method for the Gardener instance allow to get arrays of results for each queue level.
+  # It has two different behaviour on queue data, one for ripe elements where it removes them from crop array ( on _seedID_ and :crop invocations ),
+  # for all other methods of invocation it leaves the queue intact.
   # === Parameter
   # The parameter given as a symbol specifies the level of queue results you wish to get:
-  # * _seedID_ = return the result for a specific seed, if seed hasn't processed it wait until completed
-  # * :crop = return an array of seed for which process has completed
+  # * seedID = return the result for a specific seed, if seed hasn't processed it wait until completed, _seedID_ is removed from crop array
+  # * :crop = return an array of seed for which process has completed, empties the crop array.
   # * :sprout = return an array of seed actually processing
   # * :seed = return an array of seed waiting to be processed
   # * :all = return a hash of respective arrays for crops, sprouts and seeds
   # === Example
-  #  puts "result is: #{gardener.harvest(id_seed_1)}  #  => result is: ruby 1.8.6 (2007-09-24 patchlevel 111) [universal-darwin9.0]
-   
+  #  seed1_result = gardener.harvest(id_seed_1)
+  
   def harvest(crop)
     command, data = socket_client_perm_duplex(:harvest,crop)
     return data

data/lib/seed.rb

@@ -1,7 +1,7 @@
 # This class provides the seed part of the Gardener,Garden,Seed natural design patern
 # 
 # In nature, seed is usually small, and so is this class.
-# No attributes/variables of itself, its only a kind of localized getter/setter class for 
+# No atributes/variables of itself, its only a kind of localized getter/setter class for 
 # the global $seed variable.  Every garden row assess one fork-localized $seed variable, and
 # you get access to it from a +seed+ instance passed to every Abundance.grow iteration.
 # 
@@ -14,7 +14,7 @@ class Seed
   
   # 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
+  # as it gets initialized automatically inside the +Abundance.grow+ method
   
   # The +sprout+ method for the Seed instance allow to get the passed command 
   # from the inside the Abundance.grow block.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: abundance
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-03 00:00:00 -05:00
+date: 2008-12-04 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -26,7 +26,6 @@ files:
 - lib/garden.rb
 - lib/gardener.rb
 - lib/seed.rb
-- lib/test.rb
 - lib/toolshed.rb
 has_rdoc: true
 homepage: http://abundance.rubyforge.org/

data/lib/test.rb

@@ -1,121 +0,0 @@
-require 'pty'
-require 'expect'
-require 'abundance'
-
-# puts "Init pid #{Process.pid}"
-# 
-# g = Abundance.gardener(:seed_size => 8192, :rows => 1, :init_timeout => 1) do
-#   puts "Garden init done, pid: #{Process.pid}"
-#   puts "@@ yield just before growing..."
-#   Abundance.grow do |seed|
-#     puts "@@ yield #{Time.now}: got in here"
-#     puts "@@ yield job: #{seed.sprout}"
-#     seed.crop(true, "Bravo!!gadigooo!!")
-#   end
-#   puts "Garden seeded"  
-# end
-# 
-# g.seed("jobidoo")
-# puts "First chore sent"
-# g.seed("jobidaa")
-# puts "second chore sent"
-# g.seed("jobidob")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidoc")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# id = g.seed("jobidod")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# puts "!!!!!!!!!!!!!!!!!!!!!!!!!! waiting for harvest: #{id.class.to_s}"
-# har = g.harvest(id)
-# puts "!!!!!!!!!!!!!!!!!!!!!!!!!! famous harvest: #{har.inspect}"
-# g.seed("jobidoe")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidof")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidog")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidoh")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidoi")
-# puts "!!! some seeds: #{g.harvest(:seed).inspect}"
-# puts "!!! some sprouts: #{g.harvest(:sprout).inspect}"
-# puts "!!! some crops: #{g.harvest(:crop).inspect}"
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidoj")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidok")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidol")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidom")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# g.seed("jobidon")
-# g.seed("jobidop")
-# g.seed("jobidoq")
-# g.seed("jobidor")
-# g.seed("jobidos")
-# g.seed("jobidot")
-# g.seed("jobidou")
-# g.seed("jobidov")
-# g.seed("jobidow")
-# g.seed("jobidox")
-# g.seed("jobidoy")
-# g.seed("jobidoz")
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# sleep 30
-# puts "!!! some seeds: #{g.harvest(:seed).inspect}"
-# puts "!!! some sprouts: #{g.harvest(:sprout).inspect}"
-# puts "!!! some crops: #{g.harvest(:crop).inspect}"
-# sleep 5
-# puts "!!!!!!!!!!!!!!!!!!!!!!! growth: #{g.growth}"
-# fin = g.close
-# puts "on close #{fin.inspect}"
-
-puts "Init pid #{Process.pid}"
-
-g = Abundance.gardener(:seed_size => 8192, :rows => 1, :init_timeout => 3) do
-  puts "@@ yield just before growing..."
-  PTY.spawn('smbclient //spiralgemini/geminishare goLEELAubu -U leelasheel') do |r,w,pid|
-    w.sync = true
-    $expect_verbose = false
-    
-    r.expect(/.*smb: \\>.*/) do |text|
-      puts "!!! starter: #{text}"
-    end
-    Abundance.grow do |seed|
-      neew = seed.sprout
-      puts "??? will go for: #{neew}"
-      w.print "#{seed.sprout}\n"
-      
-      r.expect(/.*smb: \\>/) do |text|
-        puts "!!! got #{text}"
-        unless text
-          r.expect(/.*smb: \\>/) do |text|
-            puts "!!!2 got #{text}"
-            seed.crop(true, text)
-          end
-        else
-          seed.crop(true, text)
-        end
-        
-      end
-    end
-    
-  end
-end
-
-puts "Garden seeded"
-
-g.seed("ls")
-puts "First chore sent"
-g.seed("pwd")
-puts "second chore sent"
-g.seed("volume")
-g.seed("help")
-g.seed("du")
-g.seed("put inside.rb")
-sleep 20
-# r = g.harvest
-# puts r.inspect
-fin = g.close
-puts fin.inspect