jcukeforker 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c4cda725d6eb45cd43a193c68ac23c7f245cc8
-  data.tar.gz: fd1a942fa132ed08c30975fe0001ce7322824a7c
+  metadata.gz: 624cde7fd15fb72fdfa5b749dde6041a09695b27
+  data.tar.gz: eb0d4416fe95194e6547de3e0ead5236002d08db
 SHA512:
-  metadata.gz: bbb19abf494360c1180b761ef264e26da1fe9224efdef272c970b77a509e026f4b7d9dda94824990bc696e3d76f43623ceb90b086cd8e0a570550b6488b75fc7
-  data.tar.gz: 7edb4699f193706c4d84df8829b066ae7be0a9d51dedf04d871756a198394c20f7d09546efe58c4e2ecdff6e0d5c10b9953f8cbb490b222d96937b4b23fc264f
+  metadata.gz: bf21e8272ccb037a6691218e5e21f522d1df072cd5e77ed84505dd72b27afa36102c379b91f4fc6be4cf2b6622199ef556a7afda088d280bcb2a165150ec993b
+  data.tar.gz: 2efb490171b37a3e23b47faef16e530df5b6f30080cea84ffee8367c39c2cc71b34a35f4dd88b7ef9e6a56ede4180dfbcecd3ab346d03e0c82bce07eaf455797

data/lib/jcukeforker/abstract_listener.rb

@@ -16,39 +16,15 @@ module JCukeForker
     def on_task_finished(worker_path, feature, status)
     end
 
-    def on_worker_forked(worker)
-    end
-
     def on_worker_register(worker_path)
     end
 
-    def on_worker_waiting(worker_path)
-    end
-
-    def on_worker_dead(worker_path)
-    end
-
     def on_run_interrupted
     end
 
     def on_run_finished(failed)
     end
 
-    def on_display_fetched(server)
-    end
-
-    def on_display_released(server)
-    end
-
-    def on_display_starting(worker_path, display)
-    end
-
-    def on_display_stopping(worker_path, display)
-    end
-
-    def on_eta(time, remaining, finished)
-    end
-
     def update(meth, *args)
       __send__(meth, *args)
     end

data/lib/jcukeforker/logging_listener.rb

@@ -29,7 +29,7 @@ module JCukeForker
     end
 
     def on_run_finished(failed)
-      log.info "[    run           ] finished, #{status_string failed}"
+      log.info "[    run           ] finished, #{status_string !failed}"
     end
 
     def on_run_interrupted

data/lib/jcukeforker/runner.rb

@@ -76,9 +76,9 @@ module JCukeForker
        end
       end
 
-      processes = create_processes(max, port, worker_dir, vnc_pool, opts[:record])
+      processes = create_processes(max, status_server.port, worker_dir, vnc_pool, opts[:record])
 
