upgrade to rspec2

Gemfile.lock

@@ -9,75 +9,84 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
       mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     builder (2.1.2)
-    columnize (0.3.1)
+    columnize (0.3.2)
     daemons (1.1.0)
+    diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.4.1)
+    i18n (0.4.2)
     linecache (0.43)
-    mail (2.2.6)
+    mail (2.2.9)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (~> 0.4.1)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
     mysql (2.8.1)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
       bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    rspec (1.3.0)
-    ruby-debug (0.10.3)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    ruby-debug (0.10.4)
       columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    sqlite3-ruby (1.3.1)
-    thor (0.14.0)
+    sqlite3-ruby (1.3.2)
+    thor (0.14.4)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -92,6 +101,6 @@ DEPENDENCIES
   mysql
   rails (~> 3.0)
   rake
-  rspec
+  rspec (~> 2.0)
   ruby-debug
   sqlite3-ruby

Rakefile

@@ -2,12 +2,10 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs << 'lib'
-  t.pattern = 'spec/*_spec.rb'
-  t.verbose = false
+RSpec::Core::RakeTask.new do |r|
+  r.verbose = false
 end
 
 task :default => :spec

delayed_job.gemspec

@@ -19,7 +19,7 @@ This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)
 
   s.add_runtime_dependency      'daemons'
   s.add_runtime_dependency      'activesupport',  '~>3.0'
-  s.add_development_dependency  'rspec'
+  s.add_development_dependency  'rspec',          '~>2.0'
   s.add_development_dependency  'rake'
   s.add_development_dependency  'rails',          '~>3.0'
   s.add_development_dependency  'sqlite3-ruby'

spec/spec_helper.rb

@@ -2,7 +2,7 @@
 
 require 'rubygems'
 require 'bundler/setup'
-require 'spec'
+require 'rspec'
 require 'logger'
 
 require 'active_record'
@@ -43,9 +43,9 @@
 
 # Purely useful for test cases...
 class Story < ActiveRecord::Base
-  def tell; text; end       
+  def tell; text; end
   def whatever(n, _); tell*n; end
-  
+
   handle_asynchronously :whatever
 end