Rakefile in machinist-2.0.0.beta2 vs Rakefile in machinist-2.0

@@ -1,43 +1,28 @@
 require 'rubygems'
 require 'bundler'
-Bundler.setup
+Bundler::GemHelper.install_tasks
 
 require 'rake'
 require 'rspec/core/rake_task'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name     = "machinist"
-    gem.summary  = "Fixtures aren't fun. Machinist is."
-    gem.email    = "[e-mail]"
-    gem.homepage = "http://github.com/notahat/machinist"
-    gem.authors  = ["Pete Yandell"]
-    gem.has_rdoc = false
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
 
-
 RSpec::Core::RakeTask.new
 
 RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
   spec.rcov_opts = ['--exclude', 'spec', '--exclude', '.rvm']
 end
 
 desc 'Run the specs.'
-task :default => :spec
+task :default => :rcov
 
 
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = 'Machinist'
-  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('lib')
 end
 
 task :notes do
    system "grep -n -r 'FIXME\\|TODO' lib spec"