dchelimsky-rspec-rails 1.1.11.2 → 1.1.11.3

data/History.txt

@@ -11,11 +11,12 @@
   * use more liberal globs to allow for specs in symlinked dirs (Martin Luder). Closes #361.
   * Enable loading fixtures from arbitrary locations (Jacek Becela). Closes #464.
   
-* 3 bug fixes
+* 4 bug fixes
 
   * Attempt to load application_controller before falling back to application (Geoff Garside). Closes #626.
   * Include _id and reduce quoting of default values in view specs (Steen Lehmann). Closes #598.
   * Record calls to render and check rendered[:template] and rendered[:partial] for edge rails (> v2.2.2). Closes #633.
+  * config.gem 'rspec' can't be unpacked. Closes #629.
 
 === Version 1.1.11 / 2008-10-24
 

data/Rakefile

@@ -15,7 +15,8 @@ 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 = [["rspec","1.1.11.2"],["cucumber",">= 0.1.13"]]
+  p.extra_deps = [["rspec","1.1.11.3"]]
+  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

@@ -1,11 +1,18 @@
-raise "To avoid rake task loading problems: run 'rake clobber' in vendor/plugins/rspec" if File.directory?(File.join(File.dirname(__FILE__), *%w[.. .. vendor plugins rspec pkg]))
-raise "To avoid rake task loading problems: run 'rake clobber' in vendor/plugins/rspec-rails" if File.directory?(File.join(File.dirname(__FILE__), *%w[.. .. vendor plugins rspec-rails pkg]))
+rspec_gem_dir = nil
+Dir["#{RAILS_ROOT}/vendor/gems/*"].each do |subdir|
+  rspec_gem_dir = subdir if subdir.gsub("#{RAILS_ROOT}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")
+end
+rspec_plugin_dir = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec')
 
-# In rails 1.2, plugins aren't available in the path until they're loaded.
-# Check to see if the rspec plugin is installed first and require
-# it if it is.  If not, use the gem version.
-rspec_base = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec/lib')
-$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
+if rspec_gem_dir && (test ?d, rspec_plugin_dir)
+  raise "\n#{'*'*50}\nYou have rspec installed in both vendor/gems and vendor/plugins\nPlease pick one and dispose of the other.\n#{'*'*50}\n\n"
+end
+
+if rspec_gem_dir
+  $LOAD_PATH.unshift("#{rspec_gem_dir}/lib") 
+elsif File.exist?(rspec_plugin_dir)
+  $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
+end
 
 begin
   require 'spec/rake/spectask'
@@ -142,13 +149,9 @@ rescue MissingSourceFile
   # ... otherwise, do this:
   raise <<-MSG
 
-  You have rspec-rails rake tasks installed in
+  You have rspec rake tasks installed in
   #{__FILE__},
-  but rspec-rails is not configured as a gem in
-  config/environment.rb
-
-  Either remove #{__FILE__}
-  or configure the rspec-rails gem in config/environment.rb.
+  but rspec can not be found in vendor/gems, vendor/plugins or on the system.
 
 MSG
 end

data/lib/spec/rails/example/functional_example_group.rb

@@ -21,7 +21,7 @@ module Spec
         end
 
         def flash
-          response.flash
+          @controller.__send__ :flash
         end
 
         def session
@@ -71,7 +71,7 @@ module Spec
         #   assigns[:registration].should == Thing.new
         #--
         # NOTE - Even though docs only use assigns[:key] format, this supports
-        # assigns(:key) in order to avoid breaking old specs.
+        # assigns(:key) for backwards compatibility.
         #++
         def assigns(key = nil)
           if key.nil?

data/lib/spec/rails/version.rb

@@ -5,7 +5,7 @@ module Spec
         MAJOR  = 1
         MINOR  = 1
         TINY   = 11
-        MINESCULE = 2
+        MINESCULE = 3
 
         STRING = [MAJOR, MINOR, TINY, MINESCULE].join('.')
 

data/rspec-rails.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.11.2"
+  s.version = "1.1.11.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2008-12-18}
+  s.date = %q{2008-12-19}
   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", "generators/rspec/templates/previous_failures.txt"]
@@ -17,20 +17,20 @@ 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.11.2}
+  s.summary = %q{rspec-rails 1.1.11.3}
 
   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<rspec>, ["= 1.1.11.2"])
-      s.add_runtime_dependency(%q<cucumber>, [">= 0.1.13"])
+      s.add_runtime_dependency(%q<rspec>, ["= 1.1.11.3"])
+      s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
     else
-      s.add_dependency(%q<rspec>, ["= 1.1.11.2"])
+      s.add_dependency(%q<rspec>, ["= 1.1.11.3"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 1.1.11.2"])
+    s.add_dependency(%q<rspec>, ["= 1.1.11.3"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.11.2
+  version: 1.1.11.3
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -08:00
+date: 2008-12-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.11.2
+        version: 1.1.11.3
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -219,6 +219,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.11.2
+summary: rspec-rails 1.1.11.3
 test_files: []