Merge pull request #44 from jfirebaugh/deprecations

Fix Rakefile deprecation warnings

Gemfile.lock

@@ -1,15 +1,19 @@
 PATH
   remote: .
   specs:
-    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
+    json (1.7.3)
+    json (1.7.3-java)
     rake (0.8.7)
     rake-compiler (0.7.5)
       rake
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -26,4 +30,5 @@ PLATFORMS
 DEPENDENCIES
   bcrypt-ruby!
   rake-compiler
+  rdoc
   rspec

Rakefile

@@ -1,10 +1,10 @@
 require 'rspec/core/rake_task'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/extensiontask'
 require 'rake/javaextensiontask'
 require 'rake/contrib/rubyforgepublisher'
 require 'rake/clean'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'benchmark'
 
 CLEAN.include(
@@ -37,14 +37,14 @@ RSpec::Core::RakeTask.new(:rcov) do |t|
 end
 
 desc 'Generate RDoc'
-rd = Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.options += GEMSPEC.rdoc_options
   rdoc.template = ENV['TEMPLATE'] if ENV['TEMPLATE']
   rdoc.rdoc_files.include(*GEMSPEC.extra_rdoc_files)
 end
 
-Rake::GemPackageTask.new(GEMSPEC) do |pkg|
+Gem::PackageTask.new(GEMSPEC) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
 end

bcrypt-ruby.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'rake-compiler'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rdoc'
 
   s.has_rdoc = true
   s.rdoc_options += ['--title', 'bcrypt-ruby', '--line-numbers', '--inline-source', '--main', 'README.md']