specjour 0.5.6 → 0.6.0

data/History.markdown

@@ -1,6 +1,14 @@
 History
 =======
 
+0.6.0 / 2012-07-19
+---------------------------
+* [fixed] First RSpec test to load would run twice
+* [added] Rsync options are now customizable via `Specjour::Configuration.rsync\_options=`  
+  Useful when running on machines that use a combination of vendored gems and gemsets, i.e.  
+  `-aL --delete --ignore-errors --exclude=vendor/ruby --exclude=.bundle`
+* [added] Benchmark times for various system status messages
+
 0.5.6 / 2012-06-22
 ---------------------------
 * [fixed] Specjour hang when attempting to resolve a bonjour reply

data/lib/specjour/configuration.rb

@@ -2,7 +2,7 @@ module Specjour
   module Configuration
     extend self
 
-    attr_writer :before_fork, :after_fork, :after_load, :prepare
+    attr_writer :before_fork, :after_fork, :after_load, :prepare, :rsync_options
 
     # This block is run by each worker before they begin running tests.
     # The default action is to migrate the database, and clear it of any old
@@ -37,6 +37,11 @@ module Specjour
       @after_fork = nil
       @after_load = nil
       @prepare = nil
+      @rsync_options = nil
+    end
+
+    def rsync_options
+      @rsync_options ||= default_rsync_options
     end
 
     def bundle_install
@@ -72,6 +77,10 @@ module Specjour
       end
     end
 
+    def default_rsync_options
+      "-aL --delete --ignore-errors"
+    end
+
     protected
 
     def rails_with_ar?

data/lib/specjour/dispatcher.rb

@@ -47,7 +47,7 @@ module Specjour
     end
 
     def dispatcher_uri
-      @dispatcher_uri ||= URI::Generic.build :scheme => "specjour", :host => hostname, :port => printer.port
+      @dispatcher_uri ||= URI::Generic.build :scheme => "specjour", :host => local_ip, :port => printer.port
     end
 
     def dispatch_work
@@ -111,7 +111,7 @@ module Specjour
     end
 
     def no_local_managers?
-      managers.none? {|m| m.hostname == hostname}
+      managers.none? {|m| m.local_ip == local_ip}
     end
 
     def printer

data/lib/specjour/loader.rb

@@ -107,6 +107,8 @@ module Specjour
           "#{e.file_path}:#{e.metadata[:line_number]}"
         end
       end.flatten.uniq
+    ensure
+      ::RSpec.reset
     end
 
     def kill_worker_processes

data/lib/specjour/manager.rb

@@ -22,6 +22,7 @@ module Specjour
       @worker_task = options[:worker_task]
       @registered_projects = options[:registered_projects]
       @rsync_port = options[:rsync_port]
+      Specjour.load_custom_hooks
     end
 
     def available_for?(project_name)
@@ -109,8 +110,7 @@ module Specjour
     end
 
     def sync
-      cmd "rsync -aL --delete --ignore-errors --port=#{rsync_port} #{dispatcher_uri.host}::#{project_name} #{project_path}"
-      puts "rsync complete"
+      cmd "rsync #{Specjour::Configuration.rsync_options} --port=#{rsync_port} #{dispatcher_uri.host}::#{project_name} #{project_path}"
     end
 
     protected
@@ -131,14 +131,17 @@ module Specjour
     end
 
     def cmd(command)
-      puts command
-      system command
+      Specjour.benchmark(command) do
+        system *command.split
+      end
     end
 
     def execute_before_fork
-      in_project do
-        Specjour.load_custom_hooks
-        Configuration.before_fork.call
+      Specjour.benchmark("before_fork") do
+        in_project do
+          Specjour.load_custom_hooks
+          Configuration.before_fork.call
+        end
       end
     end
 
@@ -166,5 +169,6 @@ module Specjour
         yield
       end
     end
+
   end
 end

data/lib/specjour/rspec/preloader.rb

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

data/lib/specjour/rspec/runner.rb

@@ -1,5 +1,6 @@
 module Specjour::RSpec::Runner
-  ::RSpec::Core::Runner::AT_EXIT_HOOK_BACKTRACE_LINE.replace "#{__FILE__}:#{__LINE__ + 3}:in `run'"
+  ::RSpec.configuration.backtrace_clean_patterns << %r(lib/specjour/)
+
   def self.run(spec, output)
     args = ['--format=Specjour::RSpec::DistributedFormatter', spec]
     ::RSpec::Core::Runner.run args, $stderr, output

data/lib/specjour/socket_helper.rb

@@ -12,6 +12,10 @@ module Specjour
       @hostname ||= Socket.gethostname
     end
 
+    def local_ip
+      @local_ip ||= UDPSocket.open {|s| s.connect('74.125.224.103', 1); s.addr.last }
+    end
+
     def current_uri
       @current_uri ||= new_uri
     end

data/lib/specjour.rb

@@ -29,7 +29,7 @@ module Specjour
   autoload :Cucumber, 'specjour/cucumber'
   autoload :RSpec, 'specjour/rspec'
 
-  VERSION ||= "0.5.6"
+  VERSION ||= "0.6.0"
   HOOKS_PATH ||= "./.specjour/hooks.rb"
   PROGRAM_NAME ||= $PROGRAM_NAME # keep a reference of the original program name
 
@@ -71,7 +71,7 @@ module Specjour
   end
 
   def self.load_custom_hooks
-    require HOOKS_PATH if File.exists?(HOOKS_PATH)
+    load HOOKS_PATH if File.exists?(HOOKS_PATH)
   end
 
   def self.trap_interrupt
@@ -80,4 +80,10 @@ module Specjour
       abort("\n")
     end
   end
+
+  def self.benchmark(msg, &block)
+    print "#{msg}... "
+    time = Benchmark.realtime &block
+    puts "completed in #{time}s"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specjour
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -161,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1360517515995431807
+      hash: -4214372861778010771
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: