spork 0.5.11 → 0.6.0

data/features/steps/general_steps.rb

@@ -0,0 +1,3 @@
+Given /^this scenario is pending.+/ do
+  pending
+end

data/lib/spork.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 module Spork
   BINARY = File.expand_path(File.dirname(__FILE__) + '/../bin/spork')
-  LIBDIR = File.expand_path(File.dirname(__FILE__))
+  LIBDIR = File.expand_path("..", File.dirname(__FILE__))
 
   class << self
     # Run a block, during prefork mode.  By default, if prefork is called twice in the same file and line number, the supplied block will only be ran once.
@@ -70,6 +70,12 @@ module Spork
       trap_method((class << klass; self; end), method_name)
     end
     
+    def detect_and_require(subfolder)
+      ([LIBDIR] + Gem.latest_load_paths.grep(/spork/)).uniq.each do |gem_path|
+        Dir.glob(File.join(gem_path, subfolder)).each { |file| require file }
+      end
+    end
+
     private
       def alias_method_names(method_name, feature)
         /^(.+?)([\?\!]{0,1})$/.match(method_name.to_s)

data/lib/spork/run_strategy.rb

@@ -0,0 +1,40 @@
+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)
+      Spork::RunStrategy::Forking.new(test_framework)
+    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

@@ -0,0 +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
+
+end

data/lib/spork/runner.rb

@@ -1,6 +1,7 @@
 require 'optparse'
 require 'spork/server'
 require 'spork/test_framework'
+require 'spork/run_strategy'
 
 module Spork
   # This is used by bin/spork. It's wrapped in a class because it's easier to test that way.
@@ -71,8 +72,9 @@ module Spork
         Spork::Diagnoser.output_results(@output)
         return true
       else
-        return(false) unless test_framework.preload
-        Spork::Server.run(:port => @options[:port], :test_framework => test_framework)
+        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

data/lib/spork/server.rb

@@ -8,11 +8,11 @@ require 'spork/app_framework.rb'
 #
 # (This was originally based off of spec_server.rb from rspec-rails (David Chelimsky), which was based on Florian Weber's TDDMate)
 class Spork::Server
-  attr_reader :test_framework
+  attr_reader :run_strategy
   include Spork::CustomIOStreams
   
   def initialize(options = {})
-    @test_framework = options[:test_framework]
+    @run_strategy = options[:run_strategy]
     @port = options[:port]
   end
   
@@ -31,11 +31,7 @@ class Spork::Server
     DRb.thread.join
   end
   
-  attr_writer :port
-
-  def port
-    @port || test_framework.class.default_port
-  end
+  attr_accessor :port
 
   # This is the public facing method that is served up by DRb.  To use it from the client side (in a testing framework):
   # 
@@ -46,20 +42,7 @@ class Spork::Server
   #
   # When implementing a test server, don't override this method: override run_tests instead.
   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
-  
-  # returns whether or not the child (a test run) is running right now.
-  def running?
-    @child && @child.running?
+    run_strategy.run(argv, stderr, stdout)
   end
   
   private
@@ -72,12 +55,8 @@ class Spork::Server
       exec(command_line)
     end
     
-    def abort
-      @child && @child.abort
-    end
-    
     def sig_int_received
-      if running?
+      if run_strategy.running?
         abort
         stderr.puts "Running tests stopped.  Press CTRL-C again to stop the server."
         stderr.flush

data/lib/spork/test_framework.rb

@@ -150,6 +150,10 @@ class Spork::TestFramework
     bootstrapped? ? helper_file : framework.entry_point
   end
 
+  def default_port
+    self.class.default_port
+  end
+
   protected
     def self.inherited(subclass)
       @@supported_test_frameworks << subclass
@@ -160,4 +164,4 @@ class Spork::TestFramework
     end
 end
 
-Dir[File.dirname(__FILE__) + "/test_framework/*.rb"].each { |file| require file }
+Spork.detect_and_require('spork/test_framework/*.rb')

data/spec/spec_helper.rb

@@ -1,34 +1,4 @@
 require 'rubygems'
-require 'spork'
-
-Spork.prefork do
-  # Loading more in this block will cause your tests 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'
 
 unless $spec_helper_loaded
   $spec_helper_loaded = true

