jcukeforker 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e1242ce20d555ee0233fd243659101ad2462ac7
-  data.tar.gz: 26cbc1ac07d7728b44e763201c7ee5979db4d9cf
+  metadata.gz: 8dd7b0bab63b0a31ff939c6d804000f387beab5b
+  data.tar.gz: 055701eb73582facab03d86e85876d39f3256a4c
 SHA512:
-  metadata.gz: fe610bb47f23dc16ec1e23e4a3468228e2a3e7d533bc85aec9a2a73dddf19291cf2faf4d80a699d1887eb21034fb142e4daaed2b812d451eba2d0a0403452a6e
-  data.tar.gz: ab3e3356e0fb45a77af2316654febe42ac2fa2508451f604dcd9c7f48b3867b37f05f5fb9639b2904a1847943be972841416c5ee110c7efbd8b0b77399c1a95b
+  metadata.gz: 2dc47ae20ae4366c34fb3f31d16cff0d2f322d782e2aa474bcfff6c2af6fb4f38afa3a67480d5a70f15bea3645cf1ef55ddd6f07c448f5a6baaaae80d3ffd92c
+  data.tar.gz: 6abf7baa8bf13fb1d030e4b5495199acaeb8909847e06cf2fe2edc9f9d39a4107e127a1ea10d51a8f41a84e064291f2947df211bd98f97e003b114ff9f687b35

data/jcukeforker.gemspec

@@ -16,11 +16,10 @@ Gem::Specification.new do |s|
 
   s.add_dependency "cucumber", ">= 1.1.5", "< 2.0"
   s.add_dependency "vnctools", ">= 0.1.1"
-  s.add_dependency "celluloid-io", ">= 0.15.0"
   s.add_dependency "childprocess", ">= 0.5.3"
-  s.add_development_dependency "rspec", "2.5"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "coveralls"
-  s.add_development_dependency "rake", "~> 0.9.2"
+  s.add_development_dependency "rake", "~> 10"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/jcukeforker/runner.rb

@@ -133,7 +133,7 @@ module JCukeForker
     end
 
     def start
-      @status_server.async.run
+      @status_server.run
       fire :on_run_starting
 
       @processes.each do |process|

data/lib/jcukeforker/status_server.rb

@@ -3,23 +3,30 @@ require 'socket'
 module JCukeForker
   class StatusServer
     include Observable
-    include Celluloid::IO
 
-    finalizer :shutdown
     attr_reader :port
 
     def initialize(port = '6333')
-      server = ::TCPServer.new 'localhost', port
-      @port = server.connect_address.ip_port
-      @server = TCPServer.from_ruby_server server
+      @server = ::TCPServer.new 'localhost', port
+      @port = @server.connect_address.ip_port
+      @thread_pool = []
     end
 
     def run
-      loop { async.handle_connection @server.accept }
+      @master_thread = Thread.new do
+        loop do
+          socket = @server.accept
+          @thread_pool << Thread.new { handle_connection(socket) }
+        end
+      end
     end
 
     def shutdown
-      @server.close if @server
+      if @server
+        @server.close
+        @master_thread.terminate
+        @thread_pool.each(&:terminate)
+      end
     end
 
     def handle_connection(socket)

data/lib/jcukeforker/task_manager.rb

@@ -7,6 +7,7 @@ module JCukeForker
       @opts = opts
       @worker_sockets = {}
       @failures = false
+      @mutex = Mutex.new
     end
 
     def on_worker_register(worker_path)
@@ -35,10 +36,12 @@ module JCukeForker
     private
 
     def pop_task(worker_path)
-      task = '__KILL__'
-      if feature = @features.shift
-        task = @opts.merge(feature: feature).to_json
-      end
+        task = '__KILL__'
+        @mutex.synchronize do
+          if feature = @features.shift
+            task = @opts.merge(feature: feature).to_json
+          end
+        end
 
       @worker_sockets[worker_path].puts(task)
     end

