jcukeforker 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a651ded56a13da6c8e0ed525d10d5b1bf4ae4c6
-  data.tar.gz: 42581a8e19d2a8b125eae37cfcf2ef1e05824eb3
+  metadata.gz: f2c4cda725d6eb45cd43a193c68ac23c7f245cc8
+  data.tar.gz: fd1a942fa132ed08c30975fe0001ce7322824a7c
 SHA512:
-  metadata.gz: 8b06f641b09f0464538b9e216a370fe92cc431041097086040a7f5bdd1f2f8f957bc60f0ebf071d0052ed74b6ba4780ea994e517dfc76872dce351c8727216d7
-  data.tar.gz: 94ebb64ff6470952d21da14619f6a35838f38d49a4927c3511761bb8d528f1543072c0172d126f9c6f1c2cf93f25a5864ab0e9fd968bf9fbaad5f13914cfa097
+  metadata.gz: bbb19abf494360c1180b761ef264e26da1fe9224efdef272c970b77a509e026f4b7d9dda94824990bc696e3d76f43623ceb90b086cd8e0a570550b6488b75fc7
+  data.tar.gz: 7edb4699f193706c4d84df8829b066ae7be0a9d51dedf04d871756a198394c20f7d09546efe58c4e2ecdff6e0d5c10b9953f8cbb490b222d96937b4b23fc264f

data/README.mdown

@@ -31,7 +31,7 @@ to avoid this.
     # setup with vncserver and screen recording
     JCukeForker::Runner.run Dir['features/**/*.feature'],
                             :vnc       => %W[-geometry 1280x1024 -depth 24 -dpi 96]
