spork 0.9.0.rc5 → 0.9.0.rc6

data/Gemfile

@@ -1,6 +1,10 @@
 source :gemcutter
-gem 'cucumber', '0.7.3'
-gem 'gherkin', '1.0.27'
-gem "rspec", "2.0.0.beta.20"
+gem 'cucumber', '0.10.2'
+gem "rspec", "2.5.0"
 gem 'rake'
-gem 'ruby-debug'
+
+if RUBY_VERSION =~ /^1\.9/
+  gem 'ruby-debug19'
+else
+  gem 'ruby-debug'
+end

data/README.rdoc

@@ -68,6 +68,8 @@ Initially, you may find that a few files don't reload automatically.  This is be
 
 It will output a lot of stuff.  At the top you'll find a summary of all project files loaded.  Down below, the stack trace for each file (how it got loaded).  Spork hooks into Rails and does some magic (TM) to prevent ApplicationController observers, etc from pre-loading.  Similar hooks for other ruby frameworks may come as support demands.
 
+Some project changes will require a spork restart, and you shouldn't expect them to not (IE: modifying your project gem dependencies or core application config).  Any file that is loaded during Spork start-up will be cached until Spork is restarted.  You can restart spork by sending a USR2 signal to the server process.  This could be automated with a gem such as Kicker (https://github.com/alloy/kicker).  Since a native hook is required for each operating system to efficiently watch for filesystem changes, automatic restarting has not been built into Spork.
+
 You may find this wiki page useful for common ways to battle a variety of common pre-loading issues: http://github.com/timcharper/spork/wiki/Spork.trap_method-Jujutsu
 
 == Running specs over Spork
@@ -82,7 +84,7 @@ To run from the command line, use:
 
   rspec --drb spec/lib/my_spec.rb
 
-Or, you could add the following flag to your +spec.opts+ file.
+Or, you could add the following flag to your +spec.opts+ (or +.rspec+ depending on your version of rspec) file.
 
   --drb
 

data/features/gemfiles/rails3.0/Gemfile

@@ -1,10 +1,14 @@
 source :gemcutter
 gem 'sqlite3-ruby', '1.2.5'
-gem 'cucumber', '0.8.5'
-gem 'cucumber-rails', '0.3.2'
-gem "gherkin", "2.1.4"
-gem "rspec", "2.0.0.beta.20"
-gem 'rspec-rails', "2.0.0.beta.20"
-gem 'rails', '3.0.0'
-gem 'ruby-debug', '>= 0.10.3'
+gem 'cucumber', '0.10.2'
+gem 'cucumber-rails', '0.4.1'
+gem "rspec", "2.5.0"
+gem 'rspec-rails', "2.5.0"
+gem 'rails', '3.0.7'
+
+if RUBY_VERSION =~ /^1\.9/
+  gem 'ruby-debug19'
+else
+  gem 'ruby-debug', '>= 0.10.3'
+end
 gem 'spork', :path => File.expand_path("../../..", File.dirname(__FILE__))

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

@@ -7,110 +7,114 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.9)
     builder (2.1.2)
-    columnize (0.3.1)
-    cucumber (0.8.5)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.1.4)
-      json_pure (~> 1.4.3)
-      term-ansicolor (~> 1.0.4)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
+    columnize (0.3.2)
+    cucumber (0.10.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    cucumber-rails (0.4.1)
+      cucumber (>= 0.10.1)
+      nokogiri (>= 1.4.4)
+      rack-test (>= 0.5.7)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    gherkin (2.1.4)
-      trollop (~> 1.16.2)
-    i18n (0.4.1)
-    json_pure (1.4.6)
+    gherkin (2.3.7)
+      json (>= 1.4.6)
+    i18n (0.5.0)
+    json (1.5.1)
     linecache (0.43)
-    mail (2.2.6.1)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.0.0.beta.20)
-      rspec-core (= 2.0.0.beta.20)
-      rspec-expectations (= 2.0.0.beta.20)
-      rspec-mocks (= 2.0.0.beta.20)
-    rspec-core (2.0.0.beta.20)
-    rspec-expectations (2.0.0.beta.20)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.20)
-    rspec-rails (2.0.0.beta.20)
-      rspec (= 2.0.0.beta.20)
-    ruby-debug (0.10.3)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.2)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     sqlite3-ruby (1.2.5)
     term-ansicolor (1.0.5)
