rake 0.4.15 → 0.5.0

data/CHANGES

@@ -1,5 +1,25 @@
 = Rake Changelog
 
+== Version 0.5.0
+
+* Fixed documentation that was lacking the Rake module name (Tilman
+  Sauerbeck).
+* Added tar.gz and tar.bz2 support to package task (Tilman Sauerbeck).
+* Recursive rules are now supported (Tilman Sauerbeck).
+* Added warning option for the Test Task (requested by Eric Hodel).
+* The jamis rdoc template is only used if it exists.
+* Added fix for Ruby 1.8.2 test/unit and rails problem.
+* Added contributed rake man file (Jani Monoses).
+* Added Brian Chandler's fix for problems in --trace and --dry-run
+  mode.
+
+== Version 0.4.15
+
+* Fixed a bug that prevented the TESTOPTS flag from working with the
+  revised for 1.8.2 test task.
+* Updated the docs on --trace to indicate that it also enables a full
+  backtrace on errors. 
+
 == Version 0.4.14
 
 * Modified the TestTask to workaround the Ruby 1.8.2 change in

data/README

@@ -100,6 +100,8 @@ other projects with similar (and not so similar) goals.
 
 [<b>nobu.nokada@softhome.net</b>] For the initial patch for rule support.
 
+[<b>Tilman Sauerbeck <tilman@code-monkey.de></b>] For the recursive rule patch.
+
 == License
 
 Rake is available under an MIT-style license.

data/Rakefile

@@ -17,16 +17,29 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 CLEAN.include('**/*.o')
-CLOBBER.include('doc/example/main')
+CLOBBER.include('doc/example/main', 'testdata')
+CLOBBER.include('test/data/**/temp_*')
+
+
+def announce(msg='')
+  STDERR.puts msg
+end
 
 # Determine the current version of the software
 
 if `ruby -Ilib ./bin/rake --version` =~ /\S+$/
-  PKG_VERSION = $&
+  CURRENT_VERSION = $&
+else
+  CURRENT_VERSION = "0.0.0"
+end
+
+if ENV['REL']
+  PKG_VERSION = ENV['REL']
 else
-  PKG_VERSION = "0.0.0"
+  PKG_VERSION = CURRENT_VERSION
 end
 
+
 SRC_RB = FileList['lib/**/*.rb']
 
 # The default task is run if rake is given no explicit arguments.
@@ -42,22 +55,25 @@ Rake::TestTask.new(:testall) do |t|
     'test/contrib/test*.rb',
     'test/fun*.rb'
   ]
+  t.warning = true if t.respond_to? :warning
   t.verbose = true
 end
 
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/test*.rb']
+  t.warning = true if t.respond_to? :warning
   t.verbose = true
 end
 
 Rake::TestTask.new(:testfun) do |t|
   t.pattern = 'test/fun*.rb'
-  t.verbose = true
+  t.warning = true if t.respond_to? :warning
 end
 
 Rake::TestTask.new(:testcontrib) do |t|
   t.pattern = 'test/contrib/test*.rb'
   t.verbose = true
+  t.warning = true if t.respond_to? :warning
 end
 
 directory 'testdata'
@@ -72,14 +88,6 @@ task :tc => [:testcontrib]
 
 # CVS Tasks ----------------------------------------------------------
 
