rake 0.5.3 → 0.5.4

data/CHANGES

@@ -1,5 +1,11 @@
 = Rake Changelog
 
+== Version 0.5.4
+
+* Added double quotes to the test runner.
+* Added .svn to default ignore list.
+* Updated FileList#include to support nested arrays and filelists.
+
 == Version 0.5.3
 
 * Added support for importing Rakefile and other dependencies.

data/Rakefile

@@ -61,25 +61,26 @@ Rake::TestTask.new(:alltests) do |t|
     'test/contrib/test*.rb',
     'test/fun*.rb'
   ]
-  t.warning = true if t.respond_to? :warning
-  t.verbose = true
+  t.warning = true
+  t.verbose = false
 end
 
 Rake::TestTask.new(:unittests) do |t|
   t.test_files = FileList['test/test*.rb']
-  t.warning = true if t.respond_to? :warning
-  t.verbose = true
+  t.warning = true
+  t.verbose = false
 end
 
 Rake::TestTask.new(:funtests) do |t|
-  t.pattern = 'test/fun*.rb'
-  t.warning = true if t.respond_to? :warning
+  t.test_files = FileList['test/fun*.rb']
+  t.warning = true
+  t.warning = true
 end
 
 Rake::TestTask.new(:contribtests) do |t|
-  t.pattern = 'test/contrib/test*.rb'
-  t.verbose = true
-  t.warning = true if t.respond_to? :warning
+  t.test_files = FileList['test/contrib/test*.rb']
+  t.verbose = false
+  t.warning = true
 end
 
 directory 'testdata'

data/TAGS

