@@ -10,12 +10,26 @@ module RSpactor ticker end - def self.ticker_msg(msg, seconds_to_wait = 3) + def self.ticker_msg(msg, seconds_to_wait = 3, &block) $stdout.print msg - seconds_to_wait.times do - $stdout.print('.') - $stdout.flush - sleep 1 + if block + @yielding_ticker = true + Thread.new do + loop do + $stdout.print('.') if @yielding_ticker == true + $stdout.flush + sleep 1.0 + end + end + + yield + @yielding_ticker = false + else + seconds_to_wait.times do + $stdout.print('.') + $stdout.flush + sleep 1 + end end $stdout.puts "\n" end lib/rspactor/interactor.rb @@ -7,7 +7,7 @@ module RSpactor new(run_in, options).start end - attr_reader :dir, :options, :inspector, :interactor + attr_reader :dir, :options, :inspector, :interactor, :spork def initialize(dir, options = {}) @dir = dir @@ -18,7 +18,7 @@ module RSpactor def start load_dotfile puts "** RSpactor, now watching at '#{dir}'" - Spork.start if options[:spork] + (@spork = Spork.new(self)) && @spork.start if options[:spork] Celerity.start(dir) if options[:celerity] start_interactor start_listener lib/rspactor/runner.rb @@ -1,25 +1,65 @@ require 'rspactor' +require 'socket' module RSpactor class Spork + RSPEC_PORT = 8989 + CUCUMBER_PORT = 8990 - def self.start - kill_and_launch - Interactor.ticker_msg "** Launching Spork for rspec & cucumber" + attr_accessor :use_cucumber + + def initialize(runner) + @use_cucumber = File.exist?(File.join(runner.dir, 'features')) + end + + def start + execute(:start) end - def self.reload - kill_and_launch - Interactor.ticker_msg "** Reloading Spork for rspec & cucumber" + def reload + execute(:reload) end private + + def execute(start_or_reload) + action_message = (start_or_reload == :start) ? "Starting" : "Reloading" + message = "** #{action_message} Spork for rspec" + message += " & cucumber" if use_cucumber + kill_and_launch(message) + end - def self.kill_and_launch - system("kill $(ps aux | awk '/spork/&&!/awk/{print $2;}') >/dev/null 2>&1") - system("spork >/dev/null 2>&1 < /dev/null &") - system("spork cu >/dev/null 2>&1 < /dev/null &") + def kill_and_launch(message) + Interactor.ticker_msg message do + + system("kill $(ps aux | awk '/spork/&&!/awk/{print $2;}') >/dev/null 2>&1") + + system("spork >/dev/null 2>&1 < /dev/null &") + wait_for('RSpec', RSPEC_PORT) + + if use_cucumber + system("spork cu >/dev/null 2>&1 < /dev/null &") + wait_for('Cucumber', CUCUMBER_PORT) + end + + end + end + + def wait_for(sporker, port) + 15.times do + begin + TCPSocket.new('localhost', port).close + rescue Errno::ECONNREFUSED + sleep(1) + next + end + + return true + end + + raise "could not load spork for #{sporker}; make sure you can use it manually first" end end + end lib/rspactor/spork.rb @@ -3,7 +3,7 @@ require 'rspactor/inspector' describe RSpactor::Inspector do before(:all) do options = { :view => true } - @inspector = described_class.new(mock('Runner', :dir => '/project', :options => options)) + @inspector = described_class.new(mock('Runner', :dir => '/project', :options => options, :spork => false)) end def translate(file) spec/inspector_spec.rb 3f96449e287b6fa5e536b5a82c3ca9b310866a5d 81b0edb5890d69aab76b2afd8e25c8f60a71a101 Woody Peterson woody.peterson@gmail.com http://github.com/rubyphunk/rspactor/commit/df31b546897488ed9216729f6533b222255a4a2c df31b546897488ed9216729f6533b222255a4a2c 2009-10-19T22:05:12-07:00 2009-10-19T22:05:12-07:00 Merge branch 'waiting_spork_loader' 0154f4afce7dbf722a6ead5bf9607d2cdc0e18a0 Woody Peterson woody.peterson@gmail.com