spork 0.5.5 → 0.5.6

data/features/cucumber_rails_integration.feature

@@ -17,7 +17,7 @@ Feature: Cucumber integration with rails
         # need to restart spork for it take effect.
         
         # Sets up the Rails environment for Cucumber
-        ENV['RAILS_ENV'] = "cucumber"
+        ENV['RAILS_ENV'] = "features"
         require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
 
         require 'webrat'
@@ -59,22 +59,23 @@ Feature: Cucumber integration with rails
       """
       $loaded_stuff << 'features/support/cucumber_rails_helper.rb'
       """
-    And a file named "config/environments/cucumber.rb" with:
+    And a file named "config/environments/features.rb" with:
       """
       # your cucumber env here
       """
     And a file named "config/database.yml" with:
       """
-      cucumber:
+      features:
         adapter: sqlite3
-        database: db/cucumber.sqlite3
+        database: db/features.sqlite3
         timeout: 5000
       """
     And a file named "features/step_definitions/cucumber_rails_steps.rb" with:
       """
       Then "it should work" do
         Spork.state.should == :using_spork
-        RAILS_ENV.should == 'cucumber'
+        RAILS_ENV.should == 'features'
+        (Rails.respond_to?(:logger) ? Rails.logger : ActionController::Base.logger).info "hey there"
         $loaded_stuff.should include('ActiveRecord::Base.establish_connection')
         $loaded_stuff.should include('User')
         $loaded_stuff.should include('UserObserver')
@@ -101,3 +102,5 @@ Feature: Cucumber integration with rails
       When I fire up a spork instance with "spork cucumber"
       And I run cucumber --drb features/cucumber_rails.feature
       Then the output should contain "It worked!"
+      And the file "log/features.log" should include "hey there"
+      

data/features/rspec_rails_integration.feature

@@ -48,6 +48,7 @@ Feature: Rails Integration
     describe "Did it work?" do
       it "checks to see if all worked" do
         Spork.state.should == :using_spork
+        (Rails.respond_to?(:logger) ? Rails.logger : ActionController::Base.logger).info "hey there"
         $loaded_stuff.should include('ActiveRecord::Base.establish_connection')
         $loaded_stuff.should include('User')
         $loaded_stuff.should include('UserObserver')
@@ -62,3 +63,4 @@ Feature: Rails Integration
     When I fire up a spork instance with "spork rspec"
     And I run spec --drb spec/did_it_work_spec.rb 
     Then the output should contain "Specs successfully run within spork, and all initialization files were loaded"
+    And the file "log/test.log" should include "hey there"

data/features/steps/sandbox_steps.rb

@@ -56,6 +56,12 @@ When /^I fire up a spork instance with "spork(.*)"$/ do |spork_opts|
   end
 end
 
+Then /the file "([^\"]*)" should include "([^\"]*)"/ do |filename, content|
+  in_current_dir do
+    File.read(filename).should include(content)
+  end
+end
+
 Then /^the (error output|output) should contain$/ do |which, text|
   (which == "error output" ? last_stderr : last_stdout).should include(text)
 end

data/lib/spork/app_framework/rails.rb

@@ -1,6 +1,7 @@
 class Spork::AppFramework::Rails < Spork::AppFramework
   
   # TODO - subclass this out to handle different versions of rails
+  # Also... this is the nastiest duck punch ever.  Clean this up.
   module NinjaPatcher
     def self.included(klass)
       klass.class_eval do
@@ -8,11 +9,25 @@ class Spork::AppFramework::Rails < Spork::AppFramework
           alias :load_environment_without_spork :load_environment
           alias :load_environment :load_environment_with_spork
         end
+        
+        def self.run_with_spork(*args, &block) # it's all fun and games until someone gets an eye poked out
+          if ENV['RAILS_ENV']
+            Object.send(:remove_const, :RAILS_ENV)
+            Object.const_set(:RAILS_ENV, ENV['RAILS_ENV'].dup)
+          end
+          run_without_spork(*args, &block)
+        end
+        
+        class << self
+          unless method_defined?(:run_without_spork)
+            alias :run_without_spork :run
+            alias :run :run_with_spork
+          end
+        end
       end
     end
     
     def load_environment_with_spork
-      reset_rails_env
       result = load_environment_without_spork
       install_hooks
       result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spork
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Tim Harper