-      runner = Runner.new status_server, processes, worker_dir, vnc_pool, delay
+      runner = Runner.new status_server, processes, worker_dir, vnc_pool, delay, task_manager
 
       listeners.each { |l|
         status_server.add_observer l
@@ -88,12 +88,13 @@ module JCukeForker
       runner
     end
 
-    def initialize(status_server, processes, worker_dir, vnc_pool, delay)
+    def initialize(status_server, processes, worker_dir, vnc_pool, delay, task_manager)
       @status_server = status_server
       @processes = processes
       @worker_dir = worker_dir
       @vnc_pool = vnc_pool
       @delay = delay
+      @task_manager = task_manager
     end
 
     def run
@@ -151,7 +152,7 @@ module JCukeForker
     ensure # catch potential second Interrupt
       @vnc_pool.stop if @vnc_pool
       FileUtils.rm_r @worker_dir
-      #fire :on_run_finished, @queue.has_failures?
+      fire :on_run_finished, @task_manager.has_failures?
     end
 
     def fire(*args)

data/lib/jcukeforker/status_server.rb

@@ -1,3 +1,4 @@
+require 'socket'
 
 module JCukeForker
   class StatusServer
@@ -5,9 +6,12 @@ module JCukeForker
     include Celluloid::IO
 
     finalizer :shutdown
+    attr_reader :port
 
     def initialize(port = '6333')
-      @server = TCPServer.new 'localhost', port
+      server = ::TCPServer.new 'localhost', port
+      @port = server.connect_address.ip_port
+      @server = TCPServer.from_ruby_server server
     end
 
     def run

data/lib/jcukeforker/task_manager.rb

@@ -6,6 +6,7 @@ module JCukeForker
       @features = features
       @opts = opts
       @worker_sockets = {}
+      @failures = false
     end
 
     def on_worker_register(worker_path)
@@ -14,6 +15,7 @@ module JCukeForker
     end
 
     def on_task_finished(worker_path, feature, status)
+      @failures = @failures || !status
       pop_task worker_path
     end
 
@@ -26,6 +28,10 @@ module JCukeForker
       @worker_sockets.each {|k, v| v.close}
     end
 
+    def has_failures?
+      @failures
+    end
+
     private
 
     def pop_task(worker_path)

data/lib/jcukeforker/version.rb

@@ -1,3 +1,3 @@
 module JCukeForker
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/lib/jcukeforker/worker.rb

@@ -69,7 +69,8 @@ module JCukeForker
       @status.nil? || !@status
     end
 
-    def output
+    def output(format = nil)
+      format = @format if format.nil?
       File.join out, "#{basename}.#{format}"
     end
 
@@ -82,10 +83,9 @@ module JCukeForker
     end
 
     def args
-      args = %W[--format #{format} --out #{output}]
+      args = Array(format).flat_map { |f| %W[--format #{f} --out #{output(f)}] }
       args += @extra_args
       args << feature
-
       args
     end
 

data/spec/jcukeforker/logging_listener_spec.rb

@@ -36,7 +36,7 @@ I, [#{timestamp}]  INFO -- : [    worker  15    ] failed  : foo/baz
 I, [#{timestamp}]  INFO -- : [    worker  1     ] dead    : /tmp/12sd3-1
 I, [#{timestamp}]  INFO -- : [    worker  15    ] dead    : /tmp/12sd3-15
 I, [#{timestamp}]  INFO -- : [    run           ] interrupted - please wait
-I, [#{timestamp}]  INFO -- : [    run           ] finished, failed
+I, [#{timestamp}]  INFO -- : [    run           ] finished, passed
       OUTPUT
     end
   end # Worker

data/spec/jcukeforker/runner_spec.rb

@@ -15,8 +15,8 @@ module JCukeForker
         features  = %w[a b]
         delay     = 1
 
-        mock_task_manager = double(TaskManager, :update => nil)
-        mock_status_server = double(StatusServer)
+        mock_task_manager = double(TaskManager, :update => nil, :has_failures? => false)
+        mock_status_server = double(StatusServer, :port => nil)
         mock_tasks = Array.new(2) { |n| double("Worker-#{n}") }
 
         TaskManager.should_receive(:new).with(features, {format: format, out: out, extra_args: []}).and_return mock_task_manager
@@ -52,7 +52,9 @@ module JCukeForker
       let(:process) { double(ChildProcess, :start => nil, :wait => nil) }
       let(:work_dir) { '/tmp/jcukeforker-testdir' }
       let(:vnc_pool) { double(VncTools::ServerPool, :stop => nil) }
-      let(:runner)   { Runner.new(status_server, [process], work_dir, vnc_pool, 0) }
+      let(:mock_task_manager) { double(TaskManager, :update => nil, :has_failures? => false) }
+      let(:runner)   { Runner.new(status_server, [process], work_dir, vnc_pool, 0, mock_task_manager) }
+
 
       it "processes the queue" do
         runner.add_observer listener

data/spec/jcukeforker/task_manager_spec.rb

@@ -41,5 +41,12 @@ module JCukeForker
       task_manager.instance_variable_get(:@worker_sockets)[worker_path] = mock_socket
       task_manager.on_task_finished worker_path, nil, nil
     end
+
+    it "can detect failure" do
+      task_manager = TaskManager.new []
+      def task_manager.pop_task(*args); end
+      task_manager.on_task_finished worker_path, feature, false
+      task_manager.has_failures?.should == true
+    end
   end
 end

data/spec/jcukeforker/worker_spec.rb

@@ -23,5 +23,19 @@ module JCukeForker
 
       worker.register
     end
+
+    context "running a scenario with multiple report formats" do
+      formats = [ :json, :junit ]
+      path = "some/path"
+
+      it "has an output file for each format specified" do
+        json_str = {'format' => formats, 'feature' => 'some/feature:51', 'extra_args' => [], 'out' => path}.to_json
+        worker.send :set_state, json_str
+        expected_args = formats.flat_map do |f|
+          %W[--format #{f} --out #{path}/some_feature_51.#{f}]
+        end
+        worker.args.each_cons(expected_args.size).include?(expected_args).should be_true
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcukeforker
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jason Gowan
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber