milhouse-spork 0.7.5.2 → 0.7.5.4

data/lib/spork/forker.rb

@@ -1,70 +1,70 @@
-# A helper class that allows you to run a block inside of a fork, and then get the result from that block.
-#
-# == Example:
-#
-#   forker = Spork::Forker.new do
-#     sleep 3
-#     "success"
-#   end
-#   
-#   forker.result # => "success"
-class Spork::Forker
-  
-  # Raised if the fork died (was killed) before it sent it's response back.
-  class ForkDiedException < Exception; end
-  def initialize(&block)
-    return unless block_given?
-    @child_io, @server_io = UNIXSocket.socketpair
-    @child_pid = Kernel.fork do
-      @server_io.close
-      Marshal.dump(yield, @child_io)
-      # wait for the parent to acknowledge receipt of the result.
-      master_response = 
-        begin
-          Marshal.load(@child_io)
-        rescue EOFError
-          nil
-        end
-      
-      # terminate, skipping any at_exit blocks.
-      exit!(0)
-    end
-    @child_io.close
-  end
-  
-  # Wait for the fork to finish running, and then return its return value.
-  #
-  # If the fork was aborted, then result returns nil.
-  def result
-    return unless running?
-    result_thread = Thread.new do
-      begin
-        @result = Marshal.load(@server_io)
-        Marshal.dump('ACK', @server_io)
-      rescue ForkDiedException, EOFError
-        @result = nil
-      end
-    end
-    Process.wait(@child_pid)
-    result_thread.raise(ForkDiedException) if @result.nil?
-    @child_pid = nil
-    @result
-  end
-  
-  # abort the current running fork
-  def abort
-    if running?
-      Process.kill(Signal.list['TERM'], @child_pid)
-      @child_pid = nil
-      true
-    end
-  end
-  
-  def running?
-    return false unless @child_pid
-    Process.getpgid(@child_pid)
-    true
-  rescue Errno::ESRCH
-    false
-  end
-end
+# A helper class that allows you to run a block inside of a fork, and then get the result from that block.
+#
+# == Example:
+#
+#   forker = Spork::Forker.new do
+#     sleep 3
+#     "success"
+#   end
+#   
+#   forker.result # => "success"
+class Spork::Forker
+  
+  # Raised if the fork died (was killed) before it sent it's response back.
+  class ForkDiedException < Exception; end
+  def initialize(&block)
+    return unless block_given?
+    @child_io, @server_io = UNIXSocket.socketpair
+    @child_pid = Kernel.fork do
+      @server_io.close
+      Marshal.dump(yield, @child_io)
+      # wait for the parent to acknowledge receipt of the result.
+      master_response = 
+        begin
+          Marshal.load(@child_io)
+        rescue EOFError
+          nil
+        end
+      
+      # terminate, skipping any at_exit blocks.
+      exit!(0)
+    end
+    @child_io.close
+  end
+  
+  # Wait for the fork to finish running, and then return its return value.
+  #
+  # If the fork was aborted, then result returns nil.
+  def result
+    return unless running?
+    result_thread = Thread.new do
+      begin
+        @result = Marshal.load(@server_io)
+        Marshal.dump('ACK', @server_io)
+      rescue ForkDiedException, EOFError
+        @result = nil
+      end
+    end
+    Process.wait(@child_pid)
+    result_thread.raise(ForkDiedException) if @result.nil?
+    @child_pid = nil
+    @result
+  end
+  
+  # abort the current running fork
+  def abort
+    if running?
+      Process.kill(Signal.list['TERM'], @child_pid)
+      @child_pid = nil
+      true
+    end
+  end
+  
+  def running?
+    return false unless @child_pid
+    Process.getpgid(@child_pid)
+    true
+  rescue Errno::ESRCH
+    false
+  end
+end

data/lib/spork/run_strategy.rb

