cukeforker 0.0.5 → 0.0.6

data/lib/cukeforker.rb

@@ -6,6 +6,7 @@ end
 require "cucumber/cli/main"
 require "fileutils"
 require "observer"
+require "ostruct"
 
 module CukeForker
 end

data/lib/cukeforker/abstract_listener.rb

@@ -10,6 +10,9 @@ module CukeForker
     def on_worker_finished(worker)
     end
 
+    def on_worker_forked(worker)
+    end
+
     def on_run_interrupted
     end
 

data/lib/cukeforker/logging_listener.rb

@@ -16,6 +16,10 @@ module CukeForker
       log.info "[    worker  #{worker.id.to_s.ljust 3}   ] starting: #{worker.feature}"
     end
 
+    def on_worker_forked(worker)
+      log.info "[    worker  #{worker.id.to_s.ljust 3}   ] forked  : #{worker.feature}"
+    end
+
     def on_worker_finished(worker)
       log.info "[    worker  #{worker.id.to_s.ljust 3}   ] #{status_string(worker.failed?).ljust(8)}: #{worker.feature}"
     end

data/lib/cukeforker/version.rb

@@ -1,3 +1,3 @@
 module CukeForker
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/cukeforker/vnc_listener.rb

@@ -5,12 +5,16 @@ module CukeForker
     end
 
     def on_worker_starting(worker)
-      worker.vnc = @pool.get
+      worker.data.vnc = @pool.get
     end
 
     def on_worker_finished(worker)
       @pool.release worker.vnc
-      worker.vnc = nil
+      worker.data.vnc = nil
+    end
+
+    def on_worker_forked(worker)
+      ENV['DISPLAY'] = worker.data.vnc.display
     end
 
     def on_run_finished(failed)

data/lib/cukeforker/worker.rb

@@ -1,19 +1,21 @@
 module CukeForker
   class Worker
+    include Observable
+
     class << self
        attr_writer :id
        def id; @id ||= -1; end
      end
 
-    attr_reader :status, :feature, :pid, :format, :out, :id
-    attr_accessor :vnc
+    attr_reader :status, :feature, :pid, :format, :out, :id, :data
 
     def initialize(feature, format, out, extra_args = [])
       @feature      = feature
       @format       = format
       @extra_args   = extra_args
       @out          = out
-      @status, @vnc = nil
+      @status       = nil
+      @data         = OpenStruct.new
 
       @id = self.class.id += 1
     end
@@ -30,7 +32,11 @@ module CukeForker
     end
 
     def start
-      @pid = Process.fork { execute_cucumber }
+      @pid = Process.fork {
+        changed
+        notify_observers :on_worker_forked, self
+        execute_cucumber
+      }
     end
 
     def args
@@ -47,7 +53,7 @@ module CukeForker
         #{feature}
         #{status.inspect}
         #{out}
-        #{vnc && vnc.display}
+        #{data}
        ]"
     end
 

data/lib/cukeforker/worker_queue.rb

@@ -92,6 +92,11 @@ module CukeForker
       result
     end
 
+    def add_observer(observer)
+      @pending.each { |e| e.add_observer observer }
+      super
+    end
+
     private
 
     def start(worker)

data/spec/cukeforker/logging_listener_spec.rb

@@ -18,7 +18,9 @@ module CukeForker
       listener.on_display_starting mock_display
       listener.on_display_fetched mock_display
       listener.on_worker_starting mock_worker
+      listener.on_worker_forked mock_worker
       listener.on_worker_starting mock_worker2
+      listener.on_worker_forked mock_worker2
       listener.on_eta Time.now, 10, 255
       listener.on_worker_finished mock_worker
       listener.on_worker_finished mock_worker2
@@ -34,7 +36,9 @@ I, [#{timestamp}]  INFO -- : [    run           ] starting
 I, [#{timestamp}]  INFO -- : [    display       ] starting
 I, [#{timestamp}]  INFO -- : [    display :5    ] fetched
 I, [#{timestamp}]  INFO -- : [    worker  1     ] starting: foo/bar
+I, [#{timestamp}]  INFO -- : [    worker  1     ] forked  : foo/bar
 I, [#{timestamp}]  INFO -- : [    worker  15    ] starting: foo/baz
+I, [#{timestamp}]  INFO -- : [    worker  15    ] forked  : foo/baz
 I, [#{timestamp}]  INFO -- : [    eta     10/255] #{Time.now.strftime "%Y-%m-%d %H:%M:%S"}
 I, [#{timestamp}]  INFO -- : [    worker  1     ] passed  : foo/bar
 I, [#{timestamp}]  INFO -- : [    worker  15    ] failed  : foo/baz

data/spec/cukeforker/vnc_listener_spec.rb

@@ -2,14 +2,14 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 module CukeForker
   describe VncListener do
-    let(:server)    { mock(VncServer)       }
-    let(:pool)      { mock(VncServerPool)   }
-    let(:worker)    { mock(Worker)          }
-    let(:listener)  { VncListener.new pool }
+    let(:server)    { mock(VncServer, :display => ":15")    }
+    let(:pool)      { mock(VncServerPool)                   }
+    let(:worker)    { mock(Worker, :data => OpenStruct.new) }
+    let(:listener)  { VncListener.new pool                  }
 
     it "fetches a display from the pool and assings it to the worker" do
       pool.should_receive(:get).and_return(server)
-      worker.should_receive(:vnc=).with server
+      worker.data.should_receive(:vnc=).with server
 
       listener.on_worker_starting worker
     end
@@ -17,7 +17,7 @@ module CukeForker
     it "releases the display and removes it from the worker" do
       worker.should_receive(:vnc).and_return server
       pool.should_receive(:release).with server
-      worker.should_receive(:vnc=).with(nil)
+      worker.data.should_receive(:vnc=).with(nil)
 
       listener.on_worker_finished worker
     end
@@ -28,5 +28,12 @@ module CukeForker
       listener.on_run_finished(true)
     end
 
+    it "sets DISPLAY after the worker is forked" do
+      worker.data.should_receive(:vnc).and_return(server)
+      ENV.should_receive(:[]=).with("DISPLAY", ":15")
+
+      listener.on_worker_forked worker
+    end
+
   end # VncListenerServer
 end # CukeForker

data/spec/cukeforker/worker_queue_spec.rb

@@ -67,6 +67,17 @@ module CukeForker
       queue.poll
     end
 
+    it "adds observers to pending workers" do
+      listener = AbstractListener.new
+
+      workers.each { |w|
+        w.should_receive(:add_observer).with(listener)
+        queue.add w
+      }
+
+      queue.add_observer listener
+    end
+
     it "knows if any of the workers failed" do
       workers.each { |w| queue.add w }
 

data/spec/cukeforker/worker_spec.rb

@@ -50,8 +50,11 @@ module CukeForker
       worker.start
     end
 
-    it "sets DISPLAY if a VNC server is set" do
-      worker.vnc = mock(VncServer, :display => ":5")
+    it "fires an event after forking" do
+      mock_listener = mock(AbstractListener)
+      mock_listener.should_receive(:update).with(:on_worker_forked, worker)
+
+      worker.add_observer mock_listener
 
       Process.should_receive(:fork).and_yield.and_return(1234)
       $stdout.should_receive(:reopen).with("some/path/some_feature.stdout")
@@ -59,8 +62,6 @@ module CukeForker
       Cucumber::Cli::Main.should_receive(:execute).and_return(false)
       worker.should_receive(:exit).with(0)
 
-      ENV.should_receive(:[]=).with("DISPLAY", ":5")
-
       worker.start
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jari Bakken