spork 0.9.0.rc2 → 0.9.0.rc3

data/README.rdoc

@@ -8,18 +8,10 @@
 
 == SYNOPSIS:
 
-Spork is Tim Harper's implementation of test server (similar to the script/spec_server provided by rspec-rails), except rather than using the Rails constant unloading to reload your files, it forks a copy of the server each time you run your tests.  The result?  Spork runs more solid: it doesn't get corrupted over time, and it properly handles modules and any voo-doo meta programming you may have put in your app.
+Spork is Tim Harper's implementation of test server (similar to the script/spec_server that used to be provided by rspec-rails), except rather than using the Rails constant unloading to reload your files, it forks a copy of the server each time you run your tests.  The result?  Spork runs more solid: it doesn't get corrupted over time, and it properly handles modules and any voodoo meta programming you may have put in your app.
 
 Spork runs on POSIX systems using fork. It also runs on windows by pre-populating a pool of ready processes (referred to here as the "magazine" strategy).
 
-== RAILS 3
-
-Rails 3.0 support is in progress, but is not ready.  The master branch is stable and works with rails 2.3.x.
-
-Rspec 2.x support is not ready either.
-
-If you want to help, see the rails3 branch.
-
 == Supported Testing Frameworks
 
 * Rspec

data/assets/bootstrap.rb

@@ -2,27 +2,45 @@ require 'rubygems'
 require 'spork'
 
 Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However, 
+  # 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.
+# Sort the contents of this file into a Spork.prefork and a Spork.each_run
+# block.
+#
+# The Spork.prefork block is run only once when the spork server is started.
+# You typically want to place most of your (slow) initializer code in here, in
+# particular, require'ing any 3rd-party gems that you don't normally modify
+# during development.
+#
+# The Spork.each_run block is run each time you run your specs.  In case you
+# need to load files that tend to change during development, require them here.
+# With Rails, your application modules are loaded automatically, so sometimes
+# this block can remain empty.
+#
+# Note: You can modify files loaded *from* the Spork.each_run block without
+# restarting the spork server.  However, this file itself will not be reloaded,
+# so if you change any of the code inside the each_run block, you still need to
+# restart the server.  In general, if you have non-trivial code in this file,
+# it's advisable to move it into a separate file so you can easily edit it
+# without restarting spork.  (For example, with RSpec, you could move
+# non-trivial code into a file spec/support/my_helper.rb, making sure that the
+# spec/support/* files are require'd from inside the each_run block.)
+#
+# Any code that is left outside the two blocks will be run during preforking
+# *and* during each_run -- that's probably not what you want.
 #
+# These instructions should self-destruct in 10 seconds.  If they don't, feel
+# free to delete them.
 
 
 

data/features/gemfiles/rails3.0/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/timcharper/projects/spork
   specs:
-    spork (0.9.0.rc)
+    spork (0.9.0.rc2)
 
 GEM
   remote: http://rubygems.org/

data/lib/spork.rb

@@ -131,7 +131,11 @@ module Spork
       def expanded_caller(caller_line)
         file, line = caller_line.split(/:(\d+)/)
         line.gsub(/:.+/, '')
-        File.expand_path(file, Dir.pwd) + ":" + line
+        expanded = File.expand_path(file, Dir.pwd) + ":" + line
+        if ENV['OS'] == 'Windows_NT' # windows
+          expanded = expanded[2..-1]
+        end
+        expanded
       end
       
       def already_ran?(caller_script_and_line)

data/lib/spork/run_strategy.rb

@@ -28,7 +28,7 @@ class Spork::RunStrategy
 
   protected
     def self.factory(test_framework)
-      if RUBY_PLATFORM =~ /mswin|mingw/
+      if RUBY_PLATFORM =~ /mswin|mingw|java/
         Spork::RunStrategy::Magazine.new(test_framework)
       else
         Spork::RunStrategy::Forking.new(test_framework)

data/lib/spork/run_strategy/magazine.rb

@@ -4,11 +4,11 @@
 require 'drb'
 require 'rinda/ring'
 require 'win32/process' if RUBY_PLATFORM =~ /mswin|mingw/  and RUBY_VERSION < '1.9.1'
+require 'rubygems' # used for Gem.ruby
 
 $:.unshift(File.dirname(__FILE__))
 require 'magazine/magazine_slave'
 
-
 class Spork::RunStrategy::Magazine < Spork::RunStrategy
 
   Slave_Id_Range = 1..2 # Ringserver uses id: 0. Slave use: 1..MAX_SLAVES
@@ -33,8 +33,8 @@ class Spork::RunStrategy::Magazine < Spork::RunStrategy
   end
 
   def start_Rinda_ringserver
-    app_name = 'ruby ring_server.rb'
-    spawn_process(app_name)    
+    app_name = "#{Gem.ruby} ring_server.rb"
+    spawn_process(app_name)
   end
 
   def fill_slave_pool
@@ -49,11 +49,21 @@ class Spork::RunStrategy::Magazine < Spork::RunStrategy
 
   def start_slave(id)
     app_pwd = Dir.pwd  # path running app in
-    app = "ruby magazine_slave_provider.rb #{id} '#{app_pwd}' #{@test_framework.short_name}"
+    app = "#{Gem.ruby} magazine_slave_provider.rb #{id} '#{app_pwd}' #{@test_framework.short_name}"
     @pids[id] = spawn_process(app)
   end
 
   def spawn_process(app)