data/lib/jcukeforker/version.rb

@@ -1,3 +1,3 @@
 module JCukeForker
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/lib/jcukeforker.rb

@@ -11,12 +11,7 @@ require "forwardable"
 require "ostruct"
 require "json"
 require "securerandom"
-require "celluloid/io"
-require "celluloid/autostart"
-
-unless ENV['DEBUG']
-  Celluloid.logger = Logger.new('/dev/null')
-end
+require "thread"
 
 module JCukeForker
 end

data/spec/jcukeforker/runner_spec.rb

@@ -47,8 +47,7 @@ module JCukeForker
     context "running" do
       let(:listener) { double(AbstractListener, :update => nil) }
       let(:queue)    { double(Queue, :has_failures? => false) }
-      let(:status_server0) { double(StatusServer, :run => nil) }
-      let(:status_server) { double(StatusServer, :async => status_server0, :shutdown => nil) }
+      let(:status_server) { double(StatusServer, :run => nil, :shutdown => nil) }
       let(:process) { double(ChildProcess, :start => nil, :wait => nil) }
       let(:work_dir) { '/tmp/jcukeforker-testdir' }
       let(:vnc_pool) { double(VncTools::ServerPool, :stop => nil) }

data/spec/jcukeforker/status_server_spec.rb

@@ -30,7 +30,6 @@ module JCukeForker
 
       status_server.handle_connection( status_server.instance_variable_get(:@server).accept )
 
-      status_server.shutdown
    end
   end
 end

data/spec/jcukeforker/task_manager_spec.rb

@@ -9,7 +9,7 @@ module JCukeForker
     it "can register a worker" do
 
       UNIXSocket.stub(:open).and_return(mock_socket)
-      expect(mock_socket).to receive(:puts).with({feature: feature}.to_json)
+      mock_socket.should_receive(:puts).with({feature: feature}.to_json)
 
       task_manager = TaskManager.new [feature]
       task_manager.on_worker_register worker_path
@@ -17,7 +17,7 @@ module JCukeForker
 
     it "can finish task" do
 
-      expect(mock_socket).to receive(:puts).with({feature: feature}.to_json)
+      mock_socket.should_receive(:puts).with({feature: feature}.to_json)
 
       task_manager = TaskManager.new [feature]
       task_manager.instance_variable_get(:@worker_sockets)[worker_path] = mock_socket
@@ -26,7 +26,7 @@ module JCukeForker
 
     it "can close dead worker" do
 
-      expect(mock_socket).to receive(:close)
+      mock_socket.should_receive(:close)
 
       task_manager = TaskManager.new [feature]
       task_manager.instance_variable_get(:@worker_sockets)[worker_path] = mock_socket
@@ -35,7 +35,7 @@ module JCukeForker
 
     it "can send '__KILL__' when there are no tasks left" do
 
-      expect(mock_socket).to receive(:puts).with('__KILL__')
+      mock_socket.should_receive(:puts).with('__KILL__')
 
       task_manager = TaskManager.new []
       task_manager.instance_variable_get(:@worker_sockets)[worker_path] = mock_socket

data/spec/jcukeforker/worker_spec.rb

@@ -34,7 +34,7 @@ module JCukeForker
         expected_args = formats.flat_map do |f|
           %W[--format #{f} --out #{path}/some_feature_51.#{f}]
         end
-        expect(worker.args.each_cons(expected_args.size).include?(expected_args)).to be true
+        worker.args.each_cons(expected_args.size).include?(expected_args).should be true
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jcukeforker
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Jason Gowan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -45,20 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -77,16 +63,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +93,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10'
 description: Library to maintain a forking queue of Cucumber processes, with optional
   VNC displays. Designed for JRuby.
 email:
@@ -175,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jcukeforker
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Library to maintain a forking queue of Cucumber processes, for JRuby