Updating to rspec2

Gemfile

@@ -1,5 +1,7 @@
 source :rubygems
 
+RSPEC_VERSION = '2.0.0.beta.22'
+
 gem 'rack'
 
 gem 'yogo-datamapper',        :git => 'git://github.com/yogo/yogo-datamapper.git'
@@ -8,14 +10,15 @@ gem 'yogo-datamapper',        :git => 'git://github.com/yogo/yogo-datamapper.git
 group :development do
   gem "rake"
   gem "jeweler"
-  gem "rspec"
+  gem "rspec",                RSPEC_VERSION
+  gem "autotest"
   gem "rack-test"
   gem "cucumber"
   gem "yard"
 
   platforms(:mri_19) do
-    gem 'ruby-debug19', :require => 'ruby-debug'
-    gem 'rack-debug19', :require => 'rack-debug'
+    gem 'ruby-debug19',       :require => 'ruby-debug'
+    gem 'rack-debug19',       :require => 'rack-debug'
   end
 
   platforms(:mri_18) do

Gemfile.lock

@@ -18,6 +18,7 @@ GEM
   specs:
     addressable (2.2.1)
     archive-tar-minitar (0.5.2)
+    autotest (4.3.2)
     builder (2.1.2)
     columnize (0.3.1)
     cucumber (0.8.5)
@@ -71,7 +72,16 @@ GEM
     rack-test (0.5.4)
       rack (>= 1.0)
     rake (0.8.7)
-    rspec (1.3.0)
+    rspec (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+      rspec-mocks (= 2.0.0.beta.22)
+    rspec-core (2.0.0.beta.22)
+    rspec-expectations (2.0.0.beta.22)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
@@ -103,14 +113,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  autotest
   cucumber
   jeweler
   rack
   rack-debug
   rack-debug19
   rack-test
   rake
-  rspec
+  rspec (= 2.0.0.beta.22)
   ruby-debug
   ruby-debug19
   yard

Rakefile

@@ -27,16 +27,14 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
+desc 'Run all examples using rcov'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
+  spec.rcov_opts =  %[-Ilib -Ispec --exclude "mocks,expectations,gems/*,spec/resources,spec/lib,spec/spec_helper.rb,db/*,/Library/Ruby/*,config/*"]
+  spec.rcov_opts << %[--no-html --aggregate coverage.data]
 end
 
 # task :spec => :check_dependencies

spec/spec_helper.rb

@@ -10,8 +10,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'yogo/db'
-require 'spec'
-require 'spec/autorun'
+require 'rspec/core'
+require 'autotest/rspec2'
 require 'rack/test'
 require 'rack/mock'
 
@@ -22,6 +22,6 @@
 end
 
 
-Spec::Runner.configure do |config|
+Rspec.configure do |config|
   config.include Rack::Test::Methods
 end