abundance 1.3.2 → 1.3.3

data/lib/garden_cycles.rb

@@ -180,14 +180,18 @@ class Garden
          value = @crops.size.to_f / (@crops.size + @sprouts.compact.size + @seeds.size)
          value = 1 if value.nan?; progress = sprintf( "%.2f", value)
          message_block[2] = progress
+			 when :finished
+				@seeds.empty? && @sprouts.empty? ? message_block[2] = true : message_block[2] = false
+			 when :empty
+				@seeds.empty? && @sprouts.empty? && @crops.empty? ? message_block[2] = true : message_block[2] = false
        when :seed
          message_block[2] = @seeds.size
        when :sprout
          message_block[2] = @sprouts.compact.size
        when :crop
-         message_block[2] = @crops.size
+         message_block[2] = @crops.compact.size
        else
-         message_block[2] = false
+         message_block[2] = "Unknow garden command: growth(#{message_block[1].to_s})"
        end
 
        add_writable(message_block)

data/lib/gardener.rb

@@ -92,6 +92,8 @@ class Gardener
   # === Parameter
   # The parameter given as a symbol specifies the level of growth report you wish to get:
   # * :progress = return actual progress status, scaled between 0.00 and 1.00
+	# * :empty = return true when no seeds are in garden
+	# * :finished = return true when no seeds are waiting or processing
   # * :seed = return total seeds waiting to be processed
   # * :sprout = return total seeds actually in process
   # * :crop = return total seeds for which process has completed

data/test/tc_high_api.rb

@@ -50,6 +50,7 @@ class TestHighAPI < Test::Unit::TestCase
     assert_instance_of(Gardener,@g)
     
     check_init
+		check_empty(true); check_finished(true)
     check_false     
     check_seed_harvest      # leaves no crops in the queue
     check_full_harvest         # also leaves no crops in the queue
@@ -69,6 +70,14 @@ class TestHighAPI < Test::Unit::TestCase
       assert_equal(init[:message],init[:pid],"init :pid should be the row pid, it isn't")
     end
   end
+
+	def check_empty(bool)
+		assert_equal(bool,@g.growth(:empty),"growth :empty does not return #{bool.to_s}")
+	end
+	
+	def check_finished(bool)
+		assert_equal(bool,@g.growth(:finished),"growth :finished does not return #{bool.to_s}")
+	end
   
   def check_false
     id = @g.seed(nil)
@@ -124,7 +133,7 @@ class TestHighAPI < Test::Unit::TestCase
     25.times do |num|
       queue_items[num] = @g.seed(num)
     end
-    
+    check_empty(false); check_finished(false)
     all = @g.harvest(:all)
     assert_kind_of(Hash,all, "the harvest :all method doesn't return a Hash as supposed")
     assert_equal(25,all[:seeds].size + all[:sprouts].size + all[:crops].size, "the harvest :all method returns a total of items not coherent with amount of seeded items")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: abundance
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-02 00:00:00 -05:00
+date: 2009-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: []