spork 0.4.2 → 0.4.4

data/lib/spork.rb

@@ -1,17 +1,23 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 module Spork
-  SPEC_HELPER_FILE = File.join(Dir.pwd, "spec/spec_helper.rb")
-  
   class << self
+    def already_preforked
+      @already_preforked ||= []
+    end
+    
+    def already_run
+      @already_run ||= []
+    end
+    
     def prefork(&block)
-      return if @already_preforked
-      @already_preforked = true
+      return if already_preforked.include?(expanded_caller(caller.first))
+      already_preforked << expanded_caller(caller.first)
       yield
     end
   
     def each_run(&block)
-      return if @state == :preforking || (@state != :not_using_spork && @already_run)
-      @already_run = true
+      return if @state == :preforking || (@state != :not_using_spork && already_run.include?(expanded_caller(caller.first)))
+      already_run << expanded_caller(caller.first)
       yield
     end
   
@@ -36,5 +42,11 @@ module Spork
       running!
       load(helper_file)
     end
+    
+    def expanded_caller(caller_line)
+      file, line = caller_line.split(":")
+      line.gsub(/:.+/, '')
+      File.expand_path(Dir.pwd, file) + ":" + line
+    end
   end
 end

data/lib/spork/forker.rb

@@ -0,0 +1,54 @@
+class Spork::Forker
+  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
+  
+  def result
+    return unless running?
+    result_thread = Thread.new do
+      begin
+        @result = Marshal.load(@server_io)
+        Marshal.dump('ACK', @server_io)
+      rescue ForkDiedException
+        @result = nil
+      end
+    end
+    Process.wait(@child_pid)
+    result_thread.raise(ForkDiedException) if @result.nil?
+    @child_pid = nil
+    @result
+  end
+  
+  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/server.rb

@@ -1,5 +1,6 @@
 require 'drb/drb'
 require 'rbconfig'
+require 'spork/forker.rb'
 
 # This is based off of spec_server.rb from rspec-rails (David Chelimsky), which was based on Florian Weber's TDDMate
 class Spork::Server
@@ -93,19 +94,16 @@ class Spork::Server
   
   def run(argv, stderr, stdout)
     return false if running?
-    $stdout = stdout
-    $stderr = stderr
-    @child_pid = Kernel.fork do
+    @child = ::Spork::Forker.new do
+      $stdout, $stderr = stdout, stderr
       Spork.exec_each_run(helper_file)
       run_tests(argv, stderr, stdout)
     end
-    Process.wait(@child_pid)
-    @child_pid = nil
-    true
+    @child.result
   end
   
   def running?
-    !! @child_pid
+    @child && @child.running?
   end
   
   private
@@ -140,16 +138,13 @@ class Spork::Server
     end
     
     def abort
-      if running?
-        Process.kill(Signal.list['TERM'], @child_pid)
-        true
-      end
+      @child && @child.abort
     end
     
     def sig_int_received
       if running?
         abort
-        puts "Running specs stopped.  Press CTRL-C again to stop the server."
+        puts "Running tests stopped.  Press CTRL-C again to stop the server."
       else
         exit!(0)
       end

data/lib/spork/server/cucumber.rb

@@ -2,23 +2,27 @@ class Spork::Server::Cucumber < Spork::Server
   CUCUMBER_PORT = 8990
   CUCUMBER_HELPER_FILE = File.join(Dir.pwd, "features/support/env.rb")
   
-  def self.port
-    CUCUMBER_PORT
-  end
-  
-  def self.helper_file
-    CUCUMBER_HELPER_FILE
+  class << self
+    def port
+      CUCUMBER_PORT
+    end
+    
+    def helper_file
+      CUCUMBER_HELPER_FILE
+    end
+
+    attr_accessor :step_mother
   end
   
-  def self.step_mother=(value)
-    @step_mother = value
+  def step_mother
+    self.class.step_mother
   end
   
   def run_tests(argv, stderr, stdout)
     require 'cucumber/cli/main'
-    ::Cucumber::Cli::Main.step_mother = @step_mother
-    ::Cucumber::Cli::Main.new(argv, stderr, stdout).execute!(@step_mother)
+    ::Cucumber::Cli::Main.step_mother = step_mother
+    ::Cucumber::Cli::Main.new(argv, stdout, stderr).execute!(step_mother)
   end
 end
 
-Spork::Server::Cucumber.step_mother = self
+Spork::Server::Cucumber.step_mother = self

data/spec/spec_helper.rb

