Rakefile in rufus-scheduler-2.0.6 vs Rakefile in rufus-scheduler-2.0.7

@@ -8,15 +8,25 @@
 
 #
 # CLEAN
 
 require 'rake/clean'
-CLEAN.include('pkg', 'tmp', 'html')
-task :default => [ :clean ]
+CLEAN.include('pkg', 'tmp', 'rdoc')
 
 
 #
+# TEST / SPEC
+
+task :spec do
+  sh 'rspec spec/'
+end
+task :test => :spec
+
+task :default => :spec
+
+
+#
 # GEM
 
 require 'jeweler'
 
 Jeweler::Tasks.new do |gem|
@@ -33,51 +43,46 @@
   gem.email = '[e-mail]'
   gem.homepage = 'http://github.com/jmettraux/rufus-scheduler/'
   gem.authors = [ 'John Mettraux' ]
   gem.rubyforge_project = 'rufus'
 
-  gem.test_file = 'spec/spec.rb'
+  #gem.test_file = 'spec/spec.rb'
 
-  #gem.add_dependency 'yajl-ruby'
+  gem.add_dependency 'tzinfo'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'bacon'
+  gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'jeweler'
 
   # gemspec spec : http://www.rubygems.org/read/chapter/20
 end
 Jeweler::GemcutterTasks.new
 
 
 #
 # DOC
 
-begin
+#
+# make sure to have rdoc 2.5.x to run that
+#
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rd|
 
-  require 'yard'
+  rd.main = 'README.rdoc'
+  rd.rdoc_dir = 'rdoc/rufus-scheduler'
+  rd.title = "rufus-scheduler #{Rufus::Scheduler::VERSION}"
 
-  YARD::Rake::YardocTask.new do |doc|
-    doc.options = [
-      '-o', 'html/rufus-scheduler', '--title',
-      "rufus-scheduler #{Rufus::Scheduler::VERSION}"
-    ]
-  end
-
-rescue LoadError
-
-  task :yard do
-    abort "YARD is not available : sudo gem install yard"
-  end
+  rd.rdoc_files.include(
+    'README.rdoc', 'CHANGELOG.txt', 'LICENSE.txt', 'CREDITS.txt', 'lib/**/*.rb')
 end
 
 
 #
 # TO THE WEB
 
-task :upload_website => [ :clean, :yard ] do
+task :upload_rdoc => [ :clean, :rdoc ] do
 
   account = '[e-mail]'
   webdir = '/var/www/gforge-projects/rufus'
 
-  sh "rsync -azv -e ssh html/rufus-scheduler #{account}:#{webdir}/"
+  sh "rsync -azv -e ssh rdoc/rufus-scheduler #{account}:#{webdir}/"
 end