@@ -1,44 +1,44 @@
-class Spork::RunStrategy
-  attr_reader :test_framework
-  @@run_strategies = []
-
-  def initialize(test_framework)
-    @test_framework = test_framework
-  end
-
-  def preload
-    raise NotImplementedError
-  end
-
-  def run(argv, input, output)
-    raise NotImplementedError
-  end
-
-  def cleanup
-    raise NotImplementedError
-  end
-
-  def running?
-    raise NotImplementedError
-  end
-
-  def abort
-    raise NotImplementedError
-  end
-
-  protected
-    def self.factory(test_framework)
-      if RUBY_PLATFORM =~ /mswin|mingw/
-        Spork::RunStrategy::Magazine.new(test_framework)
-      else
-        Spork::RunStrategy::Forking.new(test_framework)
-      end
-    end
-
-    def self.inherited(subclass)
-      @@run_strategies << subclass
-    end
-
-end
-
-Dir[File.dirname(__FILE__) + "/run_strategy/*.rb"].each { |file| require file }
+class Spork::RunStrategy
+  attr_reader :test_framework
+  @@run_strategies = []
+
+  def initialize(test_framework)
+    @test_framework = test_framework
+  end
+
+  def preload
+    raise NotImplementedError
+  end
+
+  def run(argv, input, output)
+    raise NotImplementedError
+  end
+
+  def cleanup
+    raise NotImplementedError
+  end
+
+  def running?
+    raise NotImplementedError
+  end
+
+  def abort
+    raise NotImplementedError
+  end
+
+  protected
+    def self.factory(test_framework)
+      if RUBY_PLATFORM =~ /mswin|mingw/
+        Spork::RunStrategy::Magazine.new(test_framework)
+      else
+        Spork::RunStrategy::Forking.new(test_framework)
+      end
+    end
+
+    def self.inherited(subclass)
+      @@run_strategies << subclass
+    end
+
+end
+
+Dir[File.dirname(__FILE__) + "/run_strategy/*.rb"].each { |file| require file }

data/lib/spork/run_strategy/forking.rb

@@ -1,30 +1,30 @@
-class Spork::RunStrategy::Forking < Spork::RunStrategy
-  def self.available?
-    Kernel.respond_to?(:fork)
-  end
-
-  def run(argv, stderr, stdout)
-    abort if running?
-
-    @child = ::Spork::Forker.new do
-      $stdout, $stderr = stdout, stderr
-      load test_framework.helper_file
-      Spork.exec_each_run
-      test_framework.run_tests(argv, stderr, stdout)
-    end
-    @child.result
-  end
-
-  def abort
-    @child && @child.abort
-  end
-
-  def preload
-    test_framework.preload
-  end
-
-  def running?
-    @child && @child.running?
-  end
-
+class Spork::RunStrategy::Forking < Spork::RunStrategy
+  def self.available?
+    Kernel.respond_to?(:fork)
+  end
+
+  def run(argv, stderr, stdout)
+    abort if running?
+
+    @child = ::Spork::Forker.new do
+      $stdout, $stderr = stdout, stderr
+      load test_framework.helper_file
+      Spork.exec_each_run
+      test_framework.run_tests(argv, stderr, stdout)
+    end
+    @child.result
+  end
+
+  def abort
+    @child && @child.abort
+  end
+
+  def preload
+    test_framework.preload
+  end
+
+  def running?
+    @child && @child.running?
+  end
+
 end

data/lib/spork/run_strategy/magazine.rb

@@ -41,7 +41,7 @@ class Spork::RunStrategy::Magazine < Spork::RunStrategy
     Slave_Id_Range.each do |id|
       start_slave(id)
     end
-    puts "---- start to fill pool...------"; $stdout.flush
+    puts "  -- start to fill pool..."; $stdout.flush
   end
 
   def start_slave(id)
@@ -59,17 +59,18 @@ class Spork::RunStrategy::Magazine < Spork::RunStrategy
         DRb.start_service
         ts = Rinda::RingFinger.primary
         if ts.read_all([:name, :MagazineSlave, nil, nil]).size > 0
-          print '  --> take tuple'; stdout.flush
+          print '  <-- take tuple'; stdout.flush
           tuple = ts.take([:name, :MagazineSlave, nil, nil])
           slave = tuple[2]
           id = tuple[3]
 
           puts "(#{slave.id_num}); slave.run..."; $stdout.flush