@@ -1,32 +1,3 @@
-require 'rubygems'
-require 'spork'
-
-Spork.prefork do
-  # Loading more in this block will cause your specs to run faster. However, 
-  # if you change any configuration or code from libraries loaded here, you'll
-  # need to restart spork for it take effect.
-  
-end
-
-Spork.each_run do
-  # This code will be run each time you run your specs.
-  
-end
-
-# --- Instructions ---
-# - Sort through your spec_helper file. Place as much environment loading 
-#   code that you don't normally modify during development in the 
-#   Spork.prefork block.
-# - Place the rest under Spork.each_run block
-# - Any code that is left outside of the blocks will be ran during preforking
-#   and during each_run!
-# - These instructions should self-destruct in 10 seconds.  If they don't,
-#   feel free to delete them.
-#
-
-
-
-
 require 'rubygems'
 require 'spec'
 

data/spec/spork/forker_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Spork::Forker do
+  it "runs a block in a fork" do
+    @var = "hello world"
+    Spork::Forker.new { @var = "booyah" }.result
+    @var.should == "hello world"
+  end
+  
+  it "returns the result" do
+    Spork::Forker.new { "results" }.result.should == "results"
+  end
+  
+  it "reports when the fork is running" do
+    forker = Spork::Forker.new { sleep 0.1 }
+    forker.running?.should == true
+    forker.result
+    sleep 0.1
+    forker.running?.should == false
+  end
+  
+  it "aborts a fork and returns nil for the result" do
+    started_at = Time.now
+    ended_at = nil
+    forker = Spork::Forker.new { sleep 5 }
+    Thread.new do
+      forker.result.should == nil
+      ended_at = Time.now
+    end
+    sleep 0.5
+    forker.abort
+    sleep 0.1
+    (ended_at - started_at).should be_close(0.5, 0.1)
+    forker.running?.should == false
+  end
+end

data/spec/spork/server/rspec_spec.rb

@@ -2,10 +2,14 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Spork::Server::RSpec do
   before(:each) do
-    @adapter = Spork::Adapter::RSpec.new
+    @server = Spork::Server::RSpec.new
   end
   
   it "uses the RSPEC_PORT for it's port" do
-    @adapter.port.should == Spork::Adapter::RSpec::RSPEC_PORT
+    @server.port.should == Spork::Server::RSpec::RSPEC_PORT
+  end
+  
+  it "uses the RSPEC_HELPER_FILE for it's helper_file" do
+    @server.helper_file.should == Spork::Server::RSpec::RSPEC_HELPER_FILE
   end
 end

data/spec/spork/server_spec.rb

@@ -20,6 +20,7 @@ class FakeServer < Spork::Server
   
   def run_tests(argv, input, output)
     sleep(@wait_time || 0.5)
+    true
   end
 end
 
@@ -119,8 +120,14 @@ describe Spork::Server do
       sleep(0.05)
       @fake.send(:abort)
       sleep(0.01) while @fake.running?
-    
+      
       (Time.now - started_at).should < @fake.wait_time
     end
+    
+    it "returns the result of the run_tests method from the forked child" do
+      create_helper_file
+      @fake.stub!(:run_tests).and_return("tests were ran")
+      @fake.run("test", STDOUT, STDIN).should == "tests were ran"
+    end
   end
 end

data/spec/spork_spec.rb

@@ -41,4 +41,15 @@ describe Spork do
   it "runs both blocks when Spork not activated" do
     spec_helper_simulator.should == [:prefork, :each_run]
   end
+  
+  it "prevents blocks from being ran twice" do
+    spec_helper_simulator.should == [:prefork, :each_run]
+    spec_helper_simulator.should == []
+  end
+  
+  it "runs multiple prefork and each_run blocks at different locations" do
+    Spork.prefork { }
+    Spork.each_run { }
+    spec_helper_simulator.should == [:prefork, :each_run]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-30 00:00:00 -06:00
+date: 2009-06-01 00:00:00 -06:00
 default_executable: spork
 dependencies: []
 
@@ -28,11 +28,13 @@ files:
 - README.rdoc
 - assets/bootstrap.rb
 - lib/spork.rb
+- lib/spork/forker.rb
 - lib/spork/runner.rb
 - lib/spork/server.rb
 - lib/spork/server/cucumber.rb
 - lib/spork/server/rspec.rb
 - spec/spec_helper.rb
+- spec/spork/forker_spec.rb
 - spec/spork/runner_spec.rb
 - spec/spork/server/rspec_spec.rb
 - spec/spork/server_spec.rb
@@ -66,6 +68,7 @@ specification_version: 2
 summary: spork
 test_files: 
 - spec/spec_helper.rb
+- spec/spork/forker_spec.rb
 - spec/spork/runner_spec.rb
 - spec/spork/server/rspec_spec.rb
 - spec/spork/server_spec.rb