jcukeforker 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32563d887a984beb002a2661539769d5908beeb3
-  data.tar.gz: 602298483da878759729ab39644dfae2058012d9
+  metadata.gz: 16336863494d6a228e277b0a66de9bcca02a1527
+  data.tar.gz: dba852dd02f74272edd6f4c645e21ff1906ec2b3
 SHA512:
-  metadata.gz: f956f1cc6927646155a24209b2b796a058818a39ca038df79e7f4de673ea15803840a8bba9f638d6dd658c2a6c8c0f34b5a76bcd474321e50404561249d2345e
-  data.tar.gz: 4245453e0c2a25cc5cfe430932cf499fbd4fbeb2ff6fa312c2724b380543b6981ab8eeb7f8cbd86c6c5771fb01a044a1b816ffd73efdbfc79d19c941fbc0d0f1
+  metadata.gz: 65c45703a692fd01c9b0a64985bb3ffd821f94a730dea820075fed343df2afa0e649e91d9fffb3df9f2674914be1d6f7b81b8d0dc0f401f0fc165b330f9a6ae1
+  data.tar.gz: 7fd90ad2eaa840999db8557bf50d890429dfe151c4b8fadfc05c8802d7e4389e73a7ad5911f73d9ef1d2e539504ff89dc82aef9f6b2b844d3a6de881fb512490

data/README.mdown

@@ -24,7 +24,7 @@ to avoid this.
 
     # parallelize per scenario, with one JUnit XML file per scenario.
     JCukeForker::Runner.run JCukeForker::Scenarios.tagged(%W[@edition ~@wip])
