Permalink
Browse files

Update to RSpec 2.0

  • Loading branch information...
1 parent 94ddba2 commit 009c49aefdc611f2e777dc98e7752740f15c08e1 @jnicklas jnicklas committed Apr 25, 2011
Showing with 27 additions and 18 deletions.
  1. +10 −2 Gemfile.lock
  2. +16 −15 Rakefile
  3. +1 −1 xpath.gemspec
View
@@ -7,15 +7,23 @@ PATH
GEM
remote: http://rubygems.org/
specs:
+ diff-lcs (1.1.2)
nokogiri (1.4.3.1)
- rspec (1.3.0)
+ rspec (2.5.0)
+ rspec-core (~> 2.5.0)
+ rspec-expectations (~> 2.5.0)
+ rspec-mocks (~> 2.5.0)
+ rspec-core (2.5.1)
+ rspec-expectations (2.5.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.5.0)
yard (0.5.8)
PLATFORMS
ruby
DEPENDENCIES
nokogiri (~> 1.3)
- rspec (>= 1.2.9)
+ rspec (~> 2.0)
xpath!
yard (>= 0.5.8)
View
@@ -1,15 +1,16 @@
-require 'rubygems'
-require 'spec/rake/spectask'
-require 'yard'
-
-desc "Run all examples"
-Spec::Rake::SpecTask.new('spec') do |t|
- t.spec_files = FileList['spec/**/*.rb']
-end
-
-YARD::Rake::YardocTask.new do |t|
- t.files = ['lib/**/*.rb', 'README.rdoc']
- #t.options = ['--any', '--extra', '--opts'] # optional
-end
-
-task :default => :spec
+require 'rubygems'
+require 'rspec/core/rake_task'
+require 'yard'
+
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+ #t.rspec_path = 'bin/rspec'
+ t.rspec_opts = %w[--color]
+end
+
+YARD::Rake::YardocTask.new do |t|
+ t.files = ['lib/**/*.rb', 'README.rdoc']
+ #t.options = ['--any', '--extra', '--opts'] # optional
+end
+
+task :default => :spec
View
@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
s.add_dependency("nokogiri", ["~> 1.3"])
- s.add_development_dependency("rspec", [">= 1.2.9"])
+ s.add_development_dependency("rspec", ["~> 2.0"])
s.add_development_dependency("yard", [">= 0.5.8"])
end

0 comments on commit 009c49a

Please sign in to comment.