data/spec/spork/run_strategy/forking_spec.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Spork::RunStrategy::Forking do
+  before(:each) do
+    @fake_framework = FakeFramework.new
+    @run_strategy = Spork::RunStrategy::Forking.new(@fake_framework)
+
+  end
+
+  it "returns the result of the run_tests method from the forked child" do
+    create_helper_file
+    @fake_framework.stub!(:run_tests).and_return("tests were ran")
+    @run_strategy.run("test", STDOUT, STDIN).should == "tests were ran"
+  end
+
+  it "aborts the current running thread when another run is started" do
+    create_helper_file
+    @fake_framework.wait_time = 0.25
+    first_run = Thread.new { @run_strategy.run("test", STDOUT, STDIN).should == nil }
+    sleep(0.05)
+    @run_strategy.run("test", STDOUT, STDIN).should == true
+
+    # wait for the first to finish
+    first_run.join
+  end
+
+  it "can abort the current run" do
+    create_helper_file
+    @fake_framework.wait_time = 5
+    started_at = Time.now
+    first_run = Thread.new { @run_strategy.run("test", STDOUT, STDIN).should == true }
+    sleep(0.05)
+    @run_strategy.send(:abort)
+    sleep(0.01) while @run_strategy.running?
+
+    (Time.now - started_at).should < @fake_framework.wait_time
+  end
+end

data/spec/spork/server_spec.rb

@@ -3,49 +3,13 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe Spork::Server do
   describe "a fake server" do
     before(:each) do
-      @fake_framework = FakeFramework.new
-      @server = Spork::Server.new(:test_framework => @fake_framework)
+      @fake_run_strategy = FakeRunStrategy.new
+      @server = Spork::Server.new(:run_strategy => @fake_run_strategy)
     end
-  
-    it "aborts the current running thread when another run is started" do
-      create_helper_file
-      @fake_framework.wait_time = 0.25
-      first_run = Thread.new { @server.run("test", STDOUT, STDIN).should == nil }
-      sleep(0.05)
-      @server.run("test", STDOUT, STDIN).should == true
     
-      # wait for the first to finish
-      first_run.join
-    end
-  
-    it "can abort the current run" do
-      create_helper_file
-      @fake_framework.wait_time = 5
-      started_at = Time.now
-      first_run = Thread.new { @server.run("test", STDOUT, STDIN).should == true }
-      sleep(0.05)
-      @server.send(:abort)
-      sleep(0.01) while @server.running?
-      
-      (Time.now - started_at).should < @fake_framework.wait_time
-    end
-    
-    it "returns the result of the run_tests method from the forked child" do
-      create_helper_file
-      @fake_framework.stub!(:run_tests).and_return("tests were ran")
-      @server.run("test", STDOUT, STDIN).should == "tests were ran"
-    end
-
     it "accepts a port" do
-      create_helper_file
       @server.port = 12345
       @server.port.should == 12345
     end
-
-    it "falls back to a default port" do
-      create_helper_file
-      @server.port = nil
-      @server.port.should == FakeFramework.default_port
-    end
   end
 end

data/spec/support/fake_run_strategy.rb

@@ -0,0 +1,21 @@
+class FakeRunStrategy < Spork::RunStrategy
+  def initialize(*args)
+  end
+
+  def self.available?
+    true
+  end
+
+  def run(argv, stderr, stdout)
+    sleep(@wait_time || 0.5)
+    true
+  end
+
+  def running?
+    false
+  end
+
+  def preload
+    true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.5.11
+  version: 0.6.0
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -06:00
+date: 2009-09-12 00:00:00 -04:00
 default_executable: spork
 dependencies: []
 
@@ -46,6 +46,8 @@ files:
 - lib/spork/custom_io_streams.rb
 - lib/spork/diagnoser.rb
 - lib/spork/forker.rb
+- lib/spork/run_strategy.rb
+- lib/spork/run_strategy/forking.rb
 - lib/spork/runner.rb
 - lib/spork/server.rb
 - lib/spork/test_framework.rb
@@ -57,6 +59,7 @@ files:
 - spec/spork/app_framework_spec.rb
 - spec/spork/diagnoser_spec.rb
 - spec/spork/forker_spec.rb
+- spec/spork/run_strategy/forking_spec.rb
 - spec/spork/runner_spec.rb
 - spec/spork/server_spec.rb
 - spec/spork/test_framework/cucumber_spec.rb
@@ -64,6 +67,7 @@ files:
 - spec/spork/test_framework_spec.rb
 - spec/spork_spec.rb
 - spec/support/fake_framework.rb
+- spec/support/fake_run_strategy.rb
 has_rdoc: true
 homepage: http://github.com/timcharper/spork
 licenses: []
@@ -100,6 +104,7 @@ test_files:
 - spec/spork/app_framework_spec.rb
 - spec/spork/diagnoser_spec.rb
 - spec/spork/forker_spec.rb
+- spec/spork/run_strategy/forking_spec.rb
 - spec/spork/runner_spec.rb
 - spec/spork/server_spec.rb
 - spec/spork/test_framework/cucumber_spec.rb
@@ -107,3 +112,4 @@ test_files:
 - spec/spork/test_framework_spec.rb
 - spec/spork_spec.rb
 - spec/support/fake_framework.rb
+- spec/support/fake_run_strategy.rb