-                           :extra_args => %W[-f CukeForker::Formatters::JunitScenarioFormatter --out results/junit]
+                           :extra_args => %W[-f JCukeForker::Formatters::JunitScenarioFormatter --out results/junit]
 ```
 
 Note on Patches/Pull Requests

data/lib/jcukeforker/logging_listener.rb

@@ -39,8 +39,8 @@ module JCukeForker
 
     private
 
-    def status_string(failed)
-      failed == 'false' ? 'failed' : 'passed'
+    def status_string(status)
+      status ? 'passed' : 'failed'
     end
 
     def worker_id(worker_path)

data/lib/jcukeforker/recording_vnc_listener.rb

@@ -5,7 +5,7 @@ module JCukeForker
     attr_reader :output
 
     def initialize(worker, opts = {})
-      @ext      = opts[:codec] || "webm"
+      @ext      = opts['ext'] || "webm"
       @options  = opts
       @worker = worker
 
@@ -23,7 +23,7 @@ module JCukeForker
         raise 'ffmpeg failed'
       end
 
-      unless worker.failed?
+      if status
         FileUtils.rm_rf output
       end
 
@@ -46,10 +46,10 @@ module JCukeForker
         '-an',
         '-y',
         '-f', 'x11grab',
-        '-r', @options[:frame_rate] || '5',
-        '-s', @options[:frame_size] || '1024x768',
+        '-r', @options['frame_rate'] || '5',
+        '-s', @options['frame_size'] || '1024x768',
         '-i', ENV['DISPLAY'],
-        '-vcodec', @options[:codec] || 'vp8',
+        '-vcodec', @options['codec'] || 'vp8',
         @output
       )
       process.io.stdout = process.io.stderr = File.open('/dev/null', 'w')

data/lib/jcukeforker/runner.rb

@@ -19,7 +19,8 @@ module JCukeForker
   #   :format     => Symbol            format passed to `cucumber --format` (default: html)
   #   :extra_args => Array             extra arguments passed to cucumber
   #   :delay      => Numeric           seconds to sleep between each worker is started (default: 0)
-  #
+  #   :port       => String            port that the event server runs on
+  #   (default: 6333)
 
   class Runner
     include Observable
@@ -32,7 +33,8 @@ module JCukeForker
       :out    => Dir.pwd,
       :log    => true,
       :format => :html,
-      :delay  => 0
+      :delay  => 0,
+      :port   => '6333'
     }
 
     def self.run(features, opts = {})
@@ -48,6 +50,7 @@ module JCukeForker
       listeners  = Array(opts[:notify])
       extra_args = Array(opts[:extra_args])
       delay      = opts[:delay]
+      port       = opts[:port]
 
       if opts[:log]
         listeners << LoggingListener.new
@@ -59,7 +62,7 @@ module JCukeForker
       end
 
       listeners << task_manager
-      status_server = StatusServer.new '6333'
+      status_server = StatusServer.new port
       worker_dir = "/tmp/jcukeforker-#{SecureRandom.hex 4}"
       FileUtils.mkdir_p worker_dir
 
@@ -74,7 +77,7 @@ module JCukeForker
        end
       end
 
-      processes = create_processes(max, '6333', worker_dir, vnc_pool, opts[:record])
+      processes = create_processes(max, port, worker_dir, vnc_pool, opts[:record])
 
       runner = Runner.new status_server, processes, worker_dir, vnc_pool, delay
 
@@ -101,7 +104,8 @@ module JCukeForker
     rescue Interrupt
       fire :on_run_interrupted
       stop
-    rescue StandardError
+    rescue StandardError => e
+      $stderr.puts e.backtrace
       fire :on_run_interrupted
       stop
       raise
@@ -115,8 +119,11 @@ module JCukeForker
       (1..max).inject([]) do |l, i|
         process_args = %W[ruby #{worker_file} #{status_path} #{worker_dir}/worker-#{i}]
         if vnc_pool && record
-          record = {} unless record.kind_of? Hash
-          process_args << record.to_json
+          if record.kind_of? Hash
+            process_args << record.to_json
+          else
+            process_args << {}.to_json
+          end
         end
         process = ChildProcess.build(*process_args)
         process.environment['DISPLAY'] = vnc_pool.get.display if vnc_pool

data/lib/jcukeforker/version.rb

@@ -1,3 +1,3 @@
 module JCukeForker
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/jcukeforker/worker.rb

@@ -7,18 +7,20 @@ require 'observer'
 require 'childprocess'
 require_relative './abstract_listener'
 require_relative './recording_vnc_listener'
+require_relative './formatters/scenario_line_logger'
+require_relative './formatters/junit_scenario_formatter'
 
 module JCukeForker
   class Worker
     include Observable
 
-    attr_reader :feature, :format, :out
+    attr_reader :feature, :format, :out, :basename
 
     def initialize(status_path, task_path, recorder = nil)
       @status_path = status_path
       @task_path = task_path
       if ENV['DISPLAY'] && recorder
-        config = recorder ? {} : JSON.parse(recorder)
+        config = JSON.parse(recorder)
         add_observer JCukeForker::RecordingVncListener.new(self, config)
       end
       @status_socket = TCPSocket.new 'localhost', status_path
@@ -64,7 +66,7 @@ module JCukeForker
     end
 
     def failed?
-      @status.nil? || @status
+      @status.nil? || !@status
     end
 
     def output
@@ -79,10 +81,6 @@ module JCukeForker
       File.join out, "#{basename}.stderr"
     end
 
-    def basename
-      @basename ||= feature.gsub(/\W/, '_')
-    end
-
     def args
       args = %W[--format #{format} --out #{output}]
       args += @extra_args
@@ -94,11 +92,13 @@ module JCukeForker
     private
 
     def set_state(raw_message)
+      @status = nil
       json_obj = JSON.parse raw_message
       @format = json_obj['format']
       @feature = json_obj['feature']
       @extra_args = json_obj['extra_args']
       @out = json_obj['out']
+      @basename = feature.gsub(/\W/, '_')
     end
 
     def execute_cucumber

data/lib/jcukeforker.rb

@@ -14,6 +14,10 @@ require "securerandom"
 require "celluloid/io"
 require "celluloid/autostart"
 
+unless ENV['DEBUG']
+  Celluloid.logger = Logger.new('/dev/null')
+end
+
 module JCukeForker
 end
 

data/spec/jcukeforker/logging_listener_spec.rb

@@ -25,19 +25,22 @@ module JCukeForker
 
       timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S##{Process.pid}")
 
-      stdout.string.should == <<-OUTPUT
+      str = <<-OUTPUT
 I, [#{timestamp}]  INFO -- : [    run           ] starting
 I, [#{timestamp}]  INFO -- : [    worker  1     ] register: /tmp/12sd3-1
 I, [#{timestamp}]  INFO -- : [    worker  1     ] starting: foo/bar
 I, [#{timestamp}]  INFO -- : [    worker  15    ] register: /tmp/12sd3-15
 I, [#{timestamp}]  INFO -- : [    worker  15    ] starting: foo/baz
-I, [#{timestamp}]  INFO -- : [    worker  1     ] passed  : foo/bar
-I, [#{timestamp}]  INFO -- : [    worker  15    ] failed  : foo/baz
+I, [#{timestamp}]  INFO -- : [    worker  1     ] failed  : foo/bar
+I, [#{timestamp}]  INFO -- : [    worker  15    ] passed  : 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, passed
-      OUTPUT
+I, [#{timestamp}]  INFO -- : [    run           ] finished, failed
+OUTPUT
+
+      puts str
+      stdout.string.should == str
     end
   end # Worker
 end # CukeForker

data/spec/jcukeforker/recording_vnc_listener_spec.rb

@@ -50,15 +50,14 @@ module JCukeForker
       recorder.stub(:stop)
       listener.instance_variable_set(:@recorder, recorder)
 
-      worker.should_receive(:failed?).and_return(false)
       listener.should_receive(:output).and_return("./foo.mp4")
       FileUtils.should_receive(:rm_rf).with("./foo.mp4")
 
-      listener.on_task_finished worker, nil, nil
+      listener.on_task_finished worker, nil, true
     end
 
     it "passes along options to recorder" do
-      listener = RecordingVncListener.new worker, :codec => "flv"
+      listener = RecordingVncListener.new worker, 'codec' => "flv", 'ext' => 'flv'
       env = ENV['DISPLAY']
       ENV['DISPLAY']= ':1'
       ChildProcess.should_receive(:build).with(

metadata

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