hoe 1.11.0 → 1.12.0

data/History.txt

@@ -1,3 +1,18 @@
+=== 1.12.0 / 2009-03-31
+
+* 6 minor enhancements:
+
+  * Added Rake.undo.
+  * Added from vlad: Rake.application.all_tasks and Rake.clear_tasks.
+  * Added log files to default excludes. (technonancy)
+  * Refactored gem install code and extended to work with jruby
+  * Refactored run_tests into make_test_cmd, enabling use in tasks. (jbarnette)
+  * Use RDoc::Task instead of Rake::RDocTask, if available.
+
+* 1 bug fix:
+
+  * Fixed incorrect usage. (jmhodges)
+
 === 1.11.0 / 2009-03-16
 
 * 2 minor enhancements:

data/bin/sow

@@ -10,7 +10,7 @@ require 'fileutils'
 require 'erb'
 
 if $h || ARGV.empty? || ($t && $d) then
-  puts "usage: #{File.dirname $0} [-d|-t] project"
+  puts "usage: #{File.basename $0} [-d|-t] project"
   puts "  -t = add project to subdir under 'trunk'"
   puts "  -d = add project to subdir under 'dev'"
   exit

data/lib/hoe.rb

@@ -3,7 +3,11 @@
 require 'rubygems'
 require 'rake'
 require 'rake/gempackagetask'
-require 'rake/rdoctask'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
 require 'rake/testtask'
 require 'rbconfig'
 require 'rubyforge'
@@ -130,7 +134,7 @@ end
 #
 
 class Hoe
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
   GEMURL = URI.parse 'http://gems.rubyforge.org' # for namespace :deps below
 
   ruby_prefix = Config::CONFIG['prefix']
@@ -504,12 +508,12 @@ class Hoe
     if File.directory? "test" then
       desc 'Run the test suite. Use FILTER or TESTOPTS to add flags/args.'
       task :test do
-        run_tests
+        ruby make_test_cmd
       end
 
       desc 'Run the test suite using multiruby.'
       task :multi do
-        run_tests :multi
+        ruby make_test_cmd(:multi)
       end
 
       desc 'Show which test files fail when run alone.'
@@ -722,8 +726,7 @@ class Hoe
 
     desc 'Install the package as a gem.'
     task :install_gem => [:clean, :package, :check_extra_deps] do
-      gem = Dir['pkg/*.gem'].first
-      sh "#{'sudo ' unless WINDOZE}gem install --local #{gem}"
+      install_gem Dir['pkg/*.gem'].first
     end
 
     desc 'Package and upload the release to rubyforge.'
@@ -948,9 +951,7 @@ class Hoe
         begin
           gem(*dep)
         rescue Gem::LoadError
-          dep_gem, dep_version = dep
-          dep_version = "--version '#{dep_version}'" if dep_version
-          sh "#{'sudo ' unless WINDOZE}gem install #{dep_gem} #{dep_version}"
+          install_gem(*dep)
         end
       end
     end
@@ -959,7 +960,7 @@ class Hoe
     task :config_hoe do
       with_config do |config, path|
         default_config = {
-          "exclude" => /tmp$|CVS|\.svn/,
+          "exclude" => /tmp$|CVS|\.svn|\.log$/,
           "publish_on_announce" => false,
           "signing_key_file" => "~/.gem/gem-private_key.pem",
           "signing_cert_file" => "~/.gem/gem-public_cert.pem",
@@ -1115,7 +1116,15 @@ class Hoe
     end
   end # end define
 
-  def run_tests(multi=false) # :nodoc:
+  def install_gem name, version = nil
+    gem_cmd = Gem.default_exec_format % 'gem'
+    sudo    = 'sudo '                  unless WINDOZE
+    local   = '--local'                unless version
+    version = "--version '#{version}'" if     version
+    sh "#{sudo}#{gem_cmd} install #{local} #{name} #{version}"
+  end
+
+  def make_test_cmd multi = false # :nodoc:
     framework = SUPPORTED_TEST_FRAMEWORKS[testlib]
     raise "unsupported test framework #{testlib}" unless framework
 
@@ -1130,7 +1139,7 @@ class Hoe
       cmd = "-S multiruby #{cmd}"
     end
 
-    ruby cmd
+    cmd
   end
 
   def announcement # :nodoc:
@@ -1154,6 +1163,46 @@ class Hoe
   end
 end
 
+module Rake
+  module TaskManager
+    ##
+    # This gives us access to the tasks already defined in rake.
+    def all_tasks
+      @tasks
+    end
+  end
+
+  ##
+  # Hooks into rake and allows us to clear out a task by name or
+  # regexp. Use this if you want to completely override a task instead
+  # of extend it.
+  def self.clear_tasks(*tasks)
+    tasks.flatten.each do |name|
+      case name
+      when Regexp then
+        Rake.application.all_tasks.delete_if { |k,_| k =~ name }
+      else
+        Rake.application.all_tasks.delete(name)
+      end
+    end
+  end
+
+  ##
+  # Removes the last action added to a task. Use this when two
+  # libraries define the same task and you only want one of the
+  # actions.
+  #
+  #   require 'hoe'
+  #   require 'tasks/rails'
+  #   Rake.undo("test") # rolls out rails' test task
+
+  def self.undo(*names)
+    names.each do |name|
+      all_tasks[name].actions.delete_at(-1)
+    end
+  end
+end
+
 # :enddoc:
 
 class ::Rake::SshDirPublisher # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -30,7 +30,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2009-03-16 00:00:00 -07:00
+date: 2009-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

metadata.gz.sig

@@ -1,2 +1 @@
-)��P1��o<U�V�KoG�ge��×cf��վ�A{��"�|�>�o�9>�+�/*��~�-�$QΪ�aO˾�2-0��s&t����Z�"wNcSݬ.����9i�C���}^,X��z��y�Oy���i����d����_��>��@	����<2E�w���!<�9�4��%/̝�;9	Z�

-�<�"{��<j��������~ʓ������\k��x�S�����]J=y1Ć-
���ZmyEA�$�
+v������((B�������:�B�����_��e+tVx&�qBfi��Е�/������"k�#���VOn}�[H_p�(�+����N�`���ܿ;�l�*E��餺ʨ���d���R~@��3�f��L�
��;G�E�3��!�am��P���3}�i������be��+�ߟ�S+?�'�(E���F�����[M�	q
V��R��LkJ�K�\��e"�>�U�4���%���8��a��Ѫ�����y��