Compatibility with RubyGems 1.8.4 and Rake 0.9.0. Uncertain behavior …

…on previous versions.

CHANGELOG

@@ -1,3 +1,5 @@
+v4.6.0. Compatibility with RubyGems 1.8.4 and Rake 0.9.0. Uncertain behavior on previous versions.
+
 v4.5.6. Add :prerelease task for user release checks.
 
 v4.5.5. Tag releases in git automatically (smulube).

Rakefile

@@ -5,8 +5,9 @@ Echoe.new('echoe') do |p|
   p.project = 'fauna'
   p.author = 'Evan Weaver'
   p.summary = 'A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.'
-  p.runtime_dependencies = ['gemcutter', 'rubyforge', 'allison']
+  p.runtime_dependencies = ['gemcutter >=0.7.0', 'rubyforge >=2.0.4', 'allison >=2.0.3', 'rdoc >=3.6.1', 'rake >=0.9.0']
   p.development_dependencies = []
   p.retain_gemspec = true
+  p.rubygems_version = ">=1.8.4"
 end
 

echoe.gemspec

@@ -2,39 +2,45 @@
 
 Gem::Specification.new do |s|
   s.name = %q{echoe}
-  s.version = "4.5.6"
+  s.version = "4.6.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Evan Weaver"]
-  s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2011-03-30}
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.8.4") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Evan Weaver}]
+  s.cert_chain = [%q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem}]
+  s.date = %q{2011-05-30}
   s.description = %q{A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/echoe.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "MIT-LICENSE", "Manifest", "README", "Rakefile", "echoe.gemspec", "lib/echoe.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "vendor/rake/MIT-LICENSE", "vendor/rake/lib/rake/contrib/compositepublisher.rb", "vendor/rake/lib/rake/contrib/ftptools.rb", "vendor/rake/lib/rake/contrib/publisher.rb", "vendor/rake/lib/rake/contrib/rubyforgepublisher.rb", "vendor/rake/lib/rake/contrib/sshpublisher.rb", "vendor/rake/lib/rake/contrib/sys.rb"]
+  s.extra_rdoc_files = [%q{CHANGELOG}, %q{LICENSE}, %q{README}, %q{lib/echoe.rb}, %q{lib/echoe/extensions.rb}, %q{lib/echoe/platform.rb}, %q{lib/echoe/rubygems.rb}]
+  s.files = [%q{CHANGELOG}, %q{LICENSE}, %q{MIT-LICENSE}, %q{Manifest}, %q{README}, %q{Rakefile}, %q{echoe.gemspec}, %q{lib/echoe.rb}, %q{lib/echoe/extensions.rb}, %q{lib/echoe/platform.rb}, %q{lib/echoe/rubygems.rb}, %q{vendor/rake/MIT-LICENSE}, %q{vendor/rake/lib/rake/contrib/compositepublisher.rb}, %q{vendor/rake/lib/rake/contrib/ftptools.rb}, %q{vendor/rake/lib/rake/contrib/publisher.rb}, %q{vendor/rake/lib/rake/contrib/rubyforgepublisher.rb}, %q{vendor/rake/lib/rake/contrib/sshpublisher.rb}, %q{vendor/rake/lib/rake/contrib/sys.rb}]
   s.homepage = %q{http://fauna.github.com/fauna/echoe/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Echoe", "--main", "README"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Echoe}, %q{--main}, %q{README}]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.6.0}
+  s.rubygems_version = %q{1.8.4}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gemcutter>, [">= 0"])
-      s.add_runtime_dependency(%q<rubyforge>, [">= 0"])
-      s.add_runtime_dependency(%q<allison>, [">= 0"])
+      s.add_runtime_dependency(%q<gemcutter>, [">= 0.7.0"])
+      s.add_runtime_dependency(%q<rubyforge>, [">= 2.0.4"])
+      s.add_runtime_dependency(%q<allison>, [">= 2.0.3"])
+      s.add_runtime_dependency(%q<rdoc>, [">= 3.6.1"])
+      s.add_runtime_dependency(%q<rake>, [">= 0.9.0"])
     else
-      s.add_dependency(%q<gemcutter>, [">= 0"])
-      s.add_dependency(%q<rubyforge>, [">= 0"])
-      s.add_dependency(%q<allison>, [">= 0"])
+      s.add_dependency(%q<gemcutter>, [">= 0.7.0"])
+      s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
+      s.add_dependency(%q<allison>, [">= 2.0.3"])
+      s.add_dependency(%q<rdoc>, [">= 3.6.1"])
+      s.add_dependency(%q<rake>, [">= 0.9.0"])
     end
   else
-    s.add_dependency(%q<gemcutter>, [">= 0"])
-    s.add_dependency(%q<rubyforge>, [">= 0"])
-    s.add_dependency(%q<allison>, [">= 0"])
+    s.add_dependency(%q<gemcutter>, [">= 0.7.0"])
+    s.add_dependency(%q<rubyforge>, [">= 2.0.4"])
+    s.add_dependency(%q<allison>, [">= 2.0.3"])
+    s.add_dependency(%q<rdoc>, [">= 3.6.1"])
+    s.add_dependency(%q<rake>, [">= 0.9.0"])
   end
 end

lib/echoe.rb

@@ -3,10 +3,11 @@
 
 require 'rake'
 require 'rake/clean'
+require 'rake/dsl'
 require "#{$HERE}/../vendor/rake/lib/rake/contrib/compositepublisher"
 require "#{$HERE}/../vendor/rake/lib/rake/contrib/sshpublisher"
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/package_task'
+require 'rdoc/task'
 require 'rake/testtask'
 begin
 require 'spec/rake/spectask'
@@ -156,7 +157,7 @@ class Echoe
   attr_accessor :author, :changes, :clean_pattern, :description, :email, :runtime_dependencies, :development_dependencies, :need_tgz, :need_tar_gz, :need_gem, :need_zip, :rdoc_pattern, :project, :summary, :test_pattern, :spec_pattern, :url, :version, :docs_host, :rdoc_template, :manifest_name, :install_message, :extension_pattern, :private_key, :certificate_chain, :require_signed, :ruby_version, :platform, :ignore_pattern, :executable_pattern, :require_paths, :changelog, :rcov_options, :gemspec_format
 
   # best left alone
-  attr_accessor :name, :lib_files, :test_files, :bin_files, :spec, :rdoc_options, :has_rdoc, :include_gemspec, :include_rakefile, :gemspec_name, :retain_gemspec, :rakefile_name, :eval, :files, :changelog_patterns, :rubygems_version, :use_sudo, :gem_bin
+  attr_accessor :name, :lib_files, :test_files, :bin_files, :spec, :rdoc_options, :include_gemspec, :include_rakefile, :gemspec_name, :retain_gemspec, :rakefile_name, :eval, :files, :changelog_patterns, :rubygems_version, :use_sudo, :gem_bin
 
   # legacy
   attr_accessor :extra_deps, :rdoc_files, :extensions, :dependencies
@@ -191,7 +192,6 @@ def initialize(name, _version = nil)
     self.install_message = nil
     self.executable_pattern = /^bin\//
     self.require_paths = nil
-    self.has_rdoc = true
     self.use_sudo = !(Platform.windows? or ENV['GEM_HOME'].to_s.include?(ENV['USER'].to_s))
     self.gem_bin = "gem#{Platform.suffix}"
     self.rcov_options = []
@@ -395,7 +395,6 @@ def define_tasks
       else
         s.require_paths = dirs unless dirs.empty?
       end
-      s.has_rdoc = has_rdoc
 
       if File.exist? "test/test_all.rb"
         s.test_file = "test/test_all.rb"
@@ -413,7 +412,7 @@ def define_tasks
     self.bin_files = spec.files.grep(/^bin/)
     self.test_files = spec.files.grep(/^test/)
 
-    Rake::GemPackageTask.new(spec) do |pkg|
+    Gem::PackageTask.new(spec) do |pkg|
       pkg.need_tar = @need_tgz
       pkg.need_tar_gz = @need_tar_gz
       pkg.need_zip = @need_zip
@@ -730,7 +729,6 @@ def define_tasks
     ### Testing
 
     if test_pattern.any?
-
       Rake::TestTask.new(:test_inner) do |t|
         t.libs = ['lib', 'ext', 'bin', 'test']
         t.test_files = test_pattern
@@ -763,6 +761,10 @@ def define_tasks
       end
 
       task :default => :test
+    else
+      task :default do
+        puts "Nothing to do."
+      end
     end
 
     if defined? Spec and spec_pattern.any?