rake 0.7.0 → 0.7.1

data/CHANGES

@@ -1,6 +1,20 @@
 = Rake Changelog
 
-== Pre-Version 0.7.0
+== Version 0.7.1
+
+* Added optional filter parameter to the --tasks command line option.
+* Added flatten to allow rule transform procs to return lists of
+  prereqs (Joel VanderWerf provided patch).
+* Added pathmap to String and FileList.
+* The -r option will now load .rake files (but a straight require
+  doesn't yet).  NOTE: This is experimental ... it may be
+  discontinued.
+* The -f option without a value will disable the search for a
+  Rakefile.  The assumption is that the -r files are adequate.
+* Fixed the safe_ln function to fall back to cp in more error
+  scenarios.
+
+== Version 0.7.0
 
 * Added Rake.original_dir to return the original starting directory of
   the rake application.

data/README

@@ -108,6 +108,8 @@ package.
 Rake is a late entry in the make replacement field.  Here are links to
 other projects with similar (and not so similar) goals.
 
+* http://directory.fsf.org/bras.html -- Bras, one of earliest
+  implementations of "make in a scripting language".
 * http://www.a-a-p.org -- Make in Python
 * http://www.aromatic.com/tools/jam.txt -- JAM, Java Automated Make
 * http://ant.apache.org -- The Ant project

data/Rakefile

@@ -245,7 +245,7 @@ load "publish.rf" if File.exist? "publish.rf"
 
 desc "Look for TODO and FIXME tags in the code"
 task :todo do
-  FileList['**/*.rb'].egrep /#.*(FIXME|TODO|TBD)/
+  FileList['**/*.rb'].exclude('pkg').egrep /#.*(FIXME|TODO|TBD)/
 end
 
 desc "Look for Debugging print lines"

data/doc/release_notes/rake-0.7.1.rdoc

@@ -0,0 +1,59 @@
+= Rake 0.7.1 Released
+
+Version 0.7.1 supplies a bug fix and a few minor enhancements.
+
+== Changes
+
+=== Bug Fixes in 0.7.1
+
+* Changes in the exception reported for the FileUtils.ln caused
+  safe_ln to fail with a NotImplementedError.  Rake 0.7.1 will now
+  catch that error or any StandardError and properly fall back to
+  using +cp+.
+
+=== New Features in 0.7.1
+
+* You can filter the results of the --task option by supplying an
+  optional regular expression.  This allows the user to easily find a
+  particular task name in a long list of possible names.
+
+* Transforming procs in a rule may now return a list of prerequisites.
+  This allows more flexible rule formation.
+
+* FileList and String now support a +pathmap+ melthod that makes the
+  transforming paths a bit easier.  See the API docs for +pathmap+ for
+  details.
+
+* The -f option without a value will disable the search for a
+  Rakefile.  This allows the Rakefile to be defined entirely in a
+  library (and loaded with the -r option).  The current working
+  directory is not changed when this is done.
+
+== 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
+
+As usual, it was input from users that drove a alot of these changes.
+The following people either contributed patches, made suggestions or
+made otherwise helpful comments.  Thanks to ...
+
+* James Britt and Assaph Mehr for reporting and helping to debug the
+  safe_ln issue.
+
+-- 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.7.0'
+RAKEVERSION = '0.7.1'
 
 require 'rbconfig'
 require 'ftools'
@@ -78,9 +78,164 @@ class String
       dup.sub!(%r(([^/\\])\.[^./\\]*$)) { $1 + newext } || self + newext
     end
   end
-end
 
 
+  unless instance_methods.include? "pathmap" 
+    # Explode a path into individual components.  Used by +pathmap+.
+    def pathmap_explode
+      head, tail = File.split(self)
+      return [self] if head == self
+      return [tail] if head == '.' || tail == '/'
+      return [head, tail] if head == '/'
+      return head.pathmap_explode + [tail]
+    end
+    protected :pathmap_explode
+
+    # Extract a partial path from the path.  Include +n+ directories
+    # from the front end (left hand side) if +n+ is positive.  Include
+    # |+n+| directories from the back end (right hand side) if +n+ is
+    # negative.
+    def pathmap_partial(n)
+      target = File.dirname(self)
+      dirs = target.pathmap_explode
+      if n > 0
+        File.join(dirs[0...n])
+      elsif n < 0
+        partial = dirs[n..-1]
+        if partial.nil? || partial.empty?
+          target
+        else
+          File.join(partial)
+        end
+      else
+        "."
+      end
+    end
+    protected :pathmap_partial
+
+    # Preform the pathmap replacement operations on the given path.
+    # The patterns take the form 'pat1,rep1;pat2,rep2...'.
+    def pathmap_replace(patterns, &block)
+      result = self
+      patterns.split(';').each do |pair|
+        pattern, replacement = pair.split(',')
+        pattern = Regexp.new(pattern)
+        if replacement == '*' && block_given?
+          result = result.sub(pattern, &block)
+        elsif replacement
+          result = result.sub(pattern, replacement)
+        else
+          result = result.sub(pattern, '')
+        end
+      end
+      result
+    end
+    protected :pathmap_replace
+
+    # Map the path according to the given specification.  The
+    # specification controls the details of the mapping.  The
+    # following special patterns are recognized:
+    #
+    # * <b>%p</b> -- The complete path.   
+    # * <b>%f</b> -- The base file name of the path, with its file
+    #   extension, but without any directories.
+    # * <b>%n</b> -- The file name of the path without its file
+    #   extension.
+    # * <b>%d</b> -- The directory list of the path.
+    # * <b>%x</b> -- The file extension of the path.  An empty string
+    #   if there is no extension.
+    # * <b>%X</b> -- Everything *but* the file extension.
+    # * <b>%s</b> -- The alternate file separater if defined,
+    #   otherwise use the standard file separator.
+    # # <b>%%</b> -- A percent sign.
+    #
+    # The %d specifier can also have a numeric prefix (e.g. '%2d').
+    # If the number is positive, only return (up to) +n+ directories
+    # in the path, starting from the left hand side.  If +n+ is
+    # negative, return (up to) |+n+| directories from the right hand
+    # side of the path.
+    #
+    # Examples:
+    #
+    #   'a/b/c/d/file.txt'.pathmap("%2d")   => 'a/b'
+    #   'a/b/c/d/file.txt'.pathmap("%-2d")  => 'c/d'
+    #
+    # Also the %d, %p, $f, $n, %x, and %X operators can take a
+    # pattern/replacement argument to perform simple string
+    # substititions on a particular part of the path.  The pattern and
+    # replacement are speparated by a comma and are enclosed by curly
+    # braces.  The replacement spec comes after the % character but
+    # before the operator letter.  (e.g. "%{old,new}d").  Muliple
+    # replacement specs should be separated by semi-colons
+    # (e.g. "%{old,new;src,bin}d").
+    #
+    # Regular expressions may be used for the pattern, and back refs
+    # may be used in the replacement text.  Curly braces, commas and
+    # semi-colons are excluded from both the pattern and replacement
+    # text (let's keep parsing reasonable).
+    #
+    # For example: 
+    #
+    #    "src/org/onestepback/proj/A.java".pathmap("%{^src,bin}X.class")
+    # 
+    # returns:
+    #
+    #    "bin/org/onestepback/proj/A.class"
+    #
+    # If the replacement text is '*', then a block may be provided to
+    # perform some arbitrary calculation for the replacement.
+    #
+    # For example:
+    #
+    #   "/path/to/file.TXT".pathmap("%X%{.*,*}x") { |ext|
+    #      ext.downcase
+    #   }
+    #
+    # Returns:
+    #
+    #  "/path/to/file.txt"
+    #
+    def pathmap(spec=nil, &block)
+      return self if spec.nil?
+      result = ''
+      spec.scan(/%\{[^}]*\}-?\d*[sdpfnxX%]|%-?\d+d|%.|[^%]+/) do |frag|
+        case frag
+        when '%f'
+          result << File.basename(self)
+        when '%n'
+          result << File.basename(self).ext
+        when '%d'
+          result << File.dirname(self)
+        when '%x'
+          result << $1 if self =~ /[^\/](\.[^.]+)$/
+        when '%X'
+          if self =~ /^(.+[^\/])(\.[^.]+)$/
+            result << $1
+          else
+            result << self
+          end
+        when '%p'
+          result << self
+        when '%s'
+          result << (File::ALT_SEPARATOR || File::SEPARATOR)
+        when '%%'
+          result << "%"
+        when /%(-?\d+)d/
+          result << pathmap_partial($1.to_i)
+        when /^%\{([^}]*)\}(\d*[dpfnxX])/
+          patterns, operator = $1, $2
+          result << pathmap('%' + operator).pathmap_replace(patterns, &block)
+        when /^%/
+          fail ArgumentError, "Unknown pathmap specifier #{frag} in '#{spec}'"
+        else
+          result << frag
+        end
+      end
+      result
+    end
+  end
+end
+
 ######################################################################
 module Rake
 
