dchelimsky-rspec-rails 1.1.99.6 → 1.1.99.7

data/History.txt

@@ -43,6 +43,8 @@ IMPORTANT: This release includes the following backwards-compatibility-breaking
   * rspec's rake tasks are not loaded when running "rake gems" or any of its subtasks
   * only warn when rspec is not installed when trying to invoke an rspec rake task
   * support 2 arg version of ActionController::Base#render (reported by Nathan Wilmes)
+  * rake spec:server:start doesn't choke if there is no tmp directory
+  * force cache_classes = false when running with spec_server. Closes #287.
 
 === Version 1.1.12 / 2009-01-11
 

data/Rakefile

@@ -20,7 +20,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["dchelimsky-rspec","1.1.99.6"],["rack",">=0.4.0"]]
+  p.extra_deps = [["dchelimsky-rspec","1.1.99.7"],["rack",">=0.4.0"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end

data/generators/rspec/templates/rspec.rake

@@ -144,6 +144,7 @@ namespace :spec do
         $stderr.puts "spec_server is already running."
       else
         $stderr.puts %Q{Starting up spec_server ...}
+        FileUtils.mkdir('tmp') unless test ?d, 'tmp'
         system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
       end
     end

data/generators/rspec/templates/script/spec

@@ -2,4 +2,4 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
 require 'rubygems'
 require 'spec'
-exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))
+exit ::Spec::Runner::CommandLine.run

data/generators/rspec/templates/script/spec_server

@@ -9,6 +9,20 @@ puts "Loading Rails environment"
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 
+if Rails::VERSION::STRING >= '2.2' && Rails.configuration.cache_classes
+  warn <<-MESSAGE
+
+#{'*'*50}
+
+spec_server won't reload your classes if config.cache_classes
+is set to true. Please modify environment/test.rb:
+
+    config.cache_classes = false
+
+#{'*'*50}
+MESSAGE
+end
+
 options = Hash.new
 parser = OptionParser.new
 parser.on("-d", "--daemon")     {|ignore| options[:daemon] = true }

data/generators/rspec/templates/spec_helper.rb

@@ -2,7 +2,7 @@
 # from the project root directory.
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'spec'
+require 'spec/autorun'
 require 'spec/rails'
 
 Spec::Runner.configure do |config|

data/lib/spec/rails/spec_server.rb

@@ -45,28 +45,33 @@ module Spec
         $stdout = stdout
         $stderr = stderr
         
+        ::Rails::Configuration.extend Module.new {def cache_classes; false; end}
+
+        ::ActiveSupport.const_defined?(:Dependencies) ?
+          ::ActiveSupport::Dependencies.mechanism = :load :
+          ::Dependencies.mechanism = :load
+        
         require 'action_controller/dispatcher'
         dispatcher = ::ActionController::Dispatcher.new($stdout)
-        dispatcher.respond_to?(:cleanup_application) ?
-          dispatcher.cleanup_application :
-          dispatcher.reload_application
+        dispatcher.reload_application
         
         if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache)
           Fixtures.reset_cache
         end
         
-        ::ActiveSupport.const_defined?(:Dependencies) ?
-          ::ActiveSupport::Dependencies.mechanism = :load :
-          ::Dependencies.mechanism = :load
 
-        require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
+        unless Object.const_defined?(:ApplicationController)
+          %w(application_controller.rb application.rb).each do |name|
+            require_dependency(name) if File.exists?("#{RAILS_ROOT}/app/controllers/#{name}")
+          end
+        end
         load "#{RAILS_ROOT}/spec/spec_helper.rb"
 
         if in_memory_database?
           load "#{RAILS_ROOT}/db/schema.rb" # use db agnostic schema by default
           ActiveRecord::Migrator.up('db/migrate') # use migrations
         end
-
+        
         ::Spec::Runner::CommandLine.run(
           ::Spec::Runner::OptionParser.parse(
             argv,
@@ -74,6 +79,8 @@ module Spec
             $stdout
           )
         )
+
+        dispatcher.cleanup_application if dispatcher.respond_to?(:cleanup_application)
       end
 
       def in_memory_database?

data/lib/spec/rails/version.rb

@@ -5,7 +5,7 @@ module Spec
         MAJOR  = 1
         MINOR  = 1
         TINY   = 99
-        MINESCULE = 6
+        MINESCULE = 7
 
         STRING = [MAJOR, MINOR, TINY, MINESCULE].compact.join('.')
 

data/rspec-rails.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.99.6"
+  s.version = "1.1.99.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2009-02-15}
+  s.date = %q{2009-02-18}
   s.description = %q{Behaviour Driven Development for Ruby on Rails.}
   s.email = ["rspec-devel@rubyforge.org"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "TODO.txt", "generators/rspec/templates/previous_failures.txt"]
@@ -17,23 +17,23 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{rspec-rails 1.1.99.6}
+  s.summary = %q{rspec-rails 1.1.99.7}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.6"])
+      s.add_runtime_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.7"])
       s.add_runtime_dependency(%q<rack>, [">= 0.4.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.3"])
     else
-      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.6"])
+      s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.7"])
       s.add_dependency(%q<rack>, [">= 0.4.0"])
     end
   else
-    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.6"])
+    s.add_dependency(%q<dchelimsky-rspec>, ["= 1.1.99.7"])
     s.add_dependency(%q<rack>, [">= 0.4.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.99.6
+  version: 1.1.99.7
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-15 00:00:00 -08:00
+date: 2009-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.99.6
+        version: 1.1.99.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -257,6 +257,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.99.6
+summary: rspec-rails 1.1.99.7
 test_files: []