+
+    if RUBY_PLATFORM =~ /java/
+      # jruby 1.8 has no easy way to just spawn, so use a thread
+      Dir.chdir(@path) do
+        io = IO.popen app
+        Thread.new { puts io.read }        
+        return io.pid
+      end
+    end
+    
     if RUBY_VERSION < '1.9.1'
       Process.create( :app_name => app, :cwd => @path ).process_id
     else
@@ -92,9 +102,19 @@ class Spork::RunStrategy::Magazine < Spork::RunStrategy
     start_slave(id)
   end
 
+  def windows?
+    ENV['OS'] == 'Windows_NT'
+  end
+  
   def kill_all_processes
 
-    @pids.each {|pid| Process.kill(9, pid)}
+    @pids.each {|pid| 
+      if windows?
+        system("taskkill /f /pid #{pid}")
+      else
+        Process.kill(9, pid)
+      end
+    }
     puts "\nKilling processes."; $stdout.flush
   end
 

data/lib/spork/server.rb

@@ -44,7 +44,9 @@ class Spork::Server
   #
   # When implementing a test server, don't override this method: override run_tests instead.
   def run(argv, stderr, stdout)
+    puts "Running tests with args #{argv.inspect}..."
     run_strategy.run(argv, stderr, stdout)
+    puts "Done.\n\n"
   end
   
   def abort

data/lib/spork/test_framework.rb

@@ -9,7 +9,7 @@ class Spork::TestFramework
 
   class NoFrameworksAvailable < FactoryException
     def message
-      "I can't find any testing frameworks to use.  Are you running me from a project directory?"
+      "I can\'t find any testing frameworks to use.  Are you running me from a project directory?"
     end
   end
 
@@ -19,7 +19,7 @@ class Spork::TestFramework
     end
 
     def message
-      "I can't find the file #{@framework.helper_file} for the #{@framework.short_name} testing framework.\nAre you running me from the project directory?"
+      "I can\'t find the file #{@framework.helper_file} for the #{@framework.short_name} testing framework.\nAre you running me from the project directory?"
     end
   end
 
@@ -29,7 +29,7 @@ class Spork::TestFramework
     end
 
     def message
-      "Couldn't find a supported test framework that begins with '#{@beginning_with}'"
+      "Couldn\'t find a supported test framework that begins with '#{@beginning_with}'"
     end
   end
 
@@ -123,7 +123,7 @@ class Spork::TestFramework
         stderr.flush
 
         if framework.bootstrap_required?
-          stderr.puts "I can't do anything for you by default for the framework your using: #{framework.short_name}.\nYou must bootstrap #{helper_file} to continue."
+          stderr.puts "I can't do anything for you by default for the framework you're using: #{framework.short_name}.\nYou must bootstrap #{helper_file} to continue."
           stderr.flush
           return false
         else

data/spec/spec_helper.rb

@@ -46,6 +46,10 @@ unless $spec_helper_loaded
     def change_current_dir(sub_path)
       @current_dir = File.expand_path(sub_path, SPEC_TMP_DIR)
     end
+    
+    def windows?
+      ENV['OS'] == 'Windows_NT'
+    end
   end
 
 

data/spec/spork/forker_spec.rb

@@ -41,4 +41,4 @@ describe Spork::Forker do
       forker.running?.should == false
     end
   end
-end
+end unless windows?

data/spec/spork/run_strategy/forking_spec.rb

@@ -35,4 +35,4 @@ describe Spork::RunStrategy::Forking do
 
     (Time.now - started_at).should < @fake_framework.wait_time
   end
-end
+end unless windows?

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  hash: 977940487
-  prerelease: true
+  hash: 15424131
+  prerelease: 6
   segments: 
   - 0
   - 9
   - 0
-  - rc2
-  version: 0.9.0.rc2
+  - rc
+  - 3
+  version: 0.9.0.rc3
 platform: ruby
 authors: 
 - Tim Harper
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -06:00
+date: 2011-02-06 00:00:00 -07:00
 default_executable: spork
 dependencies: []
 
@@ -37,9 +38,6 @@ files:
 - MIT-LICENSE
 - lib/spork/app_framework/padrino.rb
 - lib/spork/app_framework/rails.rb
-- lib/spork/app_framework/rails_stub_files/application.rb
-- lib/spork/app_framework/rails_stub_files/application_controller.rb
-- lib/spork/app_framework/rails_stub_files/application_helper.rb
 - lib/spork/app_framework/unknown.rb
 - lib/spork/app_framework.rb
 - lib/spork/custom_io_streams.rb
@@ -124,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: spork
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: spork

data/lib/spork/app_framework/rails_stub_files/application.rb

@@ -1 +0,0 @@
-load(File.dirname(__FILE__) + "/application_controller.rb")

data/lib/spork/app_framework/rails_stub_files/application_controller.rb

@@ -1,22 +0,0 @@
-# This is a stub used to help Spork delay the loading of the real ApplicationController
-class ::ApplicationController < ActionController::Base
-  @@preloading = true
-  class << self
-    def inherited(klass)
-      (@_descendants ||= []) << klass if @@preloading
-      super
-    end
-
-    def reapply_inheritance!
-      @@preloading = false
-      Array(@_descendants).each do |descendant|
-        descendant.master_helper_module.send(:include, master_helper_module)
-        descendant.send(:default_helper_module!)
-
-        descendant.respond_to?(:reapply_inheritance!) && descendant.reapply_inheritance!
-      end
-    end
-  end
-end
-
-Spork.each_run { ApplicationController.reapply_inheritance! }

data/lib/spork/app_framework/rails_stub_files/application_helper.rb

@@ -1,3 +0,0 @@
-# This is a stub used to help Spork delay the loading of the real ApplicationHelper
-module ::ApplicationHelper
-end