@@ -0,0 +1,126 @@
+
+install.rb,12
+$ruby 7,68
+
+doc/jamis.rb,98
+        function toggleSource(toggleSource
194,2852
+        function openCode(openCode
222,3520
+
+lib/rake.rb,49
+RAKEVERSION 32,1333
+# define methods 652,18022
+
+lib/rake/clean.rb,14
+CLEAN 18,641
+
+lib/rake/tasklib.rb,0
+
+lib/rake/packagetask.rb,28
+    def initialize(72,2269
+
+lib/rake/rdoctask.rb,28
+    def initialize(68,2002
+
+lib/rake/runtest.rb,23
+  def run_tests(9,119
+
+lib/rake/testtask.rb,28
+    def test_files=73,2340
+
+lib/rake/gempackagetask.rb,29
+rescue NoMethodError 12,184
+
+lib/rake/ruby182_test_unit_fix.rb,31
+        def collect_file(6,83
+
+lib/rake/rake_test_loader.rb,0
+
+lib/rake/contrib/ftptools.rb,165
+    attr_reader :name,17,352
+    attr_reader :name, :size,17,352
+    attr_reader :name, :size, :owner,17,352
+    attr_reader :name, :size, :owner, :group,17,352
+
+lib/rake/contrib/sys.rb,16
+  RUBY 40,1674
+
+lib/rake/contrib/compositepublisher.rb,25
+      @publishers 8,130
+
+lib/rake/contrib/publisher.rb,17
+HostInfo 17,637
+
+lib/rake/contrib/rubyforgepublisher.rb,101
+    attr_reader :project,8,116
+    attr_reader :project, :proj_id,8,116
+    def initialize(10,163
+
+lib/rake/contrib/sshpublisher.rb,27
+    def initialize(10,180
+
+lib/rake/loaders/makefile.rb,20
+    def load(9,164
+
+test/filecreation.rb,31
+  def create_timed_files(6,59
+
+test/testclean.rb,70
+    assert Task[8,119
+    assert Task[9,167
+    assert Task[10,219
+
+test/testfilelist.rb,17
+  FileList 7,99
+
+test/testtasks.rb,165
+    arg 15,266
+    assert_equal 18,375
+    assert_equal t,22,490
+    runlist 27,563
+    t2 29,658
+    t2 39,1013
+    task :t1 223,6177
+    task :t1 224,6224
+
+test/testftp.rb,20
+    Date.new(9,121
+
+test/testfileutils.rb,315
+    create_file(12,195
+    assert_equal true,35,789
+    assert_equal false,37,838
+    verbose(38,870
+    assert_equal false,41,928
+    assert_equal true,46,1003
+    assert_equal false,48,1052
+    nowrite(49,1084
+    assert_equal false,52,1142
+    verbose(56,1195
+    assert true,57,1245
+    ENV[61,1320
+
+test/shellcommand.rb,0
+
+test/testpackagetask.rb,15
+    pkg 8,132
+
+test/functional.rb,21
+      @debug 21,466
+
+test/testtesttask.rb,15
+    ENV[9,135
+
+test/test_makefile_loader.rb,19
+    loader 10,170
+
+test/contrib/testsys.rb,154
+    assert_equal 40,955
+    assert_equal 41,998
+    assert_equal 42,1043
+    assert_equal 43,1086
+    assert_equal 44,1136
+    assert_equal 45,1192
+
+test/data/rbext/rakefile.rb,0
+
+bin/rake,0

data/doc/rakefile.rdoc

@@ -163,6 +163,39 @@ The following rule might be used for Java files ...
 <b>NOTE:</b> +java_compile+ is a hypothetical method that invokes the
 java compiler.
 
+== Importing Dependencies
+
+Any ruby file (including other rakefiles) can be included with a
+standard Ruby +require+ command.  The rules and declarations in the
+required file are just added to the definitions already accumulated.
+
+Because the files are loaded _before_ the rake targets are evaluated,
+the loaded files must be "ready to go" when the rake command is
+invoked.  This make generated dependency files difficult to use.  By
+the time rake gets around to updating the dependencies file, it is too
+late to load it.
+
+The +import+ command addresses this by specifying a file to be loaded
+_after_ the main rakefile is loaded, but _before_ any targets on the
+command line are specified.  In addition, if the file name matches an
+explicit task, that task is invoked before loading the file.  This
+allows dependency files to be generated and used in a single rake
+command invocation.
+
+=== Example:
+
+  require 'rake/loaders/makefile'
+
+  file ".depends.mf" => [SRC_LIST] do |t|
+    sh "makedepend -f- -- #{CFLAGS} -- #{t.prerequisites} > #{t.name}"
+  end
+
+  import ".depends.mf"
+
+If ".depends" does not exist, or is out of date w.r.t. the source
+files, a new ".depends" file is generated using +makedepend+ before
+loading.
+
 == Comments
 
 Standard Ruby comments (beginning with "#") can be used anywhere it is
@@ -170,7 +203,7 @@ legal in Ruby source code, including comments for tasks and rules.
 However, if you wish a task to be described using the "-T" switch,
 then you need to use the +desc+ command to describe the task.
 
-Example:
+=== Example:
 
   desc "Create a distribution package"
   task :package => [ ... ] do ... end

data/doc/release_notes/rake-0.5.3.rdoc

@@ -0,0 +1,78 @@
+= Rake 0.5.0 Released
+
+Although it has only been two weeks since the last release, we have
+enough updates to the Rake program to make it time for another
+release.
+
+== Changes
+
+Here are the changes for version 0.5.3 ...
+
+* FileLists have been extensively changed so that they mimic the
+  behavior of real arrays even more closely.  In particular,
+  operations on FileLists that return a new collection (e.g. collect,
+  reject) will now return a FileList rather than an array.  In
+  addition, several places where FileLists were not properly expanded
+  before use have been fixed.
+
+* A method (+ext+) to simplify the handling of file extensions was
+  added to String and to Array.
+
+* The 'testrb' script in test/unit tends to silently swallow syntax
+  errors in test suites.  Because of that, the default test loader is
+  now a rake-provided script.  You can still use 'testrb' by setting
+  the loader flag in the test task to :testrb.  (See the API documents
+  for TestTask for all the loader flag values).
+
+* FileUtil methods (e.g. cp, mv, install) are now declared to be
+  private.  This will cut down on the interference with user defined
+  methods of the same name.
+
+* Fixed the verbose flag in the TestTask so that the test code is
+  controlled by the flag.  Also shortened up some failure messages.
+  (Thanks to Tobias Luetke for the suggestion).
+
+* Rules will now properly detect a task that can generate a source
+  file.  Previously rules would only consider source files that were
+  already present.
+
+* Added an +import+ command that allows Rake to dynamically import
+  dependendencies into a running Rake session.  The +import+ command
+  can run tasks to update the dependency file before loading them.
+  Dependency files can be in rake or make format, allowing rake to
+  work with tools designed to generate dependencies for make.
+
+== 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.
+Thanks to ...
+
+* Brian Gernhardt for the rules fix (especially for the patience to
+  explain the problem to me until I got what he was talking about).
+* Stefan Lang for pointing out problems in the dark corners of the
+  FileList implementation.
+* Alexey Verkhovsky pointing out the silently swallows syntax errors
+  in tests.
+* Tobias Luetke for beautifying the test task output.
+* Sam Roberts for some of the ideas behind dependency loading.
+
+-- Jim Weirich
+

data/doc/release_notes/rake-0.5.4.rdoc

@@ -0,0 +1,46 @@
+= Rake 0.5.4 Released
+
+Time for some minor bug fixes and small enhancements
+
+== Changes
+
+Here are the changes for version 0.5.3 ...
+
+* Added double quotes to the test runner.  This allows the location of
+  the tests (and runner) to be in a directory path that contains
+  spaces (e.g. "C:/Program Files/ruby/bin").
+
+* Added .svn to default ignore list.  Now subversion project metadata
+  is automatically ignored by Rake's FileList.
+
+* Updated FileList#include to support nested arrays and filelists.
+  FileLists are flat lists of file names.  Using a FileList in an
+  include will flatten out the nested file names.
+
+== 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.
+Thanks to ...
+
+* Tilman Sauerbeck for the nested FileList suggestion.
+* Josh Knowles for pointing out the spaces in directory name problem.
+
+-- 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.5.3'
+RAKEVERSION = '0.5.4'
 
 require 'rbconfig'
 require 'ftools'
@@ -651,13 +651,8 @@ end
 # module, but mark them private so that they don't unintentionally
 # define methods on other objects.
 
-file_utils_methods = (FileUtils.methods - Object.methods)
 include RakeFileUtils
-
-file_utils_methods.each do |name|
-  private name.to_sym
-end
-file_utils_methods = nil
+private(*FileUtils.instance_methods(false))
 
 ######################################################################
 module Rake
@@ -789,7 +784,13 @@ module Rake
     #
     def include(*filenames)
       # TODO: check for pending
-      filenames.each do |fn| @pending_add << fn end
+      filenames.each do |fn|
+	if fn.respond_to? :to_ary
+	  include(*fn.to_ary)
+	else
+	  @pending_add << fn
+	end
+      end
       @pending = true
       self
     end
@@ -994,6 +995,7 @@ module Rake
 
     DEFAULT_IGNORE_PATTERNS = [
       /(^|[\/\\])CVS([\/\\]|$)/,
+      /(^|[\/\\])\.svn([\/\\]|$)/,
       /\.bak$/,
       /~$/,
       /(^|[\/\\])core$/
@@ -1016,6 +1018,7 @@ module Rake
       # Set the ignore patterns back to the default value.  The
       # default patterns will ignore files 
       # * containing "CVS" in the file path
+      # * containing ".svn" in the file path
       # * ending with ".bak"
       # * ending with "~"
       # * named "core"

data/lib/rake/testtask.rb

@@ -106,8 +106,8 @@ module Rake
 	    when :rake
 	      rake_loader
 	    end
-	  ruby "-I#{lib_path} #{warning_flag}#{run_code} " +
-	    file_list.join(' ') +
+	  ruby "-I#{lib_path} #{warning_flag}\"#{run_code}\" " +
+	    file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
 	    " #{option_list}"
 	end
       end

data/test/testfilelist.rb

@@ -36,6 +36,23 @@ class TestFileList < Test::Unit::TestCase
       fl.sort
   end
 
+  def test_create_with_brackets_and_filelist
+    fl = FileList[FileList["testdata/*.c", "x"]]
+    assert_equal ["testdata/abc.c", "testdata/x.c", "testdata/xyz.c", "x"].sort,
+      fl.sort
+  end
+
+  def test_include_with_another_array
+    fl = FileList.new.include(["x", "y", "z"])
+    assert_equal ["x", "y", "z"].sort, fl.sort
+  end
+
+  def test_include_with_another_filelist
+    fl = FileList.new.include(FileList["testdata/*.c", "x"])
+    assert_equal ["testdata/abc.c", "testdata/x.c", "testdata/xyz.c", "x"].sort,
+      fl.sort
+  end
+
   def test_append
     fl = FileList.new
     fl << "a.rb" << "b.rb"
@@ -227,6 +244,7 @@ class TestFileList < Test::Unit::TestCase
   def test_ignore_special
     f = FileList['testdata/*']
     assert ! f.include?("testdata/CVS"), "Should not contain CVS"
+    assert ! f.include?("testdata/.svn"), "Should not contain .svn"
     assert ! f.include?("testdata/.dummy"), "Should not contain dot files"
     assert ! f.include?("testdata/x.bak"), "Should not contain .bak files"
     assert ! f.include?("testdata/x~"), "Should not contain ~ files"
@@ -234,11 +252,12 @@ class TestFileList < Test::Unit::TestCase
   end
 
   def test_clear_ignore_patterns
-    f = FileList['testdata/*']
+    f = FileList['testdata/*', 'testdata/.svn']
     f.clear_exclude
     assert f.include?("testdata/abc.c")
     assert f.include?("testdata/xyz.c")
     assert f.include?("testdata/CVS")
+    assert f.include?("testdata/.svn")
     assert f.include?("testdata/x.bak")
     assert f.include?("testdata/x~")
   end
@@ -247,6 +266,8 @@ class TestFileList < Test::Unit::TestCase
     fl = FileList.new
     assert fl.exclude?("x/CVS/y")
     assert fl.exclude?("x\\CVS\\y")
+    assert fl.exclude?("x/.svn/y")
+    assert fl.exclude?("x\\.svn\\y")
     assert fl.exclude?("x/core")
     assert fl.exclude?("x\\core")
   end
@@ -256,6 +277,8 @@ class TestFileList < Test::Unit::TestCase
     fl.exclude(/~\d+$/)
     assert fl.exclude?("x/CVS/y")
     assert fl.exclude?("x\\CVS\\y")
+    assert fl.exclude?("x/.svn/y")
+    assert fl.exclude?("x\\.svn\\y")
     assert fl.exclude?("x/core")
     assert fl.exclude?("x\\core")
     assert fl.exclude?("x/abc~1")
@@ -427,6 +450,7 @@ class TestFileList < Test::Unit::TestCase
     verbose(false) do
       mkdir "testdata" unless File.exist? "testdata"
       mkdir "testdata/CVS" rescue nil
+      mkdir "testdata/.svn" rescue nil
       touch "testdata/.dummy"
       touch "testdata/x.bak"
       touch "testdata/x~"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10.1
 specification_version: 1
 name: rake
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
-date: 2005-04-09
+  version: 0.5.4
+date: 2005-04-30
 summary: Ruby based make-like utility.
 require_paths: 
   - lib
@@ -32,6 +32,7 @@ files:
   - README
   - Rakefile
   - TODO
+  - TAGS
   - MIT-LICENSE
   - bin/rake
   - lib/rake.rb
@@ -78,8 +79,10 @@ files:
   - doc/example/b.c
   - doc/example/main.c
   - doc/release_notes/rake-0.4.14.rdoc
+  - doc/release_notes/rake-0.5.3.rdoc
   - doc/release_notes/rake-0.4.15.rdoc
   - doc/release_notes/rake-0.5.0.rdoc
+  - doc/release_notes/rake-0.5.4.rdoc
 test_files: []
 rdoc_options: 
   - "--title"
@@ -97,8 +100,10 @@ extra_rdoc_files:
   - doc/rational.rdoc
   - doc/rakefile.rdoc
   - doc/release_notes/rake-0.4.14.rdoc
+  - doc/release_notes/rake-0.5.3.rdoc
   - doc/release_notes/rake-0.4.15.rdoc
   - doc/release_notes/rake-0.5.0.rdoc
+  - doc/release_notes/rake-0.5.4.rdoc
 executables: 
   - rake
 extensions: []