abundance 1.3.3 → 1.3.4

data/lib/garden_cycles.rb

@@ -177,13 +177,13 @@ class Garden
 	
        case message_block[1]
        when :progress
-         value = @crops.size.to_f / (@crops.size + @sprouts.compact.size + @seeds.size)
+         value = @crops.compact.size.to_f / (@crops.compact.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
+				@seeds.empty? && @sprouts.compact.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
+				@seeds.empty? && @sprouts.compact.empty? && @crops.compact.empty? ? message_block[2] = true : message_block[2] = false
        when :seed
          message_block[2] = @seeds.size
        when :sprout

data/test/tc_high_api.rb

@@ -50,7 +50,6 @@ 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
@@ -70,14 +69,6 @@ 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)
@@ -133,7 +124,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")

data/test/tc_queue.rb

@@ -0,0 +1,54 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require 'test/unit'
+require 'abundance'
+
+class TestQueue < Test::Unit::TestCase
+	
+	def setup
+		@rows = 4
+		set_gardener	
+	end
+	
+	def test_queue
+		check_empty(true)
+		check_finished(true)
+		seed_lots
+		check_empty(false)
+		check_finished(false)
+		@g.harvest(:full_crop)
+		check_empty(true)
+		check_finished(true)
+	end
+	
+	def teardown
+		@g.close
+	end
+	
+	private
+	
+	def set_gardener
+    @g = Abundance.gardener(:rows => @rows, :init_timeout => 3) do
+      Abundance.init_status(true,Process.pid)
+      Abundance.grow do |seed|
+				sprout = seed.sprout
+				Array.new(100000,01).join
+        seed.crop(true, "gardener1: #{sprout}")
+      end      
+    end
+  end
+
+	def seed_lots
+		20.times do |num|
+			@g.seed(num.to_s)
+		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
+	
+end

data/test/ts_abundance.rb

@@ -1,6 +1,8 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'test/unit'
+
 require 'test/tc_high_api'
 require 'test/tc_robustness'
 require 'test/tc_multi_gardener'
-require 'test/tc_burst'
+require 'test/tc_burst'
+require 'test/tc_queue'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: abundance
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors: 
 - Louis-Philippe Perron
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -05:00
+date: 2009-02-06 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - test/tc_burst.rb
 - test/tc_high_api.rb
 - test/tc_multi_gardener.rb
+- test/tc_queue.rb
 - test/tc_robustness.rb
 - test/ts_abundance.rb
 has_rdoc: true