spork 0.7.3 → 0.7.4

data/features/cucumber_rails_integration.feature

@@ -20,13 +20,6 @@ Feature: Cucumber integration with rails
         ENV['RAILS_ENV'] = "features"
         require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 
-        require 'webrat'
-
-        Webrat.configure do |config|
-          config.mode = :rails
-        end
-
-        require 'webrat/core/matchers'
         require 'cucumber'
         require 'cucumber/formatter/unicode' # Comment out this line if you don't want Cucumber Unicode support
         require 'spec/rails'

data/features/rails_delayed_loading_workarounds.feature

@@ -21,7 +21,6 @@ Feature: Rails Delayed Work arounds
       end
       """
     And the application has a model, observer, route, and application helper
-  Scenario: within a view, calling helper methods from an included module in ApplicationHelper
     Given a file named "app/helpers/application_helper.rb" with:
       """
       module ApplicationHelper
@@ -45,25 +44,55 @@ Feature: Rails Delayed Work arounds
         end
       end
       """
-    Given a file named "app/controllers/users_helper.rb" with:
+    Given a file named "app/helpers/misc_helper.rb" with:
+      """
+      module MiscHelper
+        def misc_helper_method
+          'hello miscellaneous'
+        end
+      end
+      """
+    Given a file named "app/helpers/users_helper.rb" with:
       """
       module UsersHelper
       end
       """
     Given a file named "app/views/users/index.html.erb" with:
       """
-      <%= reverse_text('listing users'.reverse) %>
+        Original View
       """
+  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:
       """
       describe UsersController do
         integrate_views
         it "renders a page, using a method inherited from ApplicationController" do
           get :index
+          response.body.should_not include('Original View')
+          puts "Views are not being cached when rendering from a controller"
+
+          response.body.should include('listing users')
+          puts "Controller stack is functioning when rendering from a controller"
+
+          response.body.should include('hello miscellaneous')
+          puts "All helper modules were included when rendering from a controller"
+        end
+      end
+      """
+    Given a file named "spec/views/index.html.erb_spec.rb" with:
+      """
+      describe "/users/index.html.erb" do
+
+        it "renders the view" do
+          render
+          response.body.should_not include('Original View')
+          puts "Views are not being cached when rendering directly"
+
           response.body.should include('listing users')
-          puts "Controller stack is functioning"
-          response.body.should include('Here is a list of users')
-          puts "Views are not being cached"
+          puts "Controller stack is functioning when rendering directly"
+
+          response.body.should include('hello miscellaneous')
+          puts "All helper modules were included when rendering directly"
         end
       end
       """
@@ -71,10 +100,16 @@ Feature: Rails Delayed Work arounds
     And the contents of "app/views/users/index.html.erb" are changed to:
       """
       <%= reverse_text('listing users'.reverse) %>
+      <%= misc_helper_method rescue nil %>
       <p>Here is a list of users</p>
       """
       
     And I run spec --drb spec/controllers/users_controller_spec.rb
-    Then the output should contain "Controller stack is functioning"
-    Then the output should contain "Views are not being cached"
-  
+    Then the output should contain "Controller stack is functioning when rendering from a controller"
+    Then the output should contain "Views are not being cached when rendering from a controller"
+    Then the output should contain "All helper modules were included when rendering from a controller"
+
+    And I run spec --drb spec/views/index.html.erb_spec.rb
+    Then the output should contain "Controller stack is functioning when rendering directly"
+    Then the output should contain "Views are not being cached when rendering directly"
+    Then the output should contain "All helper modules were included when rendering directly"

data/features/spork_debugger.feature

@@ -3,24 +3,17 @@ Feature: Spork Debugger integration
   I want to invoke the debugger my specs within Spork
   In order to drill in and figure out what's wrong
 
-  Background: Rails App with RSpec and Spork
-
+  Scenario: Invoking the debugger via 'debugger'
     Given a file named "spec/spec_helper.rb" with:
       """
       require 'rubygems'
       require 'spork'
       require 'spork/ext/ruby-debug'
 
