specjour 0.4.1 → 0.5.0

data/lib/specjour/worker.rb

@@ -1,24 +1,17 @@
 module Specjour
-  require 'specjour/rspec'
-  require 'specjour/cucumber'
 
   class Worker
     include Protocol
     include SocketHelper
     attr_accessor :printer_uri
-    attr_reader :project_path, :number, :preload_spec, :preload_feature, :task
+    attr_reader :number
 
     def initialize(options = {})
       ARGV.replace []
       $stdout = StringIO.new if options[:quiet]
-      @project_path = options[:project_path]
       @number = options[:number].to_i
-      @preload_spec = options[:preload_spec]
-      @preload_feature = options[:preload_feature]
-      @task = options[:task]
       self.printer_uri = options[:printer_uri]
       set_env_variables
-      Dir.chdir(project_path)
       Specjour.load_custom_hooks
     end
 
@@ -27,13 +20,10 @@ module Specjour
     end
 
     def prepare
-      load_app
       Configuration.prepare.call
-      Kernel.exit!
     end
 
     def run_tests
-      load_app
       Configuration.after_fork.call
       run_times = Hash.new(0)
 
@@ -42,32 +32,20 @@ module Specjour
         time = Benchmark.realtime { run_test test }
         profile(test, time)
         run_times[test_type(test)] += time
+        connection.send_message(:done)
       end
 
       send_run_times(run_times)
-      connection.send_message(:done)
+    ensure
       connection.disconnect
     end
 
-    def start
-      send task
-    end
-
     protected
 
     def connection
       @connection ||= printer_connection
     end
 
-    def load_app
-      RSpec::Preloader.load(preload_spec) if preload_spec
-      Cucumber::Preloader.load(preload_feature) if preload_feature
-    rescue StandardError => exception
-      $stderr.puts "Caught exception: #{exception.class} #{exception.message}"
-      Specjour.logger.debug exception.backtrace.join("\n")
-      $stderr.puts "Proceeding... you may need to re-run the dispatcher."
-    end
-
     def printer_connection
       Connection.new printer_uri
     end
@@ -96,11 +74,11 @@ module Specjour
     end
 
     def run_feature(feature)
-      Specjour::Cucumber::Runner.run(feature, connection)
+      Cucumber::Runner.run(feature, connection)
     end
 
     def run_spec(spec)
-      Specjour::RSpec::Runner.run(spec, connection)
+      RSpec::Runner.run(spec, connection)
     end
 
     def send_run_times(run_times)

data/lib/specjour.rb

@@ -17,10 +17,11 @@ module Specjour
   autoload :Connection, 'specjour/connection'
   autoload :DbScrub, 'specjour/db_scrub'
   autoload :Dispatcher, 'specjour/dispatcher'
+  autoload :Fork, 'specjour/fork'
+  autoload :Loader, 'specjour/loader'
   autoload :Manager, 'specjour/manager'
   autoload :Printer, 'specjour/printer'
   autoload :Protocol, 'specjour/protocol'
-  autoload :QuietFork, 'specjour/quiet_fork'
   autoload :RsyncDaemon, 'specjour/rsync_daemon'
   autoload :SocketHelper, 'specjour/socket_helper'
   autoload :Worker, 'specjour/worker'
@@ -28,7 +29,7 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :RSpec, 'specjour/rspec'
 
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
   HOOKS_PATH = "./.specjour/hooks.rb"
 
   def self.interrupted?
@@ -36,9 +37,18 @@ module Specjour
   end
 
   def self.interrupted=(bool)
-    Cucumber.wants_to_quit
-    RSpec.wants_to_quit
     @interrupted = bool
+    if bool
+      will_quit(:RSpec)
+      will_quit(:Cucumber)
+    end
+  end
+
+  def self.will_quit(framework)
+    if Object.const_defined?(framework)
+      framework = Object.const_get(framework)
+      framework.wants_to_quit = true if framework.respond_to?(:wants_to_quit=)
+    end
   end
 
   def self.logger
@@ -62,7 +72,7 @@ module Specjour
   def self.trap_interrupt
     Signal.trap('INT') do
       self.interrupted = true
-      exit 1
+      abort("\n")
     end
   end
 

metadata

@@ -1,109 +1,106 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: specjour
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.0
   prerelease: 
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Sandro Turriate
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-17 00:00:00 -07:00
-default_executable: specjour
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-20 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dnssd
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156993440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.3.4
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156993440
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &2156992940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156992940
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156992460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156992460
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &2156991900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.10.11
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156991900
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2156991400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156991400
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2156990920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
   type: :development
-  version_requirements: *id006
-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"
+  prerelease: false
+  version_requirements: *2156990920
+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
-executables: 
+executables:
 - specjour
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/specjour/cli.rb
 - lib/specjour/configuration.rb
 - lib/specjour/connection.rb
 - lib/specjour/cpu.rb
 - lib/specjour/cucumber/distributed_formatter.rb
 - lib/specjour/cucumber/final_report.rb
-- lib/specjour/cucumber/main_ext.rb
 - lib/specjour/cucumber/preloader.rb
 - lib/specjour/cucumber/runner.rb
 - lib/specjour/cucumber.rb
 - lib/specjour/db_scrub.rb
 - lib/specjour/dispatcher.rb
+- lib/specjour/fork.rb
+- lib/specjour/loader.rb
 - lib/specjour/manager.rb
 - lib/specjour/printer.rb
 - lib/specjour/protocol.rb
-- lib/specjour/quiet_fork.rb
 - lib/specjour/rspec/distributed_formatter.rb
 - lib/specjour/rspec/final_report.rb
 - lib/specjour/rspec/marshalable_exception.rb
@@ -120,33 +117,28 @@ files:
 - History.markdown
 - Rakefile
 - bin/specjour
-has_rdoc: true
 homepage: https://github.com/sandro/specjour
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Distribute your spec suite amongst your LAN via Bonjour.
 test_files: []
-

data/lib/specjour/cucumber/main_ext.rb

@@ -1,3 +0,0 @@
-Cucumber::Cli::Main.class_eval do
-  def trap_interrupt; end
-end

data/lib/specjour/quiet_fork.rb

@@ -1,11 +0,0 @@
-module Specjour::QuietFork
-  extend self
-  attr_reader :pid
-
-  def self.fork(&block)
-    @pid = Kernel.fork do
-      $stdout = StringIO.new
-      block.call
-    end
-  end
-end