@@ -603,7 +758,7 @@ module FileUtils
     else
       begin
         ln(*args)
-      rescue Errno::EOPNOTSUPP, Errno::EXDEV
+      rescue StandardError, NotImplementedError
         LN_SUPPORTED[0] = false
         cp(*args)
       end
@@ -1045,6 +1200,13 @@ module Rake
       self
     end
 
+    # Apply the pathmap spec to each of the included file names,
+    # returning a new file list with the modified paths.  (See
+    # String#pathmap for details.)
+    def pathmap(spec=nil)
+      collect { |fn| fn.pathmap(spec) }
+    end
+
     # Return a new array with <tt>String#ext</tt> method applied to
     # each member of the array.
     #
@@ -1421,13 +1583,13 @@ module Rake
       extensions.collect { |ext|
 	case ext
 	when String
-	  source = task_name.sub(/\.[^.]*$/, ext)
+	  task_name.sub(/\.[^.]*$/, ext)
 	when Proc
-	  source = ext.call(task_name)
+	  ext.call(task_name)
 	else
 	  fail "Don't know how to handle rule dependent: #{ext.inspect}"
 	end
-      }
+      }.flatten
     end
     
   end
@@ -1459,14 +1621,14 @@ module Rake
 	"Display the tasks and dependencies, then exit."],
       ['--quiet',    '-q', GetoptLong::NO_ARGUMENT,
 	"Do not log messages to standard output."],
-      ['--rakefile', '-f', GetoptLong::REQUIRED_ARGUMENT,
+      ['--rakefile', '-f', GetoptLong::OPTIONAL_ARGUMENT,
 	"Use FILE as the rakefile."],
       ['--require',  '-r', GetoptLong::REQUIRED_ARGUMENT,
 	"Require MODULE before executing rakefile."],
       ['--silent',   '-s', GetoptLong::NO_ARGUMENT,
 	"Like --quiet, but also suppresses the 'in directory' announcement."],
-      ['--tasks',    '-T', GetoptLong::NO_ARGUMENT,
-	"Display the tasks and dependencies, then exit."],
+      ['--tasks',    '-T', GetoptLong::OPTIONAL_ARGUMENT,
+	"Display the tasks (matching optional PATTERN) with descriptions, then exit."],
       ['--trace',    '-t', GetoptLong::NO_ARGUMENT,
 	"Turn on invoke/execute tracing, enable full backtrace."],
       ['--usage',    '-h', GetoptLong::NO_ARGUMENT,
@@ -1501,7 +1663,7 @@ module Rake
     # If a match is found, it is copied into @rakefile.
     def have_rakefile
       RAKEFILES.each do |fn|
-	if File.exist?(fn)
+	if File.exist?(fn) || fn == ''
 	  @rakefile = fn
 	  return true
 	end
@@ -1533,15 +1695,14 @@ module Rake
     
     # Display the tasks and dependencies.
     def display_tasks_and_comments
-      width = Rake::Task.tasks.select { |t|
-	t.comment
-      }.collect { |t|
+      displayable_tasks = Rake::Task.tasks.select { |t|
+	t.comment && t.name =~ options.show_task_pattern
+      }
+      width = displayable_tasks.collect { |t|
 	t.name.length
       }.max
-      Rake::Task.tasks.each do |t|
-	if t.comment
-	  printf "rake %-#{width}s  # %s\n", t.name, t.comment
-	end
+      displayable_tasks.each do |t|
+	printf "rake %-#{width}s  # %s\n", t.name, t.comment
       end
     end
     
@@ -1584,12 +1745,21 @@ module Rake
       when '--rakelibdir'
 	options.rakelib = value.split(':')
       when '--require'
-	require value
+        begin
+          require value
+        rescue LoadError => ex
+          begin
+            rake_require value
+          rescue LoadError => ex2
+            raise ex
+          end
+        end
       when '--silent'
 	verbose(false)
 	options.silent = true
       when '--tasks'
 	options.show_tasks = true
+	options.show_task_pattern = Regexp.new(value || '.')
       when '--trace'
 	options.trace = true
 	verbose(true)
@@ -1627,6 +1797,23 @@ module Rake
       end
     end
     
+    # Similar to the regular Ruby +require+ command, but will check
+    # for .rake files in addition to .rb files.
+    def rake_require(file_name, paths=$LOAD_PATH, loaded=$")
+      return false if loaded.include?(file_name)
+      paths.each do |path|
+        fn = file_name + ".rake"
+        full_path = File.join(path, fn)
+        if File.exist?(full_path)
+          load full_path
+          loaded << fn
+          return true
+        end
+      end
+      fail LoadError, "Can't find #{file_name}"
+    end
+
+    # Find the rakefile and then load it and any pending imports.
     def load_rakefile
       here = Dir.pwd
       while ! have_rakefile
@@ -1638,7 +1825,7 @@ module Rake
       end
       puts "(in #{Dir.pwd})" unless options.silent
       $rakefile = @rakefile
-      load File.expand_path(@rakefile)
+      load File.expand_path(@rakefile) if @rakefile != ''
       options.rakelib.each do |rlib|
 	Dir["#{rlib}/*.rake"].each do |name| add_import name end
       end

data/test/data/rakelib/test1.rb

@@ -0,0 +1,3 @@
+task :default do
+  puts "TEST1"
+end

data/test/session_functional.rb

@@ -130,6 +130,16 @@ class FunctionalTest < Test::Unit::TestCase
     end
   end
 
+  def test_dash_f_with_no_arg_foils_rakefile_lookup
+    rake "-I test/data/rakelib -rtest1 -f"
+    assert_match(/^TEST1$/, @out)
+  end
+
+  def test_dot_rake_files_can_be_laoded_with_dash_r
+    rake "-I test/data/rakelib -rtest2 -f"
+    assert_match(/^TEST2$/, @out)
+  end
+
   def test_can_invoke_task_in_toplevel_namespace
     Dir.chdir("test/data/namespace") do
       rake "copy"

data/test/test_filelist.rb

@@ -252,7 +252,7 @@ class TestFileList < Test::Unit::TestCase
       assert_match(/files\.egrep/, line)
       found = true
     end
-    assert found, "should have foudn a matching line"
+    assert found, "should have found a matching line"
   end
 
 

data/test/test_fileutils.rb

@@ -38,6 +38,13 @@ class TestFileUtils < Test::Unit::TestCase
     assert ! File.exist?("testdata/b")
   end
 
+  def test_ln
+    create_dir("testdata")
+    open("testdata/a", "w") { |f| f.puts "TEST_LN" }
+    RakeFileUtils.safe_ln("testdata/a", "testdata/b", :verbose => false)
+    assert_equal "TEST_LN\n", open("testdata/b") { |f| f.read }
+  end
+
   def test_verbose
     verbose true
     assert_equal true, verbose

data/test/test_pathmap.rb

@@ -0,0 +1,182 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'rake'
+
+# ====================================================================
+class TestPathMap < Test::Unit::TestCase
+
+  def test_returns_self_with_no_args
+    assert_equal "abc.rb", "abc.rb".pathmap
+  end
+
+  def test_s_returns_file_separator
+    sep = File::ALT_SEPARATOR || File::SEPARATOR
+    assert_equal sep, "abc.rb".pathmap("%s")
+    assert_equal "a#{sep}b", "a/b".pathmap("%d%s%f")
+  end
+
+  def test_b_returns_basename
+    assert_equal "abc.rb", "abc.rb".pathmap("%f")
+    assert_equal "abc.rb", "this/is/a/dir/abc.rb".pathmap("%f")
+    assert_equal "abc.rb", "/this/is/a/dir/abc.rb".pathmap("%f")
+  end
+
+  def test_B_returns_basename_without_extension
+    assert_equal "abc", "abc.rb".pathmap("%n")
+    assert_equal "abc", "abc".pathmap("%n") 
+    assert_equal "abc", "this/is/a/dir/abc.rb".pathmap("%n")
+    assert_equal "abc", "/this/is/a/dir/abc.rb".pathmap("%n")
+    assert_equal "abc", "/this/is/a/dir/abc".pathmap("%n")
+  end
+
+  def test_d_returns_dirname
+    assert_equal ".", "abc.rb".pathmap("%d")
+    assert_equal "/", "/abc".pathmap("%d")
+    assert_equal "this/is/a/dir", "this/is/a/dir/abc.rb".pathmap("%d")
+    assert_equal "/this/is/a/dir", "/this/is/a/dir/abc.rb".pathmap("%d")
+  end
+
+  def test_nnnd_returns_partial_dirname
+    assert_equal "this/is", "this/is/a/dir/abc.rb".pathmap("%2d")
+    assert_equal "this", "this/is/a/dir/abc.rb".pathmap("%1d")
+    assert_equal ".", "this/is/a/dir/abc.rb".pathmap("%0d")
+    assert_equal "dir", "this/is/a/dir/abc.rb".pathmap("%-1d")
+    assert_equal "a/dir", "this/is/a/dir/abc.rb".pathmap("%-2d")
+    assert_equal "this/is/a/dir", "this/is/a/dir/abc.rb".pathmap("%100d")
+    assert_equal "this/is/a/dir", "this/is/a/dir/abc.rb".pathmap("%-100d")
+  end
+
+  def test_pattern_returns_substitutions
+    assert_equal "bin/org/osb",
+      "src/org/osb/Xyz.java".pathmap("%{src,bin}d")
+  end
+
+  def test_pattern_can_use_backreferences
+    assert_equal "dir/hi/is", "dir/this/is".pathmap("%{t(hi)s,\\1}p")
+  end
+
+  def test_pattern_with_star_replacement_string_uses_block
+    assert_equal "src/ORG/osb",
+      "src/org/osb/Xyz.java".pathmap("%{/org,*}d") { |d| d.upcase }
+    assert_equal "Xyz.java",
+      "src/org/osb/Xyz.java".pathmap("%{.*,*}f") { |f| f.capitalize }
+  end
+
+  def test_pattern_with_no_replacement_nor_block_substitutes_empty_string
+    assert_equal "bc.rb", "abc.rb".pathmap("%{a}f")
+  end
+
+  def test_pattern_works_with_certain_valid_operators
+    assert_equal "dir/xbc.rb", "dir/abc.rb".pathmap("%{a,x}p")
+    assert_equal "d1r", "dir/abc.rb".pathmap("%{i,1}d")
+    assert_equal "xbc.rb", "dir/abc.rb".pathmap("%{a,x}f")
+    assert_equal ".Rb", "dir/abc.rb".pathmap("%{r,R}x")
+    assert_equal "xbc", "dir/abc.rb".pathmap("%{a,x}n")
+  end
+
+  def test_multiple_patterns
+    assert_equal "this/is/b/directory/abc.rb",
+      "this/is/a/dir/abc.rb".pathmap("%{a,b;dir,\\0ectory}p")
+  end
+
+  def test_partial_directory_selection_works_with_patterns
+    assert_equal "this/is/a/long",
+      "this/is/a/really/long/path/ok.rb".pathmap("%{/really/,/}5d")
+  end
+
+  def test_pattern_with_invalid_operator
+    ex = assert_raise(ArgumentError) do
+      "abc.xyz".pathmap("%{src,bin}z")
+    end
+    assert_match(/unknown.*pathmap.*spec.*z/i, ex.message)
+  end
+
+  def test_x_returns_extension
+    assert_equal "", "abc".pathmap("%x")
+    assert_equal ".rb", "abc.rb".pathmap("%x")
+    assert_equal ".rb", "abc.xyz.rb".pathmap("%x")
+    assert_equal "", ".depends".pathmap("%x")
+    assert_equal "", "dir/.depends".pathmap("%x")
+  end
+
+  def test_X_returns_everything_but_extension
+    assert_equal "abc", "abc".pathmap("%X")
+    assert_equal "abc", "abc.rb".pathmap("%X")
+    assert_equal "abc.xyz", "abc.xyz.rb".pathmap("%X")
+    assert_equal ".depends", ".depends".pathmap("%X")
+    assert_equal "a/dir/.depends", "a/dir/.depends".pathmap("%X")
+    assert_equal "/.depends", "/.depends".pathmap("%X")
+  end
+
+  def test_p_returns_entire_pathname
+    assert_equal "abc.rb", "abc.rb".pathmap("%p")
+    assert_equal "this/is/a/dir/abc.rb", "this/is/a/dir/abc.rb".pathmap("%p")
+    assert_equal "/this/is/a/dir/abc.rb", "/this/is/a/dir/abc.rb".pathmap("%p")
+  end
+
+  def test_percent_percent_returns_percent
+    assert_equal "a%b", "".pathmap("a%%b")
+  end
+
+  def test_undefined_percent_causes_error
+    ex = assert_raise(ArgumentError) {
+      "dir/abc.rb".pathmap("%z")
+    }
+  end
+
+  def test_works_with_windows_separators
+    if File::ALT_SEPARATOR
+      assert_equal "abc", 'dir\abc.rb'.pathmap("%n")
+      assert_equal 'this\is\a\dir',
+        'this\is\a\dir\abc.rb'.pathmap("%d")
+    end
+  end
+
+  def test_complex_patterns
+    sep = "".pathmap("%s")
+    assert_equal "dir/abc.rb", "dir/abc.rb".pathmap("%d/%n%x")
+    assert_equal "./abc.rb", "abc.rb".pathmap("%d/%n%x")
+    assert_equal "Your file extension is '.rb'",
+      "dir/abc.rb".pathmap("Your file extension is '%x'")
+    assert_equal "bin/org/onstepback/proj/A.class",
+      "src/org/onstepback/proj/A.java".pathmap("%{src,bin}d/%n.class")
+    assert_equal "src_work/bin/org/onstepback/proj/A.class",
+      "src_work/src/org/onstepback/proj/A.java".pathmap('%{\bsrc\b,bin}X.class')
+    assert_equal ".depends.bak", ".depends".pathmap("%X.bak")
+    assert_equal "d#{sep}a/b/c#{sep}file.txt", "a/b/c/d/file.txt".pathmap("%-1d%s%3d%s%f")
+  end
+end
+
+class TestPathMapExplode < Test::Unit::TestCase
+  def setup
+    String.class_eval { public :pathmap_explode }
+  end
+
+  def teardown
+    String.class_eval { protected :pathmap_explode }
+  end
+
+  def test_explode
+    assert_equal ['a'], 'a'.pathmap_explode
+    assert_equal ['a', 'b'], 'a/b'.pathmap_explode
+    assert_equal ['a', 'b', 'c'], 'a/b/c'.pathmap_explode
+    assert_equal ['/', 'a'], '/a'.pathmap_explode
+    assert_equal ['/', 'a', 'b'], '/a/b'.pathmap_explode
+    assert_equal ['/', 'a', 'b', 'c'], '/a/b/c'.pathmap_explode
+    if File::ALT_SEPARATOR
+      assert_equal ['c:.', 'a'], 'c:a'.pathmap_explode
+      assert_equal ['c:.', 'a', 'b'], 'c:a/b'.pathmap_explode
+      assert_equal ['c:.', 'a', 'b', 'c'], 'c:a/b/c'.pathmap_explode
+      assert_equal ['c:/', 'a'], 'c:/a'.pathmap_explode
+      assert_equal ['c:/', 'a', 'b'], 'c:/a/b'.pathmap_explode
+      assert_equal ['c:/', 'a', 'b', 'c'], 'c:/a/b/c'.pathmap_explode
+    end
+  end
+end
+
+class TestFileListPathMap < Test::Unit::TestCase
+  def test_file_list_supports_pathmap
+    assert_equal ['a', 'b'], FileList['dir/a.rb', 'dir/b.rb'].pathmap("%n")
+  end
+end

data/test/test_require.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'rake'
+
+# ====================================================================
+class TestRequire < Test::Unit::TestCase
+
+  def test_can_load_rake_library
+    app = Rake::Application.new
+    assert app.rake_require("test2", ['test/data/rakelib'], [])
+  end
+
+  def test_wont_reload_rake_library
+    app = Rake::Application.new
+    assert ! app.rake_require("test2", ['test/data/rakelib'], ['test2'])
+  end
+
+  def test_throws_error_if_library_not_found
+    app = Rake::Application.new
+    ex = assert_raise(LoadError) {
+      assert app.rake_require("testx", ['test/data/rakelib'], [])
+    }
+    assert_match(/x/, ex.message)
+  end
+end
+

data/test/test_rules.rb

@@ -178,6 +178,28 @@ class TestRules < Test::Unit::TestCase
     rm_r("testdata/src", :verbose=>false) rescue nil
   end
 
+  def test_proc_returning_lists_are_flattened_into_prereqs
+    ran = false
+    File.makedirs("testdata/flatten")
+    create_file("testdata/flatten/a.txt")
+    task 'testdata/flatten/b.data' do |t|
+      ran = true
+      touch t.name, :verbose => false
+    end
+    rule '.html' =>
+      proc { |fn|
+      [
+        fn.ext("txt"),
+        "testdata/flatten/b.data"
+      ]
+    } do |task|
+    end
+    Task['testdata/flatten/a.html'].invoke
+    assert ran, "Should have triggered flattened dependency"
+  ensure
+    rm_r("testdata/flatten", :verbose=>false) rescue nil
+  end
+
   def test_recursive_rules
     actions = []
     create_file("testdata/abc.xml")

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.8.11.8
 specification_version: 1
 name: rake
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2006-01-19 00:00:00 -05:00
+  version: 0.7.1
+date: 2006-04-03 00:00:00 -04:00
 summary: Ruby based make-like utility.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Jim Weirich
 files: 
@@ -62,7 +63,9 @@ files:
 - test/shellcommand.rb
 - test/test_tasks.rb
 - test/functional.rb
+- test/test_pathmap.rb
 - test/test_rake.rb
+- test/test_require.rb
 - test/test_makefile_loader.rb
 - test/test_test_task.rb
 - test/session_functional.rb
@@ -76,6 +79,7 @@ files:
 - test/test_namespace.rb
 - test/contrib/testsys.rb
 - test/data/rbext/rakefile.rb
+- test/data/rakelib/test1.rb
 - test/data/sample.mf
 - test/data/imports/deps.mf
 - test/data/default/Rakefile
@@ -102,6 +106,7 @@ files:
 - doc/release_notes/rake-0.5.3.rdoc
 - doc/release_notes/rake-0.4.15.rdoc
 - doc/release_notes/rake-0.6.0.rdoc
+- doc/release_notes/rake-0.7.1.rdoc
 - doc/release_notes/rake-0.5.0.rdoc
 - doc/release_notes/rake-0.5.4.rdoc
 - doc/release_notes/rake-0.7.0.rdoc
@@ -126,6 +131,7 @@ extra_rdoc_files:
 - doc/release_notes/rake-0.5.3.rdoc
 - doc/release_notes/rake-0.4.15.rdoc
 - doc/release_notes/rake-0.6.0.rdoc
+- doc/release_notes/rake-0.7.1.rdoc
 - doc/release_notes/rake-0.5.0.rdoc
 - doc/release_notes/rake-0.5.4.rdoc
 - doc/release_notes/rake-0.7.0.rdoc