Permalink
Browse files

Update to rspec2.x

  • Loading branch information...
1 parent 4dddc4c commit 08d88b926714f6497f63304294723dba610906e8 @zapnap zapnap committed May 8, 2011
Showing with 5 additions and 18 deletions.
  1. +5 −10 Rakefile
  2. +0 −8 spec/spec_helper.rb
View
@@ -11,7 +11,7 @@ begin
gem.rubyforge_project = 'sprinkle'
gem.homepage = "http://github.com/crafterm/sprinkle"
gem.authors = ["Marcus Crafter"]
- gem.add_development_dependency("rspec", "~> 1.3")
+ gem.add_development_dependency("rspec", ">= 2.5")
gem.add_dependency('activesupport', '>= 2.0.2')
gem.add_dependency('highline', '>= 1.4.0')
gem.add_dependency('capistrano', '>= 2.5.5')
@@ -27,16 +27,11 @@ task "inst"=>[:clobber, :build] do
puts `gem install pkg/sprinkle-*.gem`
end
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
- spec.libs << 'lib' << 'spec'
- spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
- spec.libs << 'lib' << 'spec'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
spec.pattern = 'spec/**/*_spec.rb'
- spec.rcov = true
+ spec.rspec_opts = ['--backtrace']
+ # spec.rcov = true
end
task :spec => :check_dependencies
View
@@ -1,11 +1,3 @@
-begin
- require 'spec'
-rescue LoadError
- require 'rubygems'
- gem 'rspec'
- require 'spec'
-end
-
$:.unshift(File.dirname(__FILE__) + '/../lib')
require 'sprinkle'

0 comments on commit 08d88b9

Please sign in to comment.