dchelimsky-rspec-rails 1.1.11.2 → 1.1.11.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/History.txt CHANGED
@@ -11,11 +11,12 @@
11
11
  * use more liberal globs to allow for specs in symlinked dirs (Martin Luder). Closes #361.
12
12
  * Enable loading fixtures from arbitrary locations (Jacek Becela). Closes #464.
13
13
 
14
- * 3 bug fixes
14
+ * 4 bug fixes
15
15
 
16
16
  * Attempt to load application_controller before falling back to application (Geoff Garside). Closes #626.
17
17
  * Include _id and reduce quoting of default values in view specs (Steen Lehmann). Closes #598.
18
18
  * Record calls to render and check rendered[:template] and rendered[:partial] for edge rails (> v2.2.2). Closes #633.
19
+ * config.gem 'rspec' can't be unpacked. Closes #629.
19
20
 
20
21
  === Version 1.1.11 / 2008-10-24
21
22
 
data/Rakefile CHANGED
@@ -15,7 +15,8 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
15
15
  p.description = "Behaviour Driven Development for Ruby on Rails."
16
16
  p.rubyforge_name = 'rspec'
17
17
  p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
18
- p.extra_deps = [["rspec","1.1.11.2"],["cucumber",">= 0.1.13"]]
18
+ p.extra_deps = [["rspec","1.1.11.3"]]
19
+ p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
19
20
  p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
20
21
  end
21
22
 
@@ -1,11 +1,18 @@
1
- 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]))
2
- 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]))
1
+ rspec_gem_dir = nil
2
+ Dir["#{RAILS_ROOT}/vendor/gems/*"].each do |subdir|
3
+ rspec_gem_dir = subdir if subdir.gsub("#{RAILS_ROOT}/vendor/gems/","") =~ /^(\w+-)?rspec-(\d+)/ && File.exist?("#{subdir}/lib/spec/rake/spectask.rb")
4
+ end
5
+ rspec_plugin_dir = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec')
3
6
 
4
- # In rails 1.2, plugins aren't available in the path until they're loaded.
5
- # Check to see if the rspec plugin is installed first and require
6
- # it if it is. If not, use the gem version.
7
- rspec_base = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec/lib')
8
- $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
7
+ if rspec_gem_dir && (test ?d, rspec_plugin_dir)
8
+ 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"
9
+ end
10
+
11
+ if rspec_gem_dir
12
+ $LOAD_PATH.unshift("#{rspec_gem_dir}/lib")
13
+ elsif File.exist?(rspec_plugin_dir)
14
+ $LOAD_PATH.unshift("#{rspec_plugin_dir}/lib")
15
+ end
9
16
 
10
17
  begin
11
18
  require 'spec/rake/spectask'
@@ -142,13 +149,9 @@ rescue MissingSourceFile
142
149
  # ... otherwise, do this:
143
150
  raise <<-MSG
144
151
 
145
- You have rspec-rails rake tasks installed in
152
+ You have rspec rake tasks installed in
146
153
  #{__FILE__},
147
- but rspec-rails is not configured as a gem in
148
- config/environment.rb
149
-
150
- Either remove #{__FILE__}
151
- or configure the rspec-rails gem in config/environment.rb.
154
+ but rspec can not be found in vendor/gems, vendor/plugins or on the system.
152
155
 
153
156
  MSG
154
157
  end
@@ -21,7 +21,7 @@ module Spec
21
21
  end
22
22
 
23
23
  def flash
24
- response.flash
24
+ @controller.__send__ :flash
25
25
  end
26
26
 
27
27
  def session
@@ -71,7 +71,7 @@ module Spec
71
71
  # assigns[:registration].should == Thing.new
72
72
  #--
73
73
  # NOTE - Even though docs only use assigns[:key] format, this supports
74
- # assigns(:key) in order to avoid breaking old specs.
74
+ # assigns(:key) for backwards compatibility.
75
75
  #++
76
76
  def assigns(key = nil)
77
77
  if key.nil?
@@ -5,7 +5,7 @@ module Spec
5
5
  MAJOR = 1
6
6
  MINOR = 1
7
7
  TINY = 11
8
- MINESCULE = 2
8
+ MINESCULE = 3
9
9
 
10
10
  STRING = [MAJOR, MINOR, TINY, MINESCULE].join('.')
11
11
 
data/rspec-rails.gemspec CHANGED
@@ -2,11 +2,11 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{rspec-rails}
5
- s.version = "1.1.11.2"
5
+ s.version = "1.1.11.3"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["RSpec Development Team"]
9
- s.date = %q{2008-12-18}
9
+ s.date = %q{2008-12-19}
10
10
  s.description = %q{Behaviour Driven Development for Ruby on Rails.}
11
11
  s.email = ["rspec-devel@rubyforge.org"]
12
12
  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|
17
17
  s.require_paths = ["lib"]
18
18
  s.rubyforge_project = %q{rspec}
19
19
  s.rubygems_version = %q{1.3.1}
20
- s.summary = %q{rspec-rails 1.1.11.2}
20
+ s.summary = %q{rspec-rails 1.1.11.3}
21
21
 
22
22
  if s.respond_to? :specification_version then
23
23
  current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
24
24
  s.specification_version = 2
25
25
 
26
26
  if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
27
- s.add_runtime_dependency(%q<rspec>, ["= 1.1.11.2"])
28
- s.add_runtime_dependency(%q<cucumber>, [">= 0.1.13"])
27
+ s.add_runtime_dependency(%q<rspec>, ["= 1.1.11.3"])
28
+ s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
29
29
  s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
30
30
  else
31
- s.add_dependency(%q<rspec>, ["= 1.1.11.2"])
31
+ s.add_dependency(%q<rspec>, ["= 1.1.11.3"])
32
32
  end
33
33
  else
34
- s.add_dependency(%q<rspec>, ["= 1.1.11.2"])
34
+ s.add_dependency(%q<rspec>, ["= 1.1.11.3"])
35
35
  end
36
36
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dchelimsky-rspec-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.11.2
4
+ version: 1.1.11.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-12-18 00:00:00 -08:00
12
+ date: 2008-12-19 00:00:00 -08:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -19,7 +19,7 @@ dependencies:
19
19
  requirements:
20
20
  - - "="
21
21
  - !ruby/object:Gem::Version
22
- version: 1.1.11.2
22
+ version: 1.1.11.3
23
23
  version:
24
24
  description: Behaviour Driven Development for Ruby on Rails.
25
25
  email:
@@ -219,6 +219,6 @@ rubyforge_project: rspec
219
219
  rubygems_version: 1.2.0
220
220
  signing_key:
221
221
  specification_version: 2
222
- summary: rspec-rails 1.1.11.2
222
+ summary: rspec-rails 1.1.11.3
223
223
  test_files: []
224
224