-      Spork.prefork do
-        require 'spec'
-      end
-
-      Spork.each_run do
-      end
+      Spork.prefork { require 'spec' }
+      Spork.each_run { }
       """
-
-  Scenario: Invoking the debugger via 'debugger'
-    Given a file named "spec/debugger_spec.rb" with:
+    And a file named "spec/debugger_spec.rb" with:
       """
       require File.dirname(__FILE__) + '/spec_helper.rb'
 
@@ -55,12 +48,23 @@ Feature: Spork Debugger integration
     And the output should contain "it worked!"
 
   Scenario: When ruby-debug is already required and started.
-    Given a file named "spec/debugger_spec.rb" with:
+      Given a file named "spec/spec_helper.rb" with:
       """
-      require File.dirname(__FILE__) + '/spec_helper.rb'
+      require 'rubygems'
+      require 'spork'
       require 'ruby-debug'
       Debugger.start
 
+      require 'spork/ext/ruby-debug'
+
+      Spork.prefork { require 'spec' }
+      Spork.each_run { }
+      """
+
+    And a file named "spec/debugger_spec.rb" with:
+      """
+      require File.dirname(__FILE__) + '/spec_helper.rb'
+
       describe "Debugger" do
         it "should debug" do
           @message = "yup"
@@ -82,3 +86,23 @@ Feature: Spork Debugger integration
 
     Then the spork window should output a line containing "Debug Session Terminated"
     And the output should contain "it worked!"
+
+  Scenario: When ruby-debug is invoked during preload
+      Given a file named "spec/spec_helper.rb" with:
+      """
+      require 'rubygems'
+      require 'spork'
+      require 'spork/ext/ruby-debug'
+
+      STDERR.puts("Spork is ready and listening") # trick out the start spork step to believe spork is ready... naughty, but effective.
+      @message = "it worked"
+      debugger
+      Spork.prefork { require 'spec' }
+      Spork.each_run { }
+      """
+
+    When I fire up a spork instance with "spork rspec"
+    Then the spork window should output a line containing "spec_helper.rb"
+    When I type this in the spork window: "e @message"
+    Then the spork window should output a line containing "it worked"
+    When I type this in the spork window: "continue"

data/features/steps/sandbox_steps.rb

@@ -18,8 +18,6 @@ end
 
 # the following code appears in "config/environment.rb" after /Rails::Initializer.run/:
 Given /^the following code appears in "([^\"]*)" after \/([^\\\/]*)\/:$/ do |file_name, regex, content|
-  # require 'ruby-debug'; Debugger.start; Debugger.start_control; debugger
-  
   regex = Regexp.new(regex)
   in_current_dir do
     content_lines = File.read(file_name).split("\n")

data/geminstaller.yml

@@ -6,4 +6,4 @@ gems:
 - { name: 'rspec',                   version: '>= 1.2.9' }
 - { name: 'rspec-rails',             version: '>= 1.2.9' }
 - { name: 'rails',                   version: '>= 2.3' }
-
+- { name: 'ruby-debug',              version: '>= 0.10.3' }

data/lib/spork.rb

@@ -1,7 +1,16 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) unless $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+require 'pathname'
 module Spork
   BINARY = File.expand_path(File.dirname(__FILE__) + '/../bin/spork')
-  LIBDIR = File.expand_path("..", File.dirname(__FILE__))
+  LIBDIR = Pathname.new(File.expand_path(File.dirname(__FILE__)))
+
+  autoload :Server,        (LIBDIR + 'spork/server').to_s
+  autoload :TestFramework, (LIBDIR + 'spork/test_framework').to_s
+  autoload :AppFramework,  (LIBDIR + 'spork/app_framework').to_s
+  autoload :RunStrategy,   (LIBDIR + 'spork/run_strategy').to_s
+  autoload :Runner,        (LIBDIR + 'spork/runner').to_s
+  autoload :Forker,        (LIBDIR + 'spork/forker').to_s
+  autoload :Diagnoser,     (LIBDIR + 'spork/diagnoser').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.
@@ -75,11 +84,19 @@ module Spork
     end
     
     def detect_and_require(subfolder)
-      ([LIBDIR] + Gem.latest_load_paths.grep(/spork/)).uniq.each do |gem_path|
+      ([LIBDIR.to_s] + other_spork_gem_load_paths).uniq.each do |gem_path|
         Dir.glob(File.join(gem_path, subfolder)).each { |file| require file }
       end
     end
 
+    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
+      )
+    end
+
     private
       def alias_method_names(method_name, feature)
         /^(.+?)([\?\!]{0,1})$/.match(method_name.to_s)

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

@@ -1,3 +1 @@
-# This is a stub used to help Spork delay the loading of the real ApplicationController
-class ::ApplicationController < ActionController::Base
-end
+load(File.dirname(__FILE__) + "/application_controller.rb")

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

@@ -1,3 +1,22 @@
 # 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
+      @_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/ext/ruby-debug.rb

@@ -1,8 +1,10 @@
-require 'ruby-debug'
 require 'socket'
 require 'forwardable'
 
-# Experimental! No automated tests are checking this, use at your own risk!
+begin
+require 'ruby-debug'
+
+# Experimental!
 
 class SporkDebugger
   DEFAULT_PORT = 10_123
@@ -15,7 +17,7 @@ class SporkDebugger
   class << self
     attr_reader :instance
     def run
-      @instance = new
+      @instance ||= new
     end
   end
 
@@ -44,7 +46,7 @@ class SporkDebugger
   class PreloadState
     include NetworkHelpers
     def initialize
-      install_hook
+      Spork.each_run { install_hook }
       listen_for_connection_signals
     end
 
@@ -143,3 +145,6 @@ 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/runner.rb

@@ -1,7 +1,4 @@
 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.
@@ -72,6 +69,7 @@ module Spork
         Spork::Diagnoser.output_results(@output)
         return true
       else
+        Spork.using_spork!
         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)

data/lib/spork/server.rb

@@ -22,6 +22,7 @@ class Spork::Server
   
   # Sets up signals and starts the DRb service. If it's successful, it doesn't return. Not ever.  You don't need to override this.
   def listen
+    raise RuntimeError, "you must call Spork.using_spork! before starting the server" unless Spork.using_spork?
     trap("SIGINT") { sig_int_received }
     trap("SIGTERM") { abort; exit!(0) }
     trap("USR2") { abort; restart } if Signal.list.has_key?("USR2")

data/spec/spec_helper.rb

@@ -5,10 +5,7 @@ unless $spec_helper_loaded
 
   $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
   SPEC_TMP_DIR = File.expand_path('tmp', File.dirname(__FILE__))
-  
   require 'spork'
-  require 'spork/runner.rb'
-  require 'spork/diagnoser.rb'
   require 'stringio'
   require 'fileutils'
 

data/spec/spork/runner_spec.rb

@@ -45,13 +45,6 @@ describe Spork::Runner do
     Spork::TestFramework::RSpec.stub!(:available?).and_return(true)
     Spork::TestFramework::Cucumber.stub!(:available?).and_return(false)
     
-    Spork::Runner.new(['rspec'], @out, @err).supported_test_frameworks_text.should == <<-EOF
-Supported test frameworks:
-( ) Cucumber
-( ) FakeFramework
-(*) RSpec
-
-Legend: ( ) - not detected in project   (*) - detected
-    EOF
+    Spork::Runner.new(['rspec'], @out, @err).supported_test_frameworks_text.should include("(*) RSpec")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -06:00
+date: 2009-12-04 00:00:00 -07:00
 default_executable: spork
 dependencies: []