+ Use Gem::PackageTask if available, since Rake's package task will go away

[git-p4: depot-paths = "//src/hoe/dev/": change = 5256]

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/hoe.rb b/lib/hoe.rb
index cf1aee8..1731420 100644
--- a/lib/hoe.rb
+++ b/lib/hoe.rb
@@ -2,7 +2,6 @@
 
 require 'rubygems'
 require 'rake'
-require 'rake/gempackagetask'
 require 'rake/testtask'
 require 'rubyforge'
 require 'yaml'
diff --git a/lib/hoe/package.rb b/lib/hoe/package.rb
index 158878f..442c626 100644
--- a/lib/hoe/package.rb
+++ b/lib/hoe/package.rb
@@ -1,3 +1,11 @@
+begin
+  require 'rubygems/package_task'
+rescue LoadError
+  # rake/gempackagetask will go away some day
+  require 'rake/gempackagetask'
+  Gem::PackageTask = Rake::GemPackageTask
+end
+
 ##
 # Package plugin for hoe.
 #
@@ -29,7 +37,7 @@ module Hoe::Package
   # Define tasks for plugin.
 
   def define_package_tasks
-    Rake::GemPackageTask.new spec do |pkg|
+    Gem::PackageTask.new spec do |pkg|
       abort "Fix your version before you release" if
         spec.version.version =~ /borked/
       pkg.need_tar = @need_tar