-                            :recorder  => {:ext => 'mp4', :codec => 'mpeg4', :frame_size => '1280x1024', :frame_rate => '5'}
+                            :record    => {:ext => 'mp4', :codec => 'mpeg4', :frame_size => '1280x1024', :frame_rate => '5'}
 ```
 
 Note on Patches/Pull Requests

data/bin/{cukeforker → jcukeforker}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'cukeforker'
+require 'jcukeforker'
 
 split      = ARGV.index("--")
 extra_args = ARGV[0..(split-1)]
 features   = ARGV[(split+1)..-1]
 
-CukeForker::Runner.run(features, :extra_args => extra_args)
+JCukeForker::Runner.run(features, :extra_args => extra_args)

data/lib/jcukeforker/runner.rb

@@ -45,6 +45,7 @@ module JCukeForker
       opts = DEFAULT_OPTIONS.dup.merge(opts)
 
       max        = opts[:max]
+      raise ':max must be >= 1' if max < 1
       format     = opts[:format]
       out        = File.join opts[:out]
       listeners  = Array(opts[:notify])
@@ -56,10 +57,8 @@ module JCukeForker
         listeners << LoggingListener.new
       end
 
-      task_manager = TaskManager.new
-      features.each do |feature|
-        task_manager.add({feature: feature, format: format,out: out,extra_args: extra_args})
-      end
+      task_opts = {format: format,out: out,extra_args: extra_args}
+      task_manager = TaskManager.new features, task_opts
 
       listeners << task_manager
       status_server = StatusServer.new port

data/lib/jcukeforker/task_manager.rb

@@ -2,15 +2,12 @@
 module JCukeForker
   class TaskManager < AbstractListener
 
-    def initialize()
-      @tasks = []
+    def initialize(features, opts={})
+      @features = features
+      @opts = opts
       @worker_sockets = {}
     end
 
-    def add(task)
-      @tasks << task
-    end
-
     def on_worker_register(worker_path)
       @worker_sockets[worker_path] = UNIXSocket.open worker_path
       pop_task worker_path
@@ -32,8 +29,10 @@ module JCukeForker
     private
 
     def pop_task(worker_path)
-      task = @tasks.shift || '__KILL__'
-      task = task.to_json if task.is_a? Hash
+      task = '__KILL__'
+      if feature = @features.shift
+        task = @opts.merge(feature: feature).to_json
+      end
 
       @worker_sockets[worker_path].puts(task)
     end

data/lib/jcukeforker/version.rb

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

data/lib/jcukeforker/worker_script.rb

@@ -1,6 +1,6 @@
 require_relative './worker'
 
-worker = JCukeForker::Worker.new *$ARGV
+worker = JCukeForker::Worker.new *ARGV
 worker.register
 worker.run
 worker.close

data/spec/jcukeforker/logging_listener_spec.rb

@@ -8,15 +8,15 @@ module JCukeForker
     it "logs all events" do
       Time.stub(:now => Time.now)
 
-      mock_worker = {:path => '/tmp/12sd3-1', :feature => 'foo/bar', :failed? => 'true'}
-      mock_worker2 = {:path => '/tmp/12sd3-15', :feature => 'foo/baz', :failed? => 'false'}
+      mock_worker = {:path => '/tmp/12sd3-1', :feature => 'foo/bar', :status => true }
+      mock_worker2 = {:path => '/tmp/12sd3-15', :feature => 'foo/baz', :status => false}
 
       listener.on_run_starting
       listener.on_worker_register mock_worker[:path]
       listener.on_task_starting mock_worker[:path], mock_worker[:feature]
       listener.on_worker_register mock_worker2[:path]
       listener.on_task_starting mock_worker2[:path], mock_worker2[:feature]
-      listener.on_task_finished mock_worker[:path], mock_worker[:feature], mock_worker[:failed?]
+      listener.on_task_finished mock_worker[:path], mock_worker[:feature], mock_worker[:status]
       listener.on_task_finished mock_worker2[:path], mock_worker2[:feature], mock_worker2[:failed?]
       listener.on_worker_dead mock_worker[:path]
       listener.on_worker_dead mock_worker2[:path]
@@ -25,22 +25,19 @@ module JCukeForker
 
       timestamp = Time.now.strftime("%Y-%m-%d %H:%M:%S##{Process.pid}")
 
-      str = <<-OUTPUT
+      stdout.string.should == <<-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     ] failed  : foo/bar
-I, [#{timestamp}]  INFO -- : [    worker  15    ] passed  : foo/baz
+I, [#{timestamp}]  INFO -- : [    worker  1     ] passed  : foo/bar
+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
-OUTPUT
-
-      puts str
-      stdout.string.should == str
+      OUTPUT
     end
   end # Worker
 end # CukeForker

data/spec/jcukeforker/runner_spec.rb

@@ -19,15 +19,12 @@ module JCukeForker
         mock_status_server = double(StatusServer)
         mock_tasks = Array.new(2) { |n| double("Worker-#{n}") }
 
-        TaskManager.should_receive(:new).and_return mock_task_manager
+        TaskManager.should_receive(:new).with(features, {format: format, out: out, extra_args: []}).and_return mock_task_manager
         StatusServer.should_receive(:new).with('6333').and_return mock_status_server
 
         mock_status_server.should_receive(:add_observer).with listeners.first
         mock_status_server.should_receive(:add_observer).with mock_task_manager
 
-        mock_task_manager.should_receive(:add).with(feature: features[0], format: format, out: out, extra_args: [])
-        mock_task_manager.should_receive(:add).with(feature: features[1], format: format, out: out, extra_args: [])
-
         Runner.create(features,
           :max    => max,
           :notify => listeners,

data/spec/jcukeforker/task_manager_spec.rb

@@ -3,25 +3,23 @@ require File.expand_path("../../spec_helper", __FILE__)
 module JCukeForker
   describe TaskManager do
     let(:worker_path) { '/tmp/jcukeforker-test-socket' }
-    let(:task) { {name: 'my task'} }
+    let(:feature) { 'feature:1' }
     let(:mock_socket) { double('socket', :puts => nil) }
 
     it "can register a worker" do
 
       UNIXSocket.stub(:open).and_return(mock_socket)
-      expect(mock_socket).to receive(:puts).with(task.to_json)
+      expect(mock_socket).to receive(:puts).with({feature: feature}.to_json)
 
-      task_manager = TaskManager.new
-      task_manager.add task
+      task_manager = TaskManager.new [feature]
       task_manager.on_worker_register worker_path
     end
 
     it "can finish task" do
 
-      expect(mock_socket).to receive(:puts).with(task.to_json)
+      expect(mock_socket).to receive(:puts).with({feature: feature}.to_json)
 
-      task_manager = TaskManager.new
-      task_manager.add task
+      task_manager = TaskManager.new [feature]
       task_manager.instance_variable_get(:@worker_sockets)[worker_path] = mock_socket
       task_manager.on_task_finished worker_path, nil, nil
     end
@@ -30,8 +28,7 @@ module JCukeForker
 
       expect(mock_socket).to receive(:close)
 
-      task_manager = TaskManager.new
-      task_manager.add task
+      task_manager = TaskManager.new [feature]
       task_manager.instance_variable_get(:@worker_sockets)[worker_path] = mock_socket
       task_manager.on_worker_dead worker_path
     end
@@ -40,7 +37,7 @@ module JCukeForker
 
       expect(mock_socket).to receive(:puts).with('__KILL__')
 
-      task_manager = TaskManager.new
+      task_manager = TaskManager.new []
       task_manager.instance_variable_get(:@worker_sockets)[worker_path] = mock_socket
       task_manager.on_task_finished worker_path, nil, nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcukeforker
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jason Gowan
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -113,7 +113,7 @@ description: Library to maintain a forking queue of Cucumber processes, with opt
 email:
 - gowanjason@gmail.com
 executables:
-- cukeforker
+- jcukeforker
 extensions: []
 extra_rdoc_files: []
 files:
@@ -123,7 +123,7 @@ files:
 - LICENSE
 - README.mdown
 - Rakefile
-- bin/cukeforker
+- bin/jcukeforker
 - jcukeforker.gemspec
 - lib/jcukeforker.rb
 - lib/jcukeforker/abstract_listener.rb