-          slave.run(argv,stderr,stdout)
-          puts "  <-- (#{slave.id_num});run done"; $stdout.flush
-
-          restart_slave(id)
-#           kill_all_processes
+          begin
+            slave.run(argv,stderr,stdout)
+            puts "   -- (#{slave.id_num});run done"; $stdout.flush
+          ensure
+            restart_slave(id)
+          end
         else
           puts '- NO tuple'; $stdout.flush
         end

data/lib/spork/run_strategy/magazine/magazine_slave_provider.rb

@@ -17,11 +17,11 @@ test_framework_short_name = ARGV[2]
 DRb.start_service
 
 Dir.chdir app_pwd
-puts "\n  --> build slave #{id} pwd: #{Dir.pwd}"; $stdout.flush
+puts "   -- build slave #{id}..."; $stdout.flush
 magazine_slave = MagazineSlave.new(id, test_framework_short_name )
 Rinda::RingProvider.new(:MagazineSlave, magazine_slave, id).provide
 
-puts "  <-- DRb magazine_slave_service: #{id} provided...\n\n"; $stdout.flush
+puts "  --> DRb magazine_slave_service: #{id} provided..."; $stdout.flush
 
 # wait for the DRb service to finish before exiting
 DRb.thread.join

data/lib/spork/run_strategy/magazine/ring_server.rb

@@ -5,6 +5,6 @@ require 'rinda/tuplespace'
 DRb.start_service
 
 Rinda::RingServer.new(Rinda::TupleSpace.new)
-puts "Ringer Server listening for connections...\n\n"
+puts "  -- Rinda Ring Server listening for connections...\n\n"
 $stdout.flush
 DRb.thread.join

data/lib/spork/runner.rb

