milhouse-spork 0.7.5 → 0.7.5.1

data/lib/spork/ext/ruby-debug.rb

@@ -1,150 +1,150 @@
-require 'socket'
-require 'forwardable'
-
-begin
-require 'ruby-debug'
-
-# Experimental!
-
-class SporkDebugger
-  DEFAULT_PORT = 10_123
-  HOST = '127.0.0.1'
-
-  extend Forwardable
-  def_delegators :state, *[:prepare_debugger, :initialize]
-  attr_reader :state
-
-  class << self
-    attr_reader :instance
-    def run
-      @instance ||= new
-    end
-  end
-
-  def initialize
-    @state = SporkDebugger::PreloadState.new
-    Spork.send(:each_run_procs).unshift(lambda do
-      @state = @state.transition_to_each_run_state
-    end)
-  end
-
-  module NetworkHelpers
-    def find_port(starting_with)
-      port = starting_with
-      begin
-        server = TCPServer.new(HOST, port)
-        server.close
-      rescue Errno::EADDRINUSE
-        port += 1
-        retry
-      end
-
-      port
-    end
-  end
-
-  class PreloadState
-    include NetworkHelpers
-    def initialize
-      Spork.each_run { install_hook }
-      listen_for_connection_signals
-    end
-
-    def finish
-      @tcp_service.close; @tcp_service = nil;
-    end
-
-    def transition_to_each_run_state
-      finish
-      SporkDebugger::EachRunState.new(@port)
-    end
-
-    protected
-      def install_hook
-        Kernel.class_eval do
-          alias :debugger_without_spork_hook :debugger
-          def debugger(steps = 1)
-            SporkDebugger.instance.prepare_debugger
-            debugger_without_spork_hook
-          end
-        end
-      end
-
-      def listen_for_connection_signals
-        @port = SporkDebugger::DEFAULT_PORT
-        begin
-          @tcp_service = TCPServer.new(SporkDebugger::HOST, @port)
-        rescue Errno::EADDRINUSE
-          @port += 1
-          retry
-        end
-        Thread.new { main_loop }
-      end
-
-      def main_loop
-        while @tcp_service do
-          socket = @tcp_service.accept
-          port = Marshal.load(socket)
-          Marshal.dump(true, socket)
-          connect_rdebug_client(port)
-          socket.close
-        end
-      rescue => e
-        puts "error: #{e.class} - #{e}"
-      end
-
-      def connect_rdebug_client(port = Debugger::PORT)
-        puts "\n\n - Debug Session Started - \n\n\n"
-        begin
-          Debugger.start_client(SporkDebugger::HOST, port)
-        rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED
-        end
-        puts "\n\n - Debug Session Terminated - \n\n\n"
-      end
-  end
-
-  class EachRunState
-    include NetworkHelpers
-    def initialize(connection_request_port)
-      @connection_request_port = connection_request_port
-    end
-
-    def prepare_debugger
-      return if @debugger_prepared
-      @debugger_prepared = true
-      port, cport = start_rdebug_server
-      signal_spork_server_to_connect_to_rdebug_server(port)
-      wait_for_connection
-      puts "\n\n - breakpoint - see your spork server for the debug terminal - \n\n"
-    end
-
-    def signal_spork_server_to_connect_to_rdebug_server(rdebug_server_port)
-      socket = TCPSocket.new(SporkDebugger::HOST, @connection_request_port)
-      Marshal.dump(rdebug_server_port, socket)
-      response = Marshal.load(socket)
-      socket.close
-    end
-
-    def start_rdebug_server
-      Debugger.stop if Debugger.started?
-      port = find_port(Debugger::PORT)
-      cport = find_port(port + 1)
-      Debugger.start_remote(SporkDebugger::HOST, [port, cport]) do
-        Debugger.run_init_script(StringIO.new)
-      end
-      Debugger.start
-      [port, cport]
-    end
-
-    protected
-      def wait_for_connection
-        while Debugger.handler.interface.nil?; sleep 0.10; end
-      end
-  end
-end
-
-Spork.prefork { SporkDebugger.run } if Spork.using_spork?
-
-rescue LoadError
-  raise LoadError, "Your project has loaded spork/ext/ruby-debug, which relies on the ruby-debug gem. It appears that ruby-debug is not installed. Please install it."
-end
+require 'socket'
+require 'forwardable'
+
+begin
+require 'ruby-debug'
+
+# Experimental!
+
+class SporkDebugger
+  DEFAULT_PORT = 10_123
+  HOST = '127.0.0.1'
+
+  extend Forwardable
+  def_delegators :state, *[:prepare_debugger, :initialize]
+  attr_reader :state
+
+  class << self
+    attr_reader :instance
+    def run
+      @instance ||= new
+    end
+  end
+
+  def initialize
+    @state = SporkDebugger::PreloadState.new
+    Spork.send(:each_run_procs).unshift(lambda do
+      @state = @state.transition_to_each_run_state
+    end)
+  end
+
+  module NetworkHelpers
+    def find_port(starting_with)
+      port = starting_with
+      begin
+        server = TCPServer.new(HOST, port)
+        server.close
+      rescue Errno::EADDRINUSE
+        port += 1
+        retry
+      end
+
+      port
+    end
+  end
+
+  class PreloadState
+    include NetworkHelpers
+    def initialize
+      Spork.each_run { install_hook }
+      listen_for_connection_signals
+    end
+
+    def finish
+      @tcp_service.close; @tcp_service = nil;
+    end
+
+    def transition_to_each_run_state
+      finish
+      SporkDebugger::EachRunState.new(@port)
+    end
+
+    protected
+      def install_hook
+        Kernel.class_eval do
+          alias :debugger_without_spork_hook :debugger
+          def debugger(steps = 1)
+            SporkDebugger.instance.prepare_debugger
+            debugger_without_spork_hook
+          end
+        end
+      end
+
+      def listen_for_connection_signals
+        @port = SporkDebugger::DEFAULT_PORT
+        begin
+          @tcp_service = TCPServer.new(SporkDebugger::HOST, @port)
+        rescue Errno::EADDRINUSE
+          @port += 1
+          retry
+        end
+        Thread.new { main_loop }
+      end
+
+      def main_loop
+        while @tcp_service do
+          socket = @tcp_service.accept
+          port = Marshal.load(socket)
+          Marshal.dump(true, socket)
+          connect_rdebug_client(port)
+          socket.close
+        end
+      rescue => e
+        puts "error: #{e.class} - #{e}"
+      end
+
+      def connect_rdebug_client(port = Debugger::PORT)
+        puts "\n\n - Debug Session Started - \n\n\n"
+        begin
+          Debugger.start_client(SporkDebugger::HOST, port)
+        rescue Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED
+        end
+        puts "\n\n - Debug Session Terminated - \n\n\n"
+      end
+  end
+
+  class EachRunState
+    include NetworkHelpers
+    def initialize(connection_request_port)
+      @connection_request_port = connection_request_port
+    end
+
+    def prepare_debugger
+      return if @debugger_prepared
+      @debugger_prepared = true
+      port, cport = start_rdebug_server
+      signal_spork_server_to_connect_to_rdebug_server(port)
+      wait_for_connection
+      puts "\n\n - breakpoint - see your spork server for the debug terminal - \n\n"
+    end
+
+    def signal_spork_server_to_connect_to_rdebug_server(rdebug_server_port)
+      socket = TCPSocket.new(SporkDebugger::HOST, @connection_request_port)
+      Marshal.dump(rdebug_server_port, socket)
+      response = Marshal.load(socket)
+      socket.close
+    end
+
+    def start_rdebug_server
+      Debugger.stop if Debugger.started?
+      port = find_port(Debugger::PORT)
+      cport = find_port(port + 1)
+      Debugger.start_remote(SporkDebugger::HOST, [port, cport]) do
+        Debugger.run_init_script(StringIO.new)
+      end
+      Debugger.start
+      [port, cport]
+    end
+
+    protected
+      def wait_for_connection
+        while Debugger.handler.interface.nil?; sleep 0.10; end
+      end
+  end
+end
+
+Spork.prefork { SporkDebugger.run } if Spork.using_spork?
+
+rescue LoadError
+  raise LoadError, "Your project has loaded spork/ext/ruby-debug, which relies on the ruby-debug gem. It appears that ruby-debug is not installed. Please install it."
+end

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/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.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/
-        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 }