-    thor (0.14.0)
-    treetop (1.4.8)
+    thor (0.14.6)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
-    trollop (1.16.2)
-    tzinfo (0.3.23)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cucumber (= 0.8.5)
-  cucumber-rails (= 0.3.2)
-  gherkin (= 2.1.4)
-  rails (= 3.0.0)
-  rspec (= 2.0.0.beta.20)
-  rspec-rails (= 2.0.0.beta.20)
+  cucumber (= 0.10.2)
+  cucumber-rails (= 0.4.1)
+  rails (= 3.0.7)
+  rspec (= 2.5.0)
+  rspec-rails (= 2.5.0)
   ruby-debug (>= 0.10.3)
   spork!
   sqlite3-ruby (= 1.2.5)

data/features/rails_delayed_loading_workarounds.feature

@@ -67,6 +67,33 @@ Feature: Rails Delayed Work arounds
       """
         Original View
       """
+  Scenario: respecting custom autoload paths
+    Given the following code appears in "config/application.rb" after /class Application < Rails::Application/:
+      """
+        config.autoload_paths << 'app/models/non_standard'
+      """
+
+    And a file named "app/models/non_standard/boogie.rb" with:
+      """
+        class Boogie
+          def boogie
+            'Boogie Robots!'
+          end
+        end
+      """
+    And a file named "spec/models/non_standard/boogie_spec.rb" with:
+      """
+        describe Boogie do
+          it 'knows how to boogie' do
+            Boogie.new.boogie.should include('Boogie')
+            puts 'BOOGIE!!!'
+          end
+        end
+      """
+    When I fire up a spork instance with "spork rspec"
+    And I run rspec --drb spec/models/non_standard/boogie_spec.rb
+    Then the output should contain "BOOGIE!!!"
+
   Scenario: within a view rendered by a controller, calling helper methods from an included module in ApplicationHelper
     Given a file named "spec/controllers/users_controller_spec.rb" with:
       """

data/features/support/bundler_helpers.rb

@@ -36,6 +36,6 @@ module BundlerHelpers
   def set_gemfile(gemfile)
     gemfile = expand_gemfile(gemfile || "rails3.0")
     ensure_installed(File.dirname(gemfile))
-    ENV["BUNDLE_GEMFILE"] = gemfile
+    ENV["BUNDLE_GEMFILE"] = gemfile.to_s
   end
 end

data/lib/spork.rb

@@ -11,6 +11,7 @@ module Spork
   autoload :Runner,        (LIBDIR + 'spork/runner').to_s
   autoload :Forker,        (LIBDIR + 'spork/forker').to_s
   autoload :Diagnoser,     (LIBDIR + 'spork/diagnoser').to_s
+  autoload :GemHelpers,    (LIBDIR + 'spork/gem_helpers').to_s
 
   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.
@@ -102,12 +103,11 @@ module Spork
       end
     end
 
+    # This method is used to auto-discover peer plugins such as spork-testunit.
     def other_spork_gem_load_paths
-      @other_spork_gem_load_paths ||= (
-        Gem.latest_load_paths.grep(/spork/).select do |g|
-          not g.match(%r{/spork-[0-9\-.]+/lib}) # don't include other versions of spork
-        end
-      )
+      @other_spork_gem_load_paths ||= Spork::GemHelpers.latest_load_paths.grep(/spork/).select do |g|
+        not g.match(%r{/spork-[0-9\-.]+/lib}) # don't include other versions of spork
+      end
     end
 
     private

data/lib/spork/diagnoser.rb

@@ -48,7 +48,7 @@ class Spork::Diagnoser
     
     # Uninstall the hook. Generally useful only for testing the Diagnoser.
     def remove_hook!
-      return unless Kernel.private_instance_methods.include?('require_without_diagnoser')
+      return unless Kernel.private_instance_methods.map(&:to_sym).include?(:require_without_diagnoser)
       Kernel.class_eval do
         alias :require :require_without_diagnoser
         alias :load :load_without_diagnoser

data/lib/spork/gem_helpers.rb

@@ -0,0 +1,34 @@
+module Spork::GemHelpers
+  extend self
+
+  class GemPath
+    attr_reader :name, :version, :path, :version_numbers
+    include Comparable
+    def initialize(p)
+      @path = p
+      @name, @version = File.basename(p).scan(/^(.+?)-([^-]+)$/).flatten
+      @version_numbers = @version.split(/[^0-9]+/).map(&:to_i)
+    end
+
+    def <=>(other)
+      raise "Not comparable gem paths ('#{name}' is not '#{other.name}')" unless name == other.name
+      @version_numbers <=> other.version_numbers
+    end
+  end
+
+  def latest_load_paths
+    if defined?(Bundler)
+      $LOAD_PATH.uniq
+    else
+      Dir["{#{Gem.paths.path.join(',')}}" + "/gems/*"].inject({}) do |h,f|
+        gem_path = GemPath.new(f)
+        if h[gem_path.name]
+          h[gem_path.name] = gem_path if gem_path > h[gem_path.name]
+        else
+          h[gem_path.name] = gem_path
+        end
+        h
+      end
+    end
+  end
+end

data/spec/spork/diagnoser_spec.rb

@@ -13,7 +13,7 @@ describe Spork::Diagnoser do
       if filename
         File.open(filename, 'wb') { |f| f << contents }
         Spork::Diagnoser.install_hook!
-        require filename
+        require "./#{filename}"
       end
       yield if block_given?
     end
@@ -79,11 +79,11 @@ describe Spork::Diagnoser do
   
   it "filters backtrace beyond the last line matching the entry point" do
     Spork::Diagnoser.install_hook!("test_filter/environment.rb")
-    create_file("test_filter/environment.rb", "require 'test_filter/app.rb'")
-    create_file("test_filter/app.rb", "require 'test_filter/my_model.rb'")
+    create_file("test_filter/environment.rb", "require './test_filter/app.rb'")
+    create_file("test_filter/app.rb", "require './test_filter/my_model.rb'")
     create_file("test_filter/my_model.rb", "'my model here'")
     in_current_dir do
-      require 'test_filter/environment.rb'
+      require './test_filter/environment.rb'
     end
     f = Spork::Diagnoser.loaded_files
     f[f.keys.grep(/app.rb/).first].last.should include('test_filter/environment.rb')
@@ -93,7 +93,7 @@ describe Spork::Diagnoser do
   
   describe ".output_results" do
     it "outputs the results relative to the current directory" do
-      Spork::Diagnoser.loaded_files["/project_path/lib/file.rb"] = "/project_path/lib/parent_file.rb:35"
+      Spork::Diagnoser.loaded_files["/project_path/lib/file.rb"] = ["/project_path/lib/parent_file.rb:35"]
       Dir.stub!(:pwd).and_return("/project_path")
       out = StringIO.new
       Spork::Diagnoser.output_results(out)

metadata

@@ -1,15 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  hash: 15424143
   prerelease: 6
-  segments: 
-  - 0
-  - 9
-  - 0
-  - rc
-  - 5
-  version: 0.9.0.rc5
+  version: 0.9.0.rc6
 platform: ruby
 authors: 
 - Tim Harper
@@ -18,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -06:00
-default_executable: spork
+date: 2011-05-06 00:00:00 Z
 dependencies: []
 
 description: A forking Drb spec server
@@ -45,6 +37,7 @@ files:
 - lib/spork/ext/rails-reloader.rb
 - lib/spork/ext/ruby-debug.rb
 - lib/spork/forker.rb
+- lib/spork/gem_helpers.rb
 - lib/spork/run_strategy/forking.rb
 - lib/spork/run_strategy/magazine/magazine_slave.rb
 - lib/spork/run_strategy/magazine/magazine_slave_provider.rb
@@ -91,7 +84,6 @@ files:
 - spec/support/fake_run_strategy.rb
 - bin/spork
 - ext/mkrf_conf.rb
-has_rdoc: true
 homepage: http://github.com/timcharper/spork
 licenses: []
 
@@ -106,23 +98,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: spork
-rubygems_version: 1.5.0
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: spork