@@ -1,90 +1,90 @@
-require 'optparse'
-
-module Spork
-  # This is used by bin/spork. It's wrapped in a class because it's easier to test that way.
-  class Runner
-    attr_reader :test_framework
-    
-    def self.run(args, output, error)
-      self.new(args, output, error).run
-    end
-    
-    def initialize(args, output, error)
-      raise ArgumentError, "expected array of args" unless args.is_a?(Array)
-      @output = output
-      @error = error
-      @options = {}
-      opt = OptionParser.new
-      opt.banner = "Usage: spork [test framework name] [options]\n\n"
-      
-      opt.separator "Options:"
-      opt.on("-b", "--bootstrap")  {|ignore| @options[:bootstrap] = true }
-      opt.on("-d", "--diagnose")  {|ignore| @options[:diagnose] = true }
-      opt.on("-h", "--help")  {|ignore| @options[:help] = true }
-      opt.on("-p", "--port [PORT]") {|port| @options[:port] = port }
-      non_option_args = args.select { |arg| ! args[0].match(/^-/) }
-      @options[:server_matcher] = non_option_args[0]
-      opt.parse!(args)
-      
-      if @options[:help]
-        @output.puts opt
-        @output.puts
-        @output.puts supported_test_frameworks_text
-        exit(0)
-      end
-    end
-    
-    def supported_test_frameworks_text
-      text = StringIO.new
-      
-      text.puts "Supported test frameworks:"
-      text.puts Spork::TestFramework.supported_test_frameworks.sort { |a,b| a.short_name <=> b.short_name }.map { |s| (s.available? ? '(*) ' : '( ) ') + s.short_name }
-      text.puts "\nLegend: ( ) - not detected in project   (*) - detected\n"
-      text.string
-    end
-    
-    # Returns a server for the specified (or the detected default) testing framework.  Returns nil if none detected, or if the specified is not supported or available.
-    def find_test_framework
-      Spork::TestFramework.factory(@output, @error, options[:server_matcher])
-    rescue Spork::TestFramework::NoFrameworksAvailable => e
-      @error.puts e.message
-    rescue Spork::TestFramework::FactoryException => e
-      @error.puts "#{e.message}\n\n#{supported_test_frameworks_text}"
-    end
-    
-    def run
-      return false unless test_framework = find_test_framework
-      ENV["DRB"] = 'true'
-      @error.puts "Using #{test_framework.short_name}"
-      @error.flush
-
-      case
-      when options[:bootstrap]
-        test_framework.bootstrap
-      when options[:diagnose]
-        require 'spork/diagnoser'
-        
-        Spork::Diagnoser.install_hook!(test_framework.entry_point)
-        test_framework.preload
-        Spork::Diagnoser.output_results(@output)
-        return true
-      else
-        Spork.using_spork!
-        run_strategy = Spork::RunStrategy.factory(test_framework)
-        return(false) unless run_strategy.preload
-        Spork::Server.run(:port => @options[:port] || test_framework.default_port, :run_strategy => run_strategy)
-        return true
-      end
-    end
-    
-    private
-    attr_reader :options 
-
-  end
-end
-
-
-
-
-
-
+require 'optparse'
+
+module Spork
+  # This is used by bin/spork. It's wrapped in a class because it's easier to test that way.
+  class Runner
+    attr_reader :test_framework
+    
+    def self.run(args, output, error)
+      self.new(args, output, error).run
+    end
+    
+    def initialize(args, output, error)
+      raise ArgumentError, "expected array of args" unless args.is_a?(Array)
+      @output = output
+      @error = error
+      @options = {}
+      opt = OptionParser.new
+      opt.banner = "Usage: spork [test framework name] [options]\n\n"
+      
+      opt.separator "Options:"
+      opt.on("-b", "--bootstrap")  {|ignore| @options[:bootstrap] = true }
+      opt.on("-d", "--diagnose")  {|ignore| @options[:diagnose] = true }
+      opt.on("-h", "--help")  {|ignore| @options[:help] = true }
+      opt.on("-p", "--port [PORT]") {|port| @options[:port] = port }
+      non_option_args = args.select { |arg| ! args[0].match(/^-/) }
+      @options[:server_matcher] = non_option_args[0]
+      opt.parse!(args)
+      
+      if @options[:help]
+        @output.puts opt
+        @output.puts
+        @output.puts supported_test_frameworks_text
+        exit(0)
+      end
+    end
+    
+    def supported_test_frameworks_text
+      text = StringIO.new
+      
+      text.puts "Supported test frameworks:"
+      text.puts Spork::TestFramework.supported_test_frameworks.sort { |a,b| a.short_name <=> b.short_name }.map { |s| (s.available? ? '(*) ' : '( ) ') + s.short_name }
+      text.puts "\nLegend: ( ) - not detected in project   (*) - detected\n"
+      text.string
+    end
+    
+    # Returns a server for the specified (or the detected default) testing framework.  Returns nil if none detected, or if the specified is not supported or available.
+    def find_test_framework
+      Spork::TestFramework.factory(@output, @error, options[:server_matcher])
+    rescue Spork::TestFramework::NoFrameworksAvailable => e
+      @error.puts e.message
+    rescue Spork::TestFramework::FactoryException => e
+      @error.puts "#{e.message}\n\n#{supported_test_frameworks_text}"
+    end
+    
+    def run
+      return false unless test_framework = find_test_framework
+      ENV["DRB"] = 'true'
+      @error.puts "Using #{test_framework.short_name}"
+      @error.flush
+
+      case
+      when options[:bootstrap]
+        test_framework.bootstrap
+      when options[:diagnose]
+        require 'spork/diagnoser'
+        
+        Spork::Diagnoser.install_hook!(test_framework.entry_point)
+        test_framework.preload
+        Spork::Diagnoser.output_results(@output)
+        return true
+      else
+        Spork.using_spork!
+        run_strategy = Spork::RunStrategy.factory(test_framework)
+        return(false) unless run_strategy.preload
+        Spork::Server.run(:port => @options[:port] || test_framework.default_port, :run_strategy => run_strategy)
+        return true
+      end
+    end
+    
+    private
+    attr_reader :options 
+
+  end
+end
+
+
+
+
+
+