-desc "Tag all the CVS files with the latest release number (TAG=x)"
-task :tag do
-  rel = "REL_" + PKG_VERSION.gsub(/\./, '_')
-  rel << ENV['TAG'] if ENV['TAG']
-  puts rel
-  sh %{cvs commit -m 'pre-tag commit'}
-  sh %{cvs tag #{rel}}
-end
 
 # Install rake using the standard install.rb script.
 
@@ -94,7 +102,7 @@ rd = Rake::RDocTask.new("rdoc") { |rdoc|
   rdoc.rdoc_dir = 'html'
 #  rdoc.template = 'kilmer'
 #  rdoc.template = 'css2'
-  rdoc.template = 'jamis'
+  rdoc.template = 'doc/jamis.rb'
   rdoc.title    = "Rake -- Ruby Make"
   rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'README'
   rdoc.rdoc_files.include('README', 'MIT-LICENSE', 'TODO', 'CHANGES')
@@ -220,3 +228,126 @@ end
 # publish.rf file is not found, the publish targets won't be defined.
 
 load "publish.rf" if File.exist? "publish.rf"
+
+# Support Tasks ------------------------------------------------------
+
+def egrep(pattern)
+  Dir['**/*.rb'].each do |fn|
+    count = 0
+    open(fn) do |f|
+      while line = f.gets
+	count += 1
+	if line =~ pattern
+	  puts "#{fn}:#{count}:#{line}"
+	end
+      end
+    end
+  end
+end
+
+desc "Look for TODO and FIXME tags in the code"
+task :todo do
+  egrep /#.*(FIXME|TODO|TBD)/
+end
+
+desc "Look for Debugging print lines"
+task :dbg do
+  egrep /\bDBG|\bbreakpoint\b/
+end
+
+desc "List all ruby files"
+task :rubyfiles do 
+  puts Dir['**/*.rb'].reject { |fn| fn =~ /^pkg/ }
+  puts Dir['bin/*'].reject { |fn| fn =~ /CVS|(~$)|(\.rb$)/ }
+end
+
+# --------------------------------------------------------------------
+# Creating a release
+
+desc "Make a new release"
+task :release => [
+  :prerelease,
+  :clobber,
+  :testall,
+  :update_version,
+  :package,
+  :tag] do
+  
+  announce 
+  announce "**************************************************************"
+  announce "* Release #{PKG_VERSION} Complete."
+  announce "* Packages ready to upload."
+  announce "**************************************************************"
+  announce 
+end
+
+# Validate that everything is ready to go for a release.
+task :prerelease do
+  announce 
+  announce "**************************************************************"
+  announce "* Making RubyGem Release #{PKG_VERSION}"
+  announce "* (current version #{CURRENT_VERSION})"
+  announce "**************************************************************"
+  announce  
+
+  # Is a release number supplied?
+  unless ENV['REL']
+    fail "Usage: rake release REL=x.y.z [REUSE=tag_suffix]"
+  end
+
+  # Is the release different than the current release.
+  # (or is REUSE set?)
+  if PKG_VERSION == CURRENT_VERSION && ! ENV['REUSE']
+    fail "Current version is #{PKG_VERSION}, must specify REUSE=tag_suffix to reuse version"
+  end
+
+  # Are all source files checked in?
+  if ENV['RELTEST']
+    announce "Release Task Testing, skipping checked-in file test"
+  else
+    announce "Checking for unchecked-in files..."
+    data = `cvs -q update`
+    unless data =~ /^$/
+      fail "CVS update is not clean ... do you have unchecked-in files?"
+    end
+    announce "No outstanding checkins found ... OK"
+  end
+end
+
+task :update_version => [:prerelease] do
+  if PKG_VERSION == CURRENT_VERSION
+    announce "No version change ... skipping version update"
+  else
+    announce "Updating Rake version to #{PKG_VERSION}"
+    open("lib/rake.rb") do |rakein|
+      open("lib/rake.rb.new", "w") do |rakeout|
+	rakein.each do |line|
+	  if line =~ /^RAKEVERSION\s*=\s*/
+	    rakeout.puts "RAKEVERSION = '#{PKG_VERSION}'"
+	  else
+	    rakeout.puts line
+	  end
+	end
+      end
+    end
+    mv "lib/rake.rb.new", "lib/rake.rb"
+    if ENV['RELTEST']
+      announce "Release Task Testing, skipping commiting of new version"
+    else
+      sh %{cvs commit -m "Updated to version #{PKG_VERSION}" lib/rake.rb}
+    end
+  end
+end
+
+desc "Tag all the CVS files with the latest release number (REL=x.y.z)"
+task :tag => [:prerelease] do
+  reltag = "REL_#{PKG_VERSION.gsub(/\./, '_')}"
+  reltag << ENV['REUSE'].gsub(/\./, '_') if ENV['REUSE']
+  announce "Tagging CVS with [#{reltag}]"
+  if ENV['RELTEST']
+    announce "Release Task Testing, skipping CVS tagging"
+  else
+    sh %{cvs tag #{reltag}}
+  end
+end
+

data/doc/rakefile.rdoc

@@ -128,8 +128,8 @@ prerequisite a source file with an extension of ".c" must exist.  If
 Rake is able to find a file named "mycode.c", it will automatically
 create a task that builds "mycode.o" from "mycode.c".
 
-Notice that the source file "mycode.c" must exist.  Rake does not
-(currently) try to do multi-level task synthesis.
+If the file "mycode.c" does not exist, rake will attempt
+to recursively synthesize a rule for it. 
 
 When a task is synthesized from a rule, the +source+ attribute of the
 task is set to the matching source file.  This allows us to write

data/doc/release_notes/rake-0.4.15.rdoc

@@ -0,0 +1,35 @@
+= Rake 0.4.15 Released
+
+== Changes
+
+Version 0.4.15 is a bug fix update for the Ruby 1.8.2 compatibility
+changes.  This release includes:
+
+* Fixed a bug that prevented the TESTOPTS flag from working with the
+  revised for 1.8.2 test task.
+
+* Updated the docs on --trace to indicate that it also enables a full
+  backtrace on errors. 
+
+* Several fixes for new warnings generated.
+
+== Mini-Roadmap
+
+I will continue to issue Rake updates in the 0.4.xx series as new
+Ruby-1.8.2 issues become manifest.  Once the codebase stabilizes, I
+will release a 0.5.0 version incorporating all the changes.  If you
+are not using Ruby-1.8.2 and wish to avoid version churn, I recommend
+staying with a release prior to Rake-0.4.14.
+
+== What is Rake
+
+Rake is a build tool similar to the make program in many ways.  But
+instead of cryptic make recipes, Rake uses standard Ruby code to
+declare tasks and dependencies.  You have the full power of a modern
+scripting language built right into your build tool.
+
+== Availability
+
+Home Page:: http://rake.rubyforge.org/
+Download::  http://rubyforge.org/project/showfiles.php?group_id=50
+

data/doc/release_notes/rake-0.5.0.rdoc

@@ -0,0 +1,53 @@
+= Rake 0.5.0 Released
+
+It has been a long time in coming, but we finally have a new version
+of Rake available.  
+
+== Changes
+
+* Fixed bug where missing intermediate file dependencies could cause
+  an abort with --trace or --dry-run.  (Brian Chandler)
+
+* Recursive rules are now supported (Tilman Sauerbeck).
+
+* Added tar.gz and tar.bz2 support to package task (Tilman Sauerbeck).
+
+* Added warning option for the Test Task (requested by Eric Hodel).
+
+* The jamis rdoc template is only used if it exists.
+
+* Added fix for Ruby 1.8.2 test/unit and rails problem.
+
+* Added contributed rake man file. (Jani Monoses)
+
+* Fixed documentation that was lacking the Rake module name (Tilman
+  Sauerbeck).
+
+== What is Rake
+
+Rake is a build tool similar to the make program in many ways.  But
+instead of cryptic make recipes, Rake uses standard Ruby code to
+declare tasks and dependencies.  You have the full power of a modern
+scripting language built right into your build tool.
+
+== Availability
+
+The easiest way to get and install rake is via RubyGems ...
+
+  gem install rake    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Home Page:: http://rake.rubyforge.org/
+Download::  http://rubyforge.org/project/showfiles.php?group_id=50
+
+== Thanks
+
+Lots of people provided input to this release.  Thanks to Tilman
+Sauerbeck for numerous patches, documentation fixes and suggestions.
+And for also pushing me to get this release out.  Also, thanks to
+Brian Chandler for the finding and fixing --trace/dry-run fix.  That
+was an obscure bug.  Also to Eric Hodel for some good suggestions.
+
+-- Jim Weirich
+

data/lib/rake.rb

@@ -29,7 +29,7 @@
 # referenced as a library via a require statement, but it can be
 # distributed independently as an application.
 
-RAKEVERSION = '0.4.15'
+RAKEVERSION = '0.5.0'
 
 require 'rbconfig'
 require 'ftools'
@@ -219,7 +219,9 @@ class Task
     # task with the prerequisites and actions from the rule.  Set the
     # source attribute of the task appropriately for the rule.  Return
     # the enhanced task or nil of no rule was found.
-    def enhance_with_matching_rule(task_name)
+    def enhance_with_matching_rule(task_name, level=0)
+      fail Rake::RuleRecursionOverflowError,
+	"Rule Recursion Too Deep" if level >= 16
       RULES.each do |pattern, extensions, block|
 	if md = pattern.match(task_name)
 	  ext = extensions.first
@@ -235,10 +237,17 @@ class Task
 	    task = FileTask.define_task({task_name => [source]}, &block)
 	    task.source = source
 	    return task
+	  elsif parent = enhance_with_matching_rule(source, level+1)
+	    task = FileTask.define_task({task_name => [parent.name]}, &block)
+	    task.source = parent.name
+	    return task
 	  end
 	end
       end
       nil
+    rescue Rake::RuleRecursionOverflowError => ex
+      ex.add_target(task_name)
+      fail ex
     end
     
     private 
@@ -277,6 +286,9 @@ class FileTask < Task
     latest_prereq = @prerequisites.collect{|n| Task[n].timestamp}.max
     return false if latest_prereq.nil?
     timestamp < latest_prereq
+  rescue Errno::ENOENT => ex # one of the prereqs does not exist
+    raise unless $dryrun or $trace
+    true
   end
 
   # Time stamp for file task.
@@ -558,6 +570,21 @@ include RakeFileUtils
 
 module Rake
 
+  class RuleRecursionOverflowError < StandardError
+    def initialize(*args)
+      super
+      @targets = []
+    end
+
+    def add_target(target)
+      @targets << target
+    end
+
+    def message
+      super + ": [" + @targets.reverse.join(' => ') + "]"
+    end
+  end
+
   ####################################################################
   # A FileList is essentially an array with a few helper methods
   # defined to make file manipulation a bit easier.

data/lib/rake/packagetask.rb

@@ -27,12 +27,18 @@ module Rake
   # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tgz"</b>]
   #   Create a gzipped tar package (if <em>need_tar</em> is true).  
   #
+  # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tar.gz"</b>]
+  #   Create a gzipped tar package (if <em>need_tar_gz</em> is true).  
+  #
+  # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tar.bz2"</b>]
+  #   Create a bzip2'd tar package (if <em>need_tar_bz2</em> is true).  
+  #
   # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.zip"</b>]
   #   Create a zip package archive (if <em>need_zip</em> is true).
   #
   # Example:
   #
-  #   PackageTask.new("rake", "1.2.3") do |p|
+  #   Rake::PackageTask.new("rake", "1.2.3") do |p|
   #     p.need_tar = true
   #     p.package_files.include("lib/**/*.rb")
   #   end
@@ -47,9 +53,15 @@ module Rake
     # Directory used to store the package files (default is 'pkg').
     attr_accessor :package_dir
 
-    # True if a gzipped tar file should be produced (default is false).
+    # True if a gzipped tar file (tgz) should be produced (default is false).
     attr_accessor :need_tar
 
+    # True if a gzipped tar file (tar.gz) should be produced (default is false).
+    attr_accessor :need_tar_gz
+
+    # True if a bzip2'd tar file (tar.bz2) should be produced (default is false).
+    attr_accessor :need_tar_bz2
+
     # True if a zip file should be produced (default is false)
     attr_accessor :need_zip
 
@@ -70,6 +82,8 @@ module Rake
       @package_files = Rake::FileList.new
       @package_dir = 'pkg'
       @need_tar = false
+      @need_tar_gz = false
+      @need_tar_bz2 = false
       @need_zip = false
     end
 
@@ -91,15 +105,21 @@ module Rake
 
       task :clobber => [:clobber_package]
 
-      if need_tar
-	task :package => ["#{package_dir}/#{tgz_file}"]
-	file "#{package_dir}/#{tgz_file}" => [package_dir_path] + package_files do
-	  chdir(package_dir) do
-	    sh %{tar zcvf #{tgz_file} #{package_name}}
+      [
+	[need_tar, tgz_file, "z"],
+	[need_tar_gz, tar_gz_file, "z"],
+	[need_tar_bz2, tar_bz2_file, "j"]
+      ].each do |(need, file, flag)|
+	if need
+	  task :package => ["#{package_dir}/#{file}"]
+	  file "#{package_dir}/#{file}" => [package_dir_path] + package_files do
+	    chdir(package_dir) do
+	      sh %{tar #{flag}cvf #{file} #{package_name}}
+	    end
 	  end
 	end
       end
-
+      
       if need_zip
 	task :package => ["#{package_dir}/#{zip_file}"]
 	file "#{package_dir}/#{zip_file}" => [package_dir_path] + package_files do
@@ -142,6 +162,14 @@ module Rake
       "#{package_name}.tgz"
     end
 
+    def tar_gz_file
+      "#{package_name}.tar.gz"
+    end
+
+    def tar_bz2_file
+      "#{package_name}.tar.bz2"
+    end
+
     def zip_file
       "#{package_name}.zip"
     end

data/lib/rake/rdoctask.rb

@@ -8,22 +8,22 @@ module Rake
   # Create a documentation task that will generate the RDoc files for
   # a project.
   #
-  # The PackageTask will create the following targets:
+  # The RDocTask will create the following targets:
   #
   # [<b><em>rdoc</em></b>]
   #   Main task for this RDOC task.  
   #
   # [<b>:clobber_<em>rdoc</em></b>]
-  #   Delete all the package files.  This target is automatically
+  #   Delete all the rdoc files.  This target is automatically
   #   added to the main clobber target.
   #
   # [<b>:re<em>rdoc</em></b>]
-  #   Rebuild the package files from scratch, even if they are not out
+  #   Rebuild the rdoc files from scratch, even if they are not out
   #   of date.
   #
   # Simple Example:
   #
-  #   RDocTask.new do |rd|
+  #   Rake::RDocTask.new do |rd|
   #     rd.main = "README.rdoc"
   #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
   #   end
@@ -32,7 +32,7 @@ module Rake
   # generating two sets of documentation.  For instance, if you want to have a
   # development set of documentation including private methods:
   #
-  #   RDocTask.new(:rdoc_dev) do |rd|
+  #   Rake::RDocTask.new(:rdoc_dev) do |rd|
   #     rd.main = "README.doc"
   #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
   #     rd.options << "--all"

data/lib/rake/ruby182_test_unit_fix.rb

@@ -0,0 +1,23 @@
+module Test
+  module Unit
+    module Collector
+      class Dir
+	undef collect_file
+        def collect_file(name, suites, already_gathered)
+	  # loadpath = $:.dup
+          dir = File.dirname(File.expand_path(name))
+          $:.unshift(dir) unless $:.first == dir
+          if(@req)
+            @req.require(name)
+          else
+            require(name)
+          end
+          find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
+        ensure
+	  # $:.replace(loadpath)
+	  $:.delete_at $:.rindex(dir)
+        end
+      end
+    end
+  end
+end

data/lib/rake/testtask.rb

@@ -51,6 +51,10 @@ module Rake
     # is NONE)
     attr_accessor :options
 
+    # Request that the tests be run with the warning flag set.
+    # E.g. warning=true implies "ruby -w" used to run the tests.
+    attr_accessor :warning
+
     # Glob pattern to match test files. (default is 'test/test*.rb')
     attr_accessor :pattern
 
@@ -67,8 +71,10 @@ module Rake
       @name = name
       @libs = ["lib"]
       @pattern = nil
+      @options = nil
       @test_files = nil
       @verbose = false
+      @warning = false
       yield self if block_given?
       @pattern = 'test/test*.rb' if @pattern.nil? && @test_files.nil?
       define
@@ -77,10 +83,11 @@ module Rake
     # Create the tasks defined by this task lib.
     def define
       lib_path = @libs.join(File::PATH_SEPARATOR)
+      warning_flag = (@warning ? "-w " : "")
       desc "Run tests" + (@name==:test ? "" : " for #{@name}")
       task @name do
 	RakeFileUtils.verbose(@verbose) do
-	  ruby %{-I#{lib_path} -S testrb #{file_list.join(' ')} #{option_list}}
+	  ruby %{-I#{lib_path} #{warning_flag}-S testrb #{fix} #{file_list.join(' ')} #{option_list}}
 	end
       end
       self
@@ -101,6 +108,23 @@ module Rake
       end
     end
 
+    def fix
+      case RUBY_VERSION
+      when '1.8.2'
+	find_fix_file 'rake/ruby182_test_unit_fix'
+      else
+	nil
+      end || ''
+    end
+
+    def find_fix_file(fn)
+      $LOAD_PATH.each do |path|
+	file_path = File.join(path, "#{fn}.rb")
+	return file_path if File.exist? file_path
+      end
+      nil
+    end
+
   end
 end
 

data/test/functional.rb

@@ -11,35 +11,48 @@ end
 require 'test/unit'
 require 'fileutils'
 
+# Version 2.1.9 of session has a bug where the @debug instance
+# variable is not initialized, causing warning messages.  This snippet
+# of code fixes that problem.
+module Session
+  class AbstractSession
+    alias old_initialize initialize
+    def initialize(*args)
+      @debug = nil
+      old_initialize(*args)
+    end
+  end
+end
+
 class FunctionalTest < Test::Unit::TestCase
   def setup
     @rake_path = File.expand_path("bin/rake")
     lib_path = File.expand_path("lib")
     @ruby_options = "-I#{lib_path} -I."
-    @verbose = true if ENV['VERBOSE']
+    @verbose = ! ENV['VERBOSE'].nil?
   end
 
   def test_rake_default
     Dir.chdir("test/data/default") do rake end
-    assert_match /^DEFAULT$/, @out
+    assert_match(/^DEFAULT$/, @out)
     assert_status
   end
 
   def test_rake_error_on_bad_task
     Dir.chdir("test/data/default") do rake "xyz" end
-    assert_match /rake aborted/, @out
+    assert_match(/rake aborted/, @out)
     assert_status(1)
   end
 
   def test_env_availabe_at_top_scope
     Dir.chdir("test/data/default") do rake "TESTTOPSCOPE=1" end
-    assert_match /^TOPSCOPE$/, @out
+    assert_match(/^TOPSCOPE$/, @out)
     assert_status
   end
 
   def test_env_availabe_at_task_scope
     Dir.chdir("test/data/default") do rake "TESTTASKSCOPE=1 task_scope" end
-    assert_match /^TASKSCOPE$/, @out
+    assert_match(/^TASKSCOPE$/, @out)
     assert_status
   end
 
@@ -68,6 +81,24 @@ class FunctionalTest < Test::Unit::TestCase
     assert_no_match %r{OTHER}, @out
   end
 
+  # Test for the trace/dry_run bug found by Brian Chandler
+  def test_dry_run_bug
+    Dir.chdir("test/data/dryrun") do rake end
+    FileUtils.rm_f "test/data/dryrun/temp_one"
+    Dir.chdir("test/data/dryrun") do rake "--dry-run" end
+    assert_no_match(/No such file/, @out)
+    assert_status
+  end
+
+  # Test for the trace/dry_run bug found by Brian Chandler
+  def test_trace_bug
+    Dir.chdir("test/data/dryrun") do rake end
+    FileUtils.rm_f "test/data/dryrun/temp_one"
+    Dir.chdir("test/data/dryrun") do rake "--trace" end
+    assert_no_match(/No such file/, @out)
+    assert_status
+  end
+
   private
 
   def rake(*option_list)

data/test/testfilelist.rb

@@ -52,9 +52,9 @@ class TestFileList < Test::Unit::TestCase
   def test_add_return
     f = FileList.new
     g = f << "x"
-    assert_equal f.id, g.id
+    assert_equal f.object_id, g.object_id
     h = f.include("y")
-    assert_equal f.id, h.id
+    assert_equal f.object_id, h.object_id
   end
   
   def test_match
@@ -62,7 +62,7 @@ class TestFileList < Test::Unit::TestCase
     fl.include('test/test*.rb')
     assert fl.include?("test/testfilelist.rb")
     assert fl.size > 3
-    fl.each { |fn| assert_match /\.rb$/, fn }
+    fl.each { |fn| assert_match(/\.rb$/, fn) }
   end
 
   def test_add_matching
@@ -102,7 +102,7 @@ class TestFileList < Test::Unit::TestCase
     assert_equal [
       'testdata/x.c', 'testdata/abc.c', 'testdata/existing'
     ], fl
-    assert_equal fl.id, x.id
+    assert_equal fl.object_id, x.object_id
     fl.exclude('testdata/*.c')
     assert_equal ['testdata/existing'], fl
     fl.exclude('testdata/existing')
@@ -165,7 +165,7 @@ class TestFileList < Test::Unit::TestCase
     res = fl.sub!(/\.c$/, ".o")
     assert_equal ["x/a.o", "x/b.o"].sort, fl.sort
     assert_equal "x/a.c", f
-    assert_equal fl.id, res.id
+    assert_equal fl.object_id, res.object_id
   end
 
   def test_sub_with_block

data/test/testpackagetask.rb

@@ -19,6 +19,8 @@ class TestPackageTask < Test::Unit::TestCase
       p.package_files.exclude(/~$/)
       p.package_dir = 'pkg'
       p.need_tar = true
+      p.need_tar_gz = true
+      p.need_tar_bz2 = true
       p.need_zip = true
     }
     assert_equal "pkg", pkg.package_dir
@@ -27,6 +29,8 @@ class TestPackageTask < Test::Unit::TestCase
     assert "1.2.3", pkg.version
     assert Task[:package]
     assert Task['pkg/pkgr-1.2.3.tgz']
+    assert Task['pkg/pkgr-1.2.3.tar.gz']
+    assert Task['pkg/pkgr-1.2.3.tar.bz2']
     assert Task['pkg/pkgr-1.2.3.zip']
     assert Task["pkg/pkgr-1.2.3"]
     assert Task[:clobber_package]

data/test/testtasks.rb

@@ -178,8 +178,6 @@ class TestDirectoryTask < Test::Unit::TestCase
   end
 end
 
-__END__
-
 ######################################################################
 class TestDefinitions < Test::Unit::TestCase
   EXISTINGFILE = "testdata/existing"
@@ -267,12 +265,16 @@ class TestRules < Test::Unit::TestCase
     @runs = []
   end
 
+  def teardown
+    FileList['testdata/*'].each do |f| rm_r(f, :verbose=>false) end
+  end
+
   def test_multiple_rules1
     create_file(FTNFILE)
     delete_file(SRCFILE)
     delete_file(OBJFILE)
-    rule /\.o$/ => ['.c'] do @runs << :C end
-    rule /\.o$/ => ['.f'] do @runs << :F end
+    rule(/\.o$/ => ['.c']) do @runs << :C end
+    rule(/\.o$/ => ['.f']) do @runs << :F end
     t = Task[OBJFILE]
     t.invoke
     Task[OBJFILE].invoke
@@ -283,15 +285,15 @@ class TestRules < Test::Unit::TestCase
     create_file(FTNFILE)
     delete_file(SRCFILE)
     delete_file(OBJFILE)
-    rule /\.o$/ => ['.f'] do @runs << :F end
-    rule /\.o$/ => ['.c'] do @runs << :C end
+    rule(/\.o$/ => ['.f']) do @runs << :F end
+    rule(/\.o$/ => ['.c']) do @runs << :C end
     Task[OBJFILE].invoke
     assert_equal [:F], @runs
   end
 
   def test_create_with_source
     create_file(SRCFILE)
-    rule /\.o$/ => ['.c'] do |t|
+    rule(/\.o$/ => ['.c']) do |t|
       @runs << t.name
       assert_equal OBJFILE, t.name
       assert_equal SRCFILE, t.source
@@ -302,7 +304,7 @@ class TestRules < Test::Unit::TestCase
 
   def test_single_dependent
     create_file(SRCFILE)
-    rule /\.o$/ => '.c' do |t|
+    rule(/\.o$/ => '.c') do |t|
       @runs << t.name
     end
     Task[OBJFILE].invoke
@@ -341,7 +343,7 @@ class TestRules < Test::Unit::TestCase
 
   def test_precedence_rule_vs_implicit
     create_timed_files(OBJFILE, SRCFILE)
-    rule /\.o$/ => ['.c'] do
+    rule(/\.o$/ => ['.c']) do
       @runs << :RULE
     end
     Task[OBJFILE].invoke
@@ -368,4 +370,29 @@ class TestRules < Test::Unit::TestCase
   ensure
     rm_r("testdata/src", :verbose=>false) rescue nil
   end
+
+  def test_recursive_rules
+    actions = []
+    create_file("testdata/abc.xml")
+    rule '.y' => '.xml' do actions << 'y' end
+    rule '.c' => '.y' do actions << 'c'end
+    rule '.o' => '.c' do actions << 'o'end
+    rule '.exe' => '.o' do actions << 'exe'end
+    Task["testdata/abc.exe"].invoke
+    assert_equal ['y', 'c', 'o', 'exe'], actions
+  end
+
+  def test_recursive_overflow
+    create_file("testdata/a.a")
+    prev = 'a'
+    ('b'..'z').each do |letter|
+      rule ".#{letter}" => ".#{prev}" do |t| puts "#{t.name}" end
+      prev = letter
+    end
+    ex = assert_raises(Rake::RuleRecursionOverflowError) {
+      Task["testdata/a.z"].invoke
+    }
+    assert_match(/a\.z => testdata\/a.y/, ex.message)
+  end
+
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.3
+rubygems_version: 0.8.10
 specification_version: 1
 name: rake
 version: !ruby/object:Gem::Version 
-  version: 0.4.15
-date: 2005-01-03
+  version: 0.5.0
+date: 2005-03-25
 summary: Ruby based make-like utility.
 require_paths: 
   - lib
@@ -30,8 +30,8 @@ files:
   - install.rb
   - CHANGES
   - README
-  - TODO
   - Rakefile
+  - TODO
   - MIT-LICENSE
   - bin/rake
   - lib/rake.rb
@@ -42,6 +42,7 @@ files:
   - lib/rake/runtest.rb
   - lib/rake/testtask.rb
   - lib/rake/gempackagetask.rb
+  - lib/rake/ruby182_test_unit_fix.rb
   - lib/rake/contrib/ftptools.rb
   - lib/rake/contrib/sys.rb
   - lib/rake/contrib/compositepublisher.rb
@@ -67,12 +68,15 @@ files:
   - doc/rational.rdoc
   - doc/rakefile.rdoc
   - doc/release_notes
+  - doc/rake.1.gz
   - doc/example/Rakefile1
   - doc/example/Rakefile2
   - doc/example/a.c
   - doc/example/b.c
   - doc/example/main.c
   - doc/release_notes/rake-0.4.14.rdoc
+  - doc/release_notes/rake-0.4.15.rdoc
+  - doc/release_notes/rake-0.5.0.rdoc
 test_files: []
 rdoc_options: 
   - "--title"
@@ -90,6 +94,8 @@ extra_rdoc_files:
   - doc/rational.rdoc
   - doc/rakefile.rdoc
   - doc/release_notes/rake-0.4.14.rdoc
+  - doc/release_notes/rake-0.4.15.rdoc
+  - doc/release_notes/rake-0.5.0.rdoc
 executables: 
   - rake
 extensions: []