specjour 2.0.0.rc2 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25c6007ab5a18e0e75c6b75121fe1c4a1c08792e
-  data.tar.gz: b754110e3ba182341e0cf88fc3a9b0aeb7c76ed6
+  metadata.gz: 18afbf7019ee84aeaa6eaa20f523d38c9e3f67c5
+  data.tar.gz: 5c190741ea65714a23579692ec30bc28bd0c5dcb
 SHA512:
-  metadata.gz: f46ab3c33f34934a834adc13fd4a8b0c76f4bf1840c7beb2ec266310328d7fea663a5ec99489628d4f757733cd04c735e3deaeab6e3f877cf2ec73d976dfdca6
-  data.tar.gz: 3d26b413944d6c04bfb5615db696bc197ef15ee6d3b1a130340cc8990b8085b6a67700f5be0da48ea73f4b40739087e6277a2996a580ad0a8da4961788d6d1c9
+  metadata.gz: 1da69aec4f91b7caeda8c5bb80877dda5c712b9906d7f352433f8d214964ab17b9e5d6a2c7c7c922ca2a9bb2f0bae1527853fb619d0f46c9a15fd90f12a341ca
+  data.tar.gz: 51a9464cabf12348591e919b5b298cd798daef7d5ee9eb4ecba5c0543f622a8f4fea9c00385c410f7faac3fb205895a61842722fb8ad3e04dfe36017dafad618

data/lib/specjour.rb

@@ -30,10 +30,9 @@ module Specjour
   autoload :SocketHelper, 'specjour/socket_helper'
   autoload :Worker, 'specjour/worker'
 
-  autoload :Cucumber, 'specjour/cucumber'
   autoload :RSpec, 'specjour/rspec'
 
-  VERSION ||= "2.0.0.rc2"
+  VERSION ||= "2.0.0.rc3"
   HOOKS_PATH ||= "./.specjour/hooks.rb"
   PROGRAM_NAME ||= $PROGRAM_NAME # keep a reference of the original program name
   Time = Time.dup

data/lib/specjour/formatter.rb

@@ -3,7 +3,7 @@ module Specjour
     include Colors
     # description, status [pending,failed,passed] file_path, line_number, exception => [class, message, backtrace]
 
-    STATUSES = Hash.new({char: "?", color: :white}).merge!(
+    STATUSES = Hash.new({char: "?", color: :cyan}).merge!(
       "passed" => {char: ".", color: :green},
       "failed" => {char: "F", color: :red},
       "error" => {char: "E", color: :magenta},
@@ -119,6 +119,13 @@ module Specjour
       end
     end
 
+    def report_error(message)
+      @error_count += 1
+      status_format = STATUSES["error"]
+      @output.print colorize(status_format[:char], status_format[:color])
+      @output.puts "\n#{message}\n"
+    end
+
     def set_end_time!
       @end_time = Time.now
     end

data/lib/specjour/listener.rb

@@ -144,7 +144,7 @@ module Specjour
 
     def start
       $PROGRAM_NAME = program_name
-      log "Listener starting"
+      log "Listener starting pid: #{Process.pid} grp: #{Process.getpgrp} ppid: #{Process.ppid}"
       write_pid
       loop do
         log "listening..."
@@ -167,7 +167,16 @@ module Specjour
     end
 
     def started?
-      !pid.nil?
+      process_id = pid
+      if process_id
+        begin
+          Process.getsid(process_id) && true
+        rescue Errno::ESRCH
+          false
+        end
+      else
+        false
+      end
     end
 
     def stop

data/lib/specjour/loader.rb

@@ -20,6 +20,7 @@ module Specjour
     def start
       Process.setsid
       $PROGRAM_NAME = "specjour loader"
+      debug "Loader pid: #{Process.pid} ppid: #{Process.ppid}"
       set_up
       sync
       Specjour.plugin_manager.send_task(:load_application)
@@ -31,9 +32,10 @@ module Specjour
       $stderr.puts e.backtrace
       $stderr.puts "\n\n"
       connection.error(e)
+      remove_connection
+      kill_parent
     ensure
       remove_connection
-      log "Loader killing group #{Process.getsid}"
     end
 
     def fork_workers
@@ -59,12 +61,22 @@ module Specjour
         signal = connection.get_server_done
         case signal
         when "INT"
-          debug "Sending INT to -#{Process.getsid}"
-          Process.kill("INT", -Process.getsid)
+          kill_session
         end
       end
     end
 
+    def kill_session
+      debug "Sending INT to session -#{Process.getsid}"
+      Process.kill("INT", -Process.getsid) rescue nil
+    end
+
+    # shut down the parent before it restarts this loader in a loop
+    def kill_parent
+      debug "Sending INT to parent -#{Process.ppid}"
+      Process.kill("INT", Process.ppid) rescue nil
+    end
+
     def set_up
       data = connection.ready({hostname: hostname, worker_size: Specjour.configuration.worker_size})
       Specjour.configuration.project_name = data[:project_name]

data/lib/specjour/printer.rb

@@ -17,7 +17,7 @@ module Specjour
       @clients = {}
       @tests_to_run = []
       @test_paths = options[:test_paths]
-      @example_size = 0
+      @example_size = nil
       @machines = []
       @send_threads = []
       @bonjour_service = nil
@@ -89,7 +89,7 @@ module Specjour
         reads = result.first
         reads.each do |socket_being_read|
           if socket_being_read == @server_socket
-            debug "adding connection"
+            debug "adding connection #{@send_threads.size}"
             client_socket = @server_socket.accept
             client_socket = Connection.wrap(client_socket)
             @send_threads << Thread.new(client_socket) { |sock| serve(sock) }
@@ -175,6 +175,9 @@ module Specjour
         end
         IO.select([client.socket])
       end
+    rescue => e
+      $stderr.puts("Serve got an Error #{e.inspect}")
+      raise e
     end
 
     def done
@@ -204,7 +207,7 @@ module Specjour
 
     def register_tests(tests)
       @mutex.synchronize do
-        if example_size == 0
+        if example_size == nil
           self.tests_to_run = run_order(tests)
           self.example_size = tests_to_run.size
         end
@@ -218,7 +221,7 @@ module Specjour
     end
 
     def unexpected_error(message)
-      @output.puts message
+      Specjour.configuration.formatter.report_error(message)
     end
 
     def find_project_base_dir(directory)
@@ -242,10 +245,6 @@ module Specjour
       rspec_report.add(summary)
     end
 
-    def cucumber_summary=(client, summary)
-      cucumber_report.add(summary)
-    end
-
     def add_to_profiler(test, time, host)
       @mutex.synchronize do
         self.profiler[test] = [time, host]
@@ -254,7 +253,7 @@ module Specjour
 
     def disconnecting
       @mutex.synchronize do
-        debug "DISCONNECT #{@running} #{example_size} #{examples_complete}"
+        debug "DISCONNECT #{@running} #{example_size.inspect} #{examples_complete.inspect}"
         if @running && examples_complete == example_size
           @running = false
           debug "writing done"
@@ -277,10 +276,6 @@ module Specjour
       @rspec_report ||= RSpec::FinalReport.new
     end
 
-    def cucumber_report
-      @cucumber_report ||= Cucumber::FinalReport.new
-    end
-
     # "test.rb" => [1.12, "host.local[2]"]
     def record_performance
       File.open('.specjour/performance', 'w') do |file|

data/lib/specjour/worker.rb

@@ -58,7 +58,7 @@ module Specjour
     def print_status(test)
       status = "Running #{test}"
       log status
-      $PROGRAM_NAME = "specjour #{status}"
+      $PROGRAM_NAME = "specjour[#{ENV["TEST_ENV_NUMBER"]}] #{status}"
     end
 
     def print_time_for(test, time)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specjour
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Sandro Turriate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
@@ -96,7 +96,7 @@ dependencies:
         version: '0'
 description: |2
       Specjour splits your RSpec suite across multiple machines, and multiple
-      cores per machine, to run super-parallel-fast!  Also works with Cucumber.
+      cores per machine, to run super-parallel-fast!
 email: sandro.turriate@gmail.com
 executables:
 - specjour