specjour 0.5.0 → 0.5.2

data/History.markdown

@@ -1,6 +1,21 @@
 History
 =======
 
+0.5.2 / 2012-02-21
+---------------------------
+* [fixed] Binary path used by Loader
+* [fixed] Specjour prepare wouldn't wait for managers to complete
+* [fixed] Slower machines adding completed tests back to suite
+
+[Full Changelog](https://github.com/sandro/specjour/compare/v0.5.1...v0.5.2)
+
+0.5.1 / 2012-02-21 - yanked
+---------------------------
+* [fixed] Dispatcher hanging after printing the report
+* [added] More verbosity during startup
+
+[Full Changelog](https://github.com/sandro/specjour/compare/v0.5.0...v0.5.1)
+
 0.5.0 / 2012-02-20
 ----------------------
 
@@ -26,7 +41,7 @@ History
   the regular test environment can be loaded, a worker without a database
   shouldn't raise an exception, instead the db should be created.
 
-[Full Changelog](https://github.com/sandro/specjour/compare/v0.4.1...0.5.0)
+[Full Changelog](https://github.com/sandro/specjour/compare/v0.4.1...v0.5.0)
 
 0.4.1 / 2011-06-17
 ------------------

data/lib/specjour/cli.rb

@@ -16,6 +16,7 @@ module Specjour
 
     # allow specjour to be called with path arguments
     def self.start(original_args=ARGV, config={})
+      Specjour.trap_interrupt
       real_tasks = all_tasks.keys | @map.keys
       unless real_tasks.include? original_args.first
         original_args.unshift default_task

data/lib/specjour/connection.rb

@@ -3,7 +3,7 @@ module Specjour
     include Protocol
     extend Forwardable
 
-    attr_reader :uri
+    attr_reader :uri, :retries
     attr_writer :socket
 
     def_delegators :socket, :flush, :close, :closed?, :gets, :each
@@ -17,6 +17,7 @@ module Specjour
 
     def initialize(uri)
       @uri = uri
+      @retries = 0
     end
 
     alias to_str to_s
@@ -26,18 +27,13 @@ module Specjour
     end
 
     def disconnect
-      socket.close unless socket && socket.closed?
+      socket.close if socket && !socket.closed?
     end
 
     def socket
       @socket ||= connect
     end
 
-    def timeout(&block)
-      Timeout.timeout(0.5, &block)
-    rescue Timeout::Error
-    end
-
     def next_test
       will_reconnect do
         send_message(:ready)
@@ -52,12 +48,16 @@ module Specjour
     end
 
     def puts(arg='')
-      print(arg << "\n")
+      will_reconnect do
+        print(arg << "\n")
+      end
     end
 
     def send_message(method_name, *args)
-      print([method_name, *args])
-      flush
+      will_reconnect do
+        print([method_name, *args])
+        flush
+      end
     end
 
     protected
@@ -65,8 +65,6 @@ module Specjour
     def connect_socket
       @socket = TCPSocket.open(uri.host, uri.port)
     rescue Errno::ECONNREFUSED => error
-      Specjour.logger.debug "Could not connect to #{uri.to_s}\n#{error.inspect}"
-      sleep 0.1
       retry
     end
 
@@ -75,12 +73,18 @@ module Specjour
       connect
     end
 
+    def timeout(&block)
+      Timeout.timeout(0.1, &block)
+    rescue Timeout::Error
+    end
+
     def will_reconnect(&block)
       block.call
     rescue SystemCallError, IOError => error
       unless Specjour.interrupted?
+        @retries += 1
         reconnect
-        retry
+        retry if retries <= 5
       end
     end
   end

data/lib/specjour/cucumber/preloader.rb

@@ -2,6 +2,7 @@ module Specjour
   module Cucumber
     module Preloader
       def self.load
+        $stdout.puts "Loading Cucumber Environment"
         require 'cucumber' unless defined?(::Cucumber::Cli)
         configuration = ::Cucumber::Cli::Configuration.new
         configuration.parse! []

data/lib/specjour/dispatcher.rb

@@ -16,7 +16,7 @@ module Specjour
       @managers = []
       @drb_connection_errors = Hash.new(0)
       @rsync_port = options[:rsync_port]
-      reset_manager_threads
+      @manager_threads = []
     end
 
     def start
@@ -24,8 +24,11 @@ module Specjour
       gather_managers
       rsync_daemon.start
       dispatch_work
-      printer.start if dispatching_tests?
-      wait_on_managers
+      if dispatching_tests?
+        printer.start
+      else
+        wait_on_managers
+      end
       exit printer.exit_status
     end
 
@@ -74,6 +77,7 @@ module Specjour
       puts "No listeners found on this machine, starting one..."
       manager_options = {:worker_size => options[:worker_size], :registered_projects => [project_alias], :rsync_port => rsync_port}
       manager = Manager.start_quietly manager_options
+      Process.detach manager.pid
       fetch_manager(manager.drb_uri)
       at_exit do
         unless Specjour.interrupted?
@@ -122,10 +126,6 @@ module Specjour
       @project_name ||= File.basename(project_path)
     end
 
-    def reset_manager_threads
-      @manager_threads = []
-    end
-
     def resolve_reply(reply)
       DNSSD.resolve!(reply.name, reply.type, reply.domain, flags=0, reply.interface) do |resolved|
         Specjour.logger.debug "Bonjour discovered #{resolved.target}"
@@ -159,7 +159,6 @@ module Specjour
 
     def wait_on_managers
       manager_threads.each {|t| t.join; t.exit}
-      reset_manager_threads
     end
 
     def worker_task

data/lib/specjour/loader.rb

@@ -23,7 +23,7 @@ module Specjour
       Configuration.after_load.call
       (1..worker_size).each do |index|
         worker_pids << fork do
-          w = Worker.new(
+          Worker.new(
             :number => index,
             :printer_uri => printer_uri,
             :quiet => quiet
@@ -81,20 +81,14 @@ module Specjour
     end
 
     def load_app
-      share_examples if spec_files.any?
-      share_features if feature_files.any?
+      RSpec::Preloader.load spec_files if spec_files.any?
+      Cucumber::Preloader.load if feature_files.any?
+      register_tests_with_printer
     end
 
-    def share_examples
-      RSpec::Preloader.load spec_files
-      connection.send_message :tests=, filtered_examples
-    ensure
-      ::RSpec.reset
-    end
-
-    def share_features
-      Cucumber::Preloader.load
-      connection.send_message :tests=, feature_files
+    def register_tests_with_printer
+      tests = filtered_examples | feature_files
+      connection.send_message :tests=, tests
     end
 
     def filtered_examples
@@ -118,12 +112,9 @@ module Specjour
     def connection
       @connection ||= begin
         at_exit { connection.disconnect }
-        printer_connection
+        Connection.new URI.parse(printer_uri)
       end
     end
 
-    def printer_connection
-      Connection.new URI.parse(printer_uri)
-    end
   end
 end

data/lib/specjour/manager.rb

@@ -22,7 +22,6 @@ module Specjour
       @worker_task = options[:worker_task]
       @registered_projects = options[:registered_projects]
       @rsync_port = options[:rsync_port]
-      at_exit { kill_loader_process }
     end
 
     def available_for?(project_name)
@@ -63,15 +62,13 @@ module Specjour
         exec_cmd << " --test-paths #{test_paths.join(" ")}" if test_paths.any?
         exec_cmd << " --log" if Specjour.log?
         exec_cmd << " --quiet" if quiet?
-        exec_ruby = "Specjour::CLI.start(#{exec_cmd.split(' ').inspect})"
-        load_path = ''
-        $LOAD_PATH.each {|p| load_path << "-I#{p} " if p =~ /specjour/}
-        exec_cmd = "ruby #{load_path} -rspecjour -e '#{exec_ruby}'"
-        exec exec_cmd
+        load_path = $LOAD_PATH.detect {|l| l =~ %r(specjour.*/lib$)}
+        bin_path = File.expand_path(File.join(load_path, "../bin"))
+        Kernel.exec({"RUBYLIB" => load_path}, "#{bin_path}/specjour #{exec_cmd}")
       end
       Process.waitall
     ensure
-      kill_loader_process
+      kill_loader_process if loader_pid
     end
 
     def in_project(&block)
@@ -80,7 +77,7 @@ module Specjour
 
     def interrupted=(bool)
       Specjour.interrupted = bool
-      kill_loader_process
+      kill_loader_process if loader_pid
     end
 
     def kill_loader_process
@@ -89,6 +86,7 @@ module Specjour
       else
         Process.kill('TERM', loader_pid) rescue Errno::ESRCH
       end
+      @loader_pid = nil
     end
 
     def pid

data/lib/specjour/printer.rb

@@ -71,8 +71,10 @@ module Specjour
     end
 
     def tests=(client, tests)
-      self.tests_to_run = run_order(tests_to_run | tests)
-      self.example_size = tests_to_run.size
+      if tests_to_run.empty?
+        self.tests_to_run = run_order(tests)
+        self.example_size = tests_to_run.size
+      end
     end
 
     def rspec_summary=(client, summary)
@@ -89,7 +91,7 @@ module Specjour
     end
 
     def disconnecting
-      if (examples_complete == example_size || clients.empty?)
+      if (examples_complete == example_size) || clients.empty?
         throw(:stop)
       end
     end

data/lib/specjour/rspec/preloader.rb

@@ -1,5 +1,6 @@
 class Specjour::RSpec::Preloader
   def self.load(paths=[])
+    $stdout.puts "Loading RSpec Environment"
     require './spec/spec_helper'
     load_spec_files paths
   end

data/lib/specjour/worker.rb

@@ -52,7 +52,7 @@ module Specjour
 
     def print_status(test)
       status = "[#{ENV['TEST_ENV_NUMBER']}] Running #{test}"
-      Specjour.logger.debug status
+      $stdout.puts status
       $PROGRAM_NAME = "specjour#{status}"
     end
 

data/lib/specjour.rb

@@ -29,8 +29,13 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :RSpec, 'specjour/rspec'
 
-  VERSION = "0.5.0"
-  HOOKS_PATH = "./.specjour/hooks.rb"
+  VERSION ||= "0.5.2"
+  HOOKS_PATH ||= "./.specjour/hooks.rb"
+  PROGRAM_NAME ||= $PROGRAM_NAME # keep a reference of the original program name
+
+  GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
+
+  class Error < StandardError; end
 
   def self.interrupted?
     @interrupted
@@ -75,12 +80,4 @@ module Specjour
       abort("\n")
     end
   end
-
-  Error = Class.new(StandardError)
-  PROGRAM_NAME = $PROGRAM_NAME # keep a reference of the original program name
-
-  GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
-
-  trap_interrupt
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specjour
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2012-02-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
-  requirement: &2156993440 !ruby/object:Gem::Requirement
+  requirement: &2156640700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156993440
+  version_requirements: *2156640700
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156992940 !ruby/object:Gem::Requirement
+  requirement: &2156640200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156992940
+  version_requirements: *2156640200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156992460 !ruby/object:Gem::Requirement
+  requirement: &2156639660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2156992460
+  version_requirements: *2156639660
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2156991900 !ruby/object:Gem::Requirement
+  requirement: &2156639180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *2156991900
+  version_requirements: *2156639180
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156991400 !ruby/object:Gem::Requirement
+  requirement: &2156638680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *2156991400
+  version_requirements: *2156638680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156990920 !ruby/object:Gem::Requirement
+  requirement: &2156638160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156990920
+  version_requirements: *2156638160
 description: ! "    Specjour splits your RSpec suite across multiple machines, and
   multiple\n    cores per machine, to run super-parallel-fast!  Also works with Cucumber.\n"
 email: sandro.turriate@gmail.com