cukeforker 0.0.2 → 0.0.3

data/lib/cukeforker/version.rb

@@ -1,3 +1,3 @@
 module CukeForker
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/cukeforker/worker_queue.rb

@@ -70,6 +70,28 @@ module CukeForker
       @finished.any? { |w| w.failed? }
     end
 
+    def eta
+      pending  = @pending.size
+      finished = @finished.size
+      running  = @running.size
+
+      remaining = pending + running
+
+      if finished == 0
+        result = [Time.now, remaining, finished]
+        fire :on_eta, *result
+      else
+        seconds_per_child = (Time.now - start_time) / finished.to_f
+        eta = Time.now + (seconds_per_child * remaining)
+
+        result = [eta, remaining, finished]
+
+        fire :on_eta, *result
+      end
+
+      result
+    end
+
     private
 
     def start(worker)
@@ -86,18 +108,6 @@ module CukeForker
       fire :on_worker_finished, worker
     end
 
-    def eta
-      return Time.now if @finished.empty?
-
-      pending = @pending.size
-      finished = @finished.size
-
-      seconds_per_child = (Time.now - start_time) / finished
-      eta = Time.now + (seconds_per_child * pending)
-
-      fire :on_eta, eta, pending + size, finished
-    end
-
     def fire(*args)
       changed
       notify_observers(*args)

data/spec/cukeforker/worker_queue_spec.rb

@@ -113,5 +113,23 @@ module CukeForker
 
       queue.wait_until_finished
     end
+
+    it "estimates the time left" do
+      now = Time.now
+      seconds_per_child = 60
+
+      queue.stub :start_time => now
+      Time.stub :now => now + seconds_per_child
+
+      workers[0..2].each { |w| queue.add w }
+
+      workers[0].stub(:start => nil, :finished? => true)
+      workers[1].stub(:start => nil, :finished? => false)
+      workers[2].stub(:start => nil, :finished? => false)
+
+      queue.fill
+      queue.poll
+      queue.eta.should == [Time.now + seconds_per_child*2, 2, 1]
+    end
   end # WorkerQueue
 end # CukeForker

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jari Bakken