rake 0.7.3 → 0.8.0

data/CHANGES

@@ -1,6 +1,20 @@
 = Rake Changelog
 
-== Pre-version 0.7.3
+== Pre-Version 0.7.4
+
+* Added task parameters (e.g. "rake build[version7]")
+* Made task parameters passable to prerequisites.
+* The 'desc' command will now document task argument names.
+* Comments are limited to 80 columns or so (suggested by Jamis Buck).
+* Added -D to display full comments (suggested by Jamis Buck).
+* The rake program will set the status value used in any explicit
+  exit(n) calls. (patch provided by Stephen Touset)
+* Fixed error in functional tests that were not including session (and
+  silently skipping the functionl tests.
+* Removed --usage and make -h the same as -H.
+* Make a prettier inspect for tasks.
+
+== Version 0.7.3
 
 * Added existing and existing! methods to FileList
 * FileLists now claim to be Arrays (via is_a?) to get better support

data/Rakefile

@@ -23,7 +23,7 @@ CLOBBER.include('test/data/chains/play.*')
 CLOBBER.include('test/data/file_creation_task/build')
 CLOBBER.include('test/data/file_creation_task/src')
 CLOBBER.include('TAGS')
-CLOBBER.include('coverage')
+CLOBBER.include('coverage', 'rcov_aggregate')
 
 def announce(msg='')
   STDERR.puts msg
@@ -37,11 +37,7 @@ else
   CURRENT_VERSION = "0.0.0"
 end
 
-if ENV['REL']
-  PKG_VERSION = ENV['REL']
-else
-  PKG_VERSION = CURRENT_VERSION
-end
+$package_version = CURRENT_VERSION
 
 SRC_RB = FileList['lib/**/*.rb']
 
@@ -51,6 +47,9 @@ desc "Default Task"
 task :default => :test_all
 
 # Test Tasks ---------------------------------------------------------
+task :dbg do |t|
+  puts "Arguments are: #{t.args.join(', ')}"
+end
 
 # Common Abbreviations ...
 
@@ -79,13 +78,13 @@ end
 Rake::TestTask.new(:test_functional) do |t|
   t.test_files = FileList['test/fun*.rb']
   t.warning = true
-  t.warning = true
+  t.verbose = false
 end
 
 Rake::TestTask.new(:test_contribs) do |t|
   t.test_files = FileList['test/contrib/test*.rb']
-  t.verbose = false
   t.warning = true
+  t.verbose = false
 end
 
 begin
@@ -93,15 +92,17 @@ begin
 
   Rcov::RcovTask.new do |t|
     t.libs << "test"
-    t.rcov_opts = ['-xRakefile', '-xrakefile', '-xpublish.rf', '--text-report']
+    t.rcov_opts = [
+      '-xRakefile', '-xrakefile', '-xpublish.rf', '--text-report',
+    ]
     t.test_files = FileList[
-      'test/test*.rb',
-      'test/contrib/test*.rb'
+      'test/test*.rb', 'test/functional.rb'
     ]
+    t.output_dir = 'coverage'
     t.verbose = true
   end
 rescue LoadError
-  # No rcov available
+  puts "RCov is not available"
 end
 
 directory 'testdata'
@@ -160,7 +161,7 @@ else
     #### Basic information.
 
     s.name = 'rake'
-    s.version = PKG_VERSION
+    s.version = $package_version
     s.summary = "Ruby based make-like utility."
     s.description = <<-EOF
       Rake is a Make-like program implemented in Ruby. Tasks
@@ -246,12 +247,6 @@ task :lines do
   show_line("TOTAL", total_lines, total_code)
 end
 
-ARCHIVEDIR = '/mnt/usb'
-
-task :archive => [:package] do
-  cp FileList["pkg/*.tgz", "pkg/*.zip", "pkg/*.gem"], ARCHIVEDIR
-end
-
 # Define an optional publish target in an external file.  If the
 # publish.rf file is not found, the publish targets won't be defined.
 
@@ -259,86 +254,108 @@ load "publish.rf" if File.exist? "publish.rf"
 
 # Support Tasks ------------------------------------------------------
 
+RUBY_FILES = FileList['**/*.rb'].exclude('pkg')
+
 desc "Look for TODO and FIXME tags in the code"
 task :todo do
-  FileList['**/*.rb'].exclude('pkg').egrep(/#.*(FIXME|TODO|TBD)/)
+  RUBY_FILES.egrep(/#.*(FIXME|TODO|TBD)/)
 end
 
 desc "Look for Debugging print lines"
 task :dbg do
-  FileList['**/*.rb'].egrep(/\bDBG|\bbreakpoint\b/)
+  RUBY_FILES.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$)/ }
+  puts RUBY_FILES
+  puts FileList['bin/*'].exclude('bin/*.rb')
 end
 task :rf => :rubyfiles
 
+desc "Create a TAGS file"
+task :tags => "TAGS"
+
+TAGS = 'xctags -e'
+
+file "TAGS" => RUBY_FILES do
+  puts "Makings TAGS"
+  sh "#{TAGS} #{RUBY_FILES}", :verbose => false
+end
+
 # --------------------------------------------------------------------
 # Creating a release
 
+def plugin(plugin_name)
+  require "rake/plugins/#{plugin_name}"
+end
+
+task :noop
+#plugin "release_manager"
+
 desc "Make a new release"
-task :release => [
-  :prerelease,
-  :clobber,
-  :test_all,
-  :update_version,
-  :package,
-  :tag] do
-  
+task :release, :rel, :reuse, :reltest,
+  :needs => [
+    :prerelease,
+    :clobber,
+    :test_all,
+    :update_version,
+    :package,
+    :tag
+  ] do
   announce 
   announce "**************************************************************"
-  announce "* Release #{PKG_VERSION} Complete."
+  announce "* Release #{$package_version} Complete."
   announce "* Packages ready to upload."
   announce "**************************************************************"
   announce 
 end
 
 # Validate that everything is ready to go for a release.
-task :prerelease do
+task :prerelease, :rel, :reuse, :reltest do |t, args|
+  $package_version = args.rel
   announce 
   announce "**************************************************************"
-  announce "* Making RubyGem Release #{PKG_VERSION}"
+  announce "* Making RubyGem Release #{$package_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]"
+  unless args.rel
+    fail "Usage: rake release[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"
+  if $package_version == CURRENT_VERSION && ! args.reuse
+    fail "Current version is #{$package_version}, must specify REUSE=tag_suffix to reuse version"
   end
 
   # Are all source files checked in?
-  if ENV['RELTEST']
+  if args.reltest
     announce "Release Task Testing, skipping checked-in file test"
   else
     announce "Checking for unchecked-in files..."
-    data = `cvs -q update`
+    data = `svn st`
     unless data =~ /^$/
-      fail "CVS update is not clean ... do you have unchecked-in files?"
+      abort "svn status 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
+task :update_version, :rel, :reuse, :reltest,
+  :needs => [:prerelease] do |t, args|
+  if args.rel == CURRENT_VERSION
     announce "No version change ... skipping version update"
   else
-    announce "Updating Rake version to #{PKG_VERSION}"
+    announce "Updating Rake version to #{args.rel}"
     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}'"
+	    rakeout.puts "RAKEVERSION = '#{args.rel}'"
 	  else
 	    rakeout.puts line
 	  end
@@ -346,23 +363,24 @@ task :update_version => [:prerelease] do
       end
     end
     mv "lib/rake.rb.new", "lib/rake.rb"
-    if ENV['RELTEST']
+    if args.reltest
       announce "Release Task Testing, skipping commiting of new version"
     else
-      sh %{cvs commit -m "Updated to version #{PKG_VERSION}" lib/rake.rb} # "
+      sh %{svn commit -m "Updated to version #{args.rel}" 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']
+task :tag, :rel, :reuse, :reltest,
+  :needs => [:prerelease] do |t, args|
+  reltag = "REL_#{args.rel.gsub(/\./, '_')}"
+  reltag << args.reuse.gsub(/\./, '_') if args.reuse
+  announce "Tagging Repository with [#{reltag}]"
+  if args.reltest
     announce "Release Task Testing, skipping CVS tagging"
   else
-    sh %{cvs tag #{reltag}}
+    sh %{svn copy svn+ssh://rubyforge.org/var/svn/rake/trunk svn+ssh://rubyforge.org/var/svn/rake/tags/#{reltag} -m 'Commiting release #{reltag}'} ###'
   end
 end
 
@@ -378,6 +396,7 @@ end
 
 load 'xforge.rf' if File.exist?('xforge.rf')
 
+desc "Where is the current directory.  This task displays\nthe current rake directory"
 task :where_am_i do
   puts Rake.original_dir
 end

data/TODO

@@ -4,6 +4,7 @@ Send suggestions for this list to mailto:jim@weirichhouse.org or on
 the rake-devel@rubyforge.org mailing list.
 
 === To Do
+* Need a nice API for accessing tasks in namespaces, namespaces in an app, etc.
 * Provide a way to disable -w warning mode.
 * Define a set of default rules that work in the absense of any Rakefile
 * What about cyclic dependencies?

data/bin/rake

@@ -1,3 +1,27 @@
+#!/usr/bin/env ruby
+
+#--
+# Copyright (c) 2003, 2004, 2005, 2006, 2007  Jim Weirich
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#++
+
 begin
   require 'rake'
 rescue LoadError

data/lib/rake.rb

@@ -2,7 +2,7 @@
 
 #--
 
-# Copyright (c) 2003, 2004, 2005, 2006 Jim Weirich
+# Copyright (c) 2003, 2004, 2005, 2006, 2007  Jim Weirich
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -24,12 +24,12 @@
 #++
 #
 # = Rake -- Ruby Make
-#      
+#
 # This is the main file for the Rake application.  Normally it is referenced
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.7.3'
+RAKEVERSION = '0.8.0'
 
 require 'rbconfig'
 require 'ftools'
@@ -43,7 +43,6 @@ require 'ostruct'
 # Rake extensions to Module.
 #
 class Module
-
   # Check for an existing method in the current class before extending.  IF
   # the method already exists, then a warning is printed and the extension is
   # not added.  Otherwise the block is yielded and any definitions in the
@@ -60,13 +59,13 @@ class Module
   #   end
   #
   def rake_extension(method)
-    if instance_methods.include?(method)
+    if instance_methods.include?(method.to_s) || instance_methods.include?(method.to_sym)
       $stderr.puts "WARNING: Possible conflict with Rake extension: #{self}##{method} already exists"
     else
       yield
     end
   end
-end
+end # module Module
 
 
 ######################################################################
@@ -103,23 +102,19 @@ class String
     # 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
+      dirs = File.dirname(self).pathmap_explode
+      partial_dirs =
+        if n > 0
+          dirs[0...n]
+        elsif n < 0
+          dirs.reverse[0...-n].reverse
         else
-          File.join(partial)
+          "."
         end
-      else
-        "."
-      end
+      File.join(partial_dirs)
     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)
@@ -143,7 +138,7 @@ class String
     # controls the details of the mapping.  The following special patterns are
     # recognized:
     #
-    # * <b>%p</b> -- The complete path.   
+    # * <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.
@@ -178,10 +173,10 @@ class String
     # excluded from both the pattern and replacement text (let's keep parsing
     # reasonable).
     #
-    # For example: 
+    # For example:
     #
     #    "src/org/onestepback/proj/A.java".pathmap("%{^src,bin}X.class")
-    #  
+    #
     # returns:
     #
     #    "bin/org/onestepback/proj/A.class"
@@ -213,7 +208,7 @@ class String
         when '%x'
           result << $1 if self =~ /[^\/](\.[^.]+)$/
         when '%X'
-          if self =~ /^(.+[^\/])(\.[^.]+)$/
+          if self =~ /^(.*[^\/])(\.[^.]+)$/
             result << $1
           else
             result << self
@@ -240,7 +235,7 @@ class String
       result
     end
   end
-end
+end # class String
 
 ##############################################################################
 module Rake
@@ -283,7 +278,122 @@ module Rake
     end
     alias dup clone
   end
-end
+
+  ####################################################################
+  # TaskAguments manage the arguments passed to a task.
+  #
+  class TaskArguments
+    include Enumerable
+
+    attr_reader :names
+
+    def initialize(names, values, parent=nil)
+      @names = names
+      @parent = parent
+      @hash = {}
+      names.each_with_index { |name, i|
+        @hash[name.to_sym] = values[i]
+      }
+    end
+
+    # Create a new argument scope using the prerequisite argument
+    # names.
+    def new_scope(names)
+      values = names.collect { |n| self[n] }
+      self.class.new(names, values, self)
+    end
+
+    # Find an argument value by name or index.
+    def [](index)
+      lookup(index.to_sym)
+    end
+
+    def each(&block)
+      @hash.each(&block)
+    end
+
+    def method_missing(sym, *args, &block)
+      lookup(sym.to_sym)
+    end
+
+    def to_hash
+      @hash
+    end
+
+    def to_s
+      @hash.inspect
+    end
+
+    def inspect
+      to_s
+    end
+    
+    protected
+    
+    def lookup(name)
+      if @hash.has_key?(name)
+        @hash[name]
+      elsif ENV.has_key?(name.to_s)
+        ENV[name.to_s]
+      elsif ENV.has_key?(name.to_s.upcase)
+        ENV[name.to_s.upcase]
+      elsif @parent
+        @parent.lookup(name)
+      end
+    end
+  end
+
+  ####################################################################
+  # InvocationChain tracks the chain of task invocations to detect
+  # circular dependencies.
+  class InvocationChain
+    def initialize(value, tail)
+      @value = value
+      @tail = tail
+    end
+
+    def member?(obj)
+      @value == obj || @tail.member?(obj)
+    end
+
+    def append(value)
+      if member?(value)
+        fail RuntimeError, "Circular dependency detected: #{to_s} => #{value}"
+      end
+      self.class.new(value, self)
+    end
+
+    def to_s
+      "#{prefix}#{@value}"
+    end
+
+    def self.append(value, chain)
+      chain.append(value)
+    end
+
+    private
+
+    def prefix
+      "#{@tail.to_s} => "
+    end
+
+    class EmptyInvocationChain
+      def member?(obj)
+        false
+      end
+      def append(value)
+        InvocationChain.new(value, self)
+      end
+      def to_s
+        "TOP"
+      end
+    end
+
+    EMPTY = EmptyInvocationChain.new
+
+  end # class InvocationChain
+
+end # module Rake
 
 module Rake
 
@@ -302,10 +412,14 @@ module Rake
 
     # Application owning this task.
     attr_accessor :application
-    
-    # Comment for this task.
-    attr_accessor :comment
-    
+
+    # Comment for this task.  Restricted to a single line of no more than 50
+    # characters.
+    attr_reader :comment
+
+    # Full text of the (possibly multi-line) comment.
+    attr_reader :full_comment
+
     # Array of nested namespaces names used for task lookup by this task.
     attr_reader :scope
 
@@ -313,7 +427,11 @@ module Rake
     def to_s
       name
     end
-    
+
+    def inspect
+      "<#{self.class} #{name} => [#{prerequisites.join(', ')}]>"
+    end
+
     # List of sources for task.
     attr_writer :sources
     def sources
@@ -324,7 +442,7 @@ module Rake
     def source
       @sources.first if defined?(@sources)
     end
-    
+
     # Create a task named +task_name+ with no actions or prerequisites. Use
     # +enhance+ to add actions and prerequisites.
     def initialize(task_name, app)
@@ -332,41 +450,73 @@ module Rake
       @prerequisites = FileList[]
       @actions = []
       @already_invoked = false
+      @full_comment = nil
       @comment = nil
       @lock = Mutex.new
       @application = app
       @scope = app.current_scope
+      @arg_names = nil
     end
-    
+
     # Enhance a task with prerequisites or actions.  Returns self.
     def enhance(deps=nil, &block)
       @prerequisites |= deps if deps
       @actions << block if block_given?
       self
     end
-    
+
     # Name of the task, including any namespace qualifiers.
     def name
       @name.to_s
     end
-    
+
+    # Name of task with argument list description.
+    def name_with_args # :nodoc:
+      if arg_description
+        "#{name}#{arg_description}"
+      else
+        name
+      end
+    end
+
+    # Argument description (nil if none).
+    def arg_description # :nodoc:
+      @arg_names ? "[#{(arg_names || []).join(',')}]" : nil
+    end
+
+    # Name of arguments for this task.
+    def arg_names
+      @arg_names || []
+    end
+
     # Invoke the task if it is needed.  Prerequites are invoked first.
-    def invoke
+    def invoke(*args)
+      task_args = TaskArguments.new(arg_names, args)
+      invoke_with_call_chain(task_args, InvocationChain::EMPTY)
+    end
+
+    # Same as invoke, but explicitly pass a call chain to detect
+    # circular dependencies.
+    def invoke_with_call_chain(task_args, invocation_chain)
+      new_chain = InvocationChain.append(self, invocation_chain)
       @lock.synchronize do
         if application.options.trace
           puts "** Invoke #{name} #{format_trace_flags}"
         end
         return if @already_invoked
         @already_invoked = true
-        invoke_prerequisites
-        execute if needed?
+        invoke_prerequisites(task_args, new_chain)
+        execute(task_args) if needed?
       end
     end
+    protected :invoke_with_call_chain
 
     # Invoke all the prerequisites of a task.
-    def invoke_prerequisites
+    def invoke_prerequisites(task_args, invocation_chain)
       @prerequisites.each { |n|
-        application[n, @scope].invoke
+        prereq = application[n, @scope]
+        prereq_args = task_args.new_scope(prereq.arg_names)
+        prereq.invoke_with_call_chain(prereq_args, invocation_chain)
       }
     end
 
@@ -378,9 +528,9 @@ module Rake
       flags.empty? ? "" : "(" + flags.join(", ") + ")"
     end
     private :format_trace_flags
-    
+
     # Execute the actions associated with this task.
-    def execute
+    def execute(args)
       if application.options.dryrun
         puts "** Execute (dry run) #{name}"
         return
@@ -389,37 +539,68 @@ module Rake
         puts "** Execute #{name}"
       end
       application.enhance_with_matching_rule(name) if @actions.empty?
-      @actions.each { |act| result = act.call(self) }
+      @actions.each do |act|
+        case act.arity
+        when 1
+          act.call(self)
+        else
+          act.call(self, args)
+        end
+      end
     end
-    
+
     # Is this task needed?
     def needed?
       true
     end
-    
+
     # Timestamp for this task.  Basic tasks return the current time for their
     # time stamp.  Other tasks can be more sophisticated.
     def timestamp
       @prerequisites.collect { |p| application[p].timestamp }.max || Time.now
     end
-    
+
+    # Add a description to the task.  The description can consist of an option
+    # argument list (enclosed brackets) and an optional comment.
+    def add_description(description)
+      return if ! description
+      comment = description.strip
+      add_comment(comment) if comment && ! comment.empty?
+    end
+
+    # Writing to the comment attribute is the same as adding a description.
+    def comment=(description)
+      add_description(description)
+    end
+
     # Add a comment to the task.  If a comment alread exists, separate
     # the new comment with " / ".
     def add_comment(comment)
-      return if ! comment
-      if @comment 
-        @comment << " / "
+      if @full_comment
+        @full_comment << " / "
+      else
+        @full_comment = ''
+      end
+      @full_comment << comment
+      if @full_comment =~ /\A([^.]+?\.)( |$)/
+        @comment = $1
       else
-        @comment = ''
+        @comment = @full_comment
       end
-      @comment << comment
     end
-    
+    private :add_comment
+
+    # Set the names of the arguments for this task. +args+ should be
+    # an array of symbols, one for each argument name.
+    def set_arg_names(args)
+      @arg_names = args.map { |a| a.to_sym }
+    end
+
     # Return a string describing the internal state of a task.  Useful for
     # debugging.
     def investigation
       result = "------------------------------\n"
-      result << "Investigating #{name}\n" 
+      result << "Investigating #{name}\n"
       result << "class: #{self.class}\n"
       result <<  "task needed: #{needed?}\n"
       result <<  "timestamp: #{timestamp}\n"
@@ -434,23 +615,23 @@ module Rake
       result << "................................\n\n"
       return result
     end
-    
+
     # ----------------------------------------------------------------
     # Rake Module Methods
-    #    
+    #
     class << self
-      
+
       # Clear the task list.  This cause rake to immediately forget all the
       # tasks that have been assigned.  (Normally used in the unit tests.)
       def clear
         Rake.application.clear
       end
-      
+
       # List of all defined tasks.
       def tasks
         Rake.application.tasks
       end
-      
+
       # Return a task with the given name.  If the task is not currently
       # known, try to synthesize one from the defined rules.  If no rules are
       # found, but an existing file matches the task name, assume it is a file
@@ -458,22 +639,22 @@ module Rake
       def [](task_name)
         Rake.application[task_name]
       end
-      
+
       # TRUE if the task name is already defined.
       def task_defined?(task_name)
         Rake.application.lookup(task_name) != nil
       end
-      
+
       # Define a task given +args+ and an option block.  If a rule with the
       # given name already exists, the prerequisites and actions are added to
       # the existing task.  Returns the defined task.
-      def define_task(args, &block)
-        Rake.application.define_task(self, args, &block)
+      def define_task(*args, &block)
+        Rake.application.define_task(self, *args, &block)
       end
-      
-      # Define a rule for synthesizing tasks.  
-      def create_rule(args, &block)
-        Rake.application.create_rule(args, &block)
+
+      # Define a rule for synthesizing tasks.
+      def create_rule(*args, &block)
+        Rake.application.create_rule(*args, &block)
       end
 
       # Apply the scope to the task name according to the rules for
@@ -483,10 +664,10 @@ module Rake
         (scope + [task_name]).join(':')
       end
 
-    end
-  end
-  
-  
+    end # class << Rake::Task
+  end # class Rake::Task
+
+
   # #########################################################################
   # A FileTask is a task that includes time based dependencies.  If any of a
   # FileTask's prerequisites have a timestamp that is later than the file
@@ -494,7 +675,7 @@ module Rake
   # supplied actions).
   #
   class FileTask < Task
-    
+
     # Is this file task needed?  Yes if it doesn't exist, or if its time stamp
     # is out of date.
     def needed?
@@ -502,7 +683,7 @@ module Rake
       return true if out_of_date?(timestamp)
       false
     end
-    
+
     # Time stamp for file task.
     def timestamp
       if File.exist?(name)
@@ -529,8 +710,8 @@ module Rake
         task_name
       end
     end
-  end
-  
+  end # class Rake::FileTask
+
   # #########################################################################
   # A FileCreationTask is a file task that when used as a dependency will be
   # needed if and only if the file has not been created.  Once created, it is
@@ -542,7 +723,7 @@ module Rake
     def needed?
       ! File.exist?(name)
     end
-    
+
     # Time stamp for file creation task.  This time stamp is earlier
     # than any other time stamp.
     def timestamp
@@ -555,14 +736,14 @@ module Rake
   # parallel using Ruby threads.
   #
   class MultiTask < Task
-    def invoke_prerequisites
+    def invoke_prerequisites(args, invocation_chain)
       threads = @prerequisites.collect { |p|
-        Thread.new(p) { |r| application[r].invoke }
+        Thread.new(p) { |r| application[r].invoke_with_call_chain(args, invocation_chain) }
       }
       threads.each { |t| t.join }
     end
   end
-end
+end # module Rake
 
 # ###########################################################################
 # Task Definition Functions ...
@@ -574,8 +755,8 @@ end
 #     rm_rf "html"
 #   end
 #
-def task(args, &block)
-  Rake::Task.define_task(args, &block)
+def task(*args, &block)
+  Rake::Task.define_task(*args, &block)
 end
 
 
@@ -648,8 +829,8 @@ end
 #    sh %{cc -o #{t.name} #{t.source}}
 #  end
 #
-def rule(args, &block)
-  Rake::Task.create_rule(args, &block)
+def rule(*args, &block)
+  Rake::Task.create_rule(*args, &block)
 end
 
 # Describe the next rake task.
@@ -660,8 +841,8 @@ end
 #     runtests
 #   end
 #
-def desc(comment)
-  Rake.application.last_comment = comment
+def desc(description)
+  Rake.application.last_description = description
 end
 
 # Import the partial Rakefiles +fn+.  Imported files are loaded _after_ the
@@ -713,8 +894,8 @@ module FileUtils
     options = (Hash === cmd.last) ? cmd.pop : {}
     unless block_given?
       show_command = cmd.join(" ")
-      show_command = show_command[0,42] + "..." 
-        # TODO code application logic heref show_command.length > 45
+      show_command = show_command[0,42] + "..."
+      # TODO code application logic heref show_command.length > 45
       block = lambda { |ok, status|
         ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
       }
@@ -737,10 +918,10 @@ module FileUtils
     if args.length > 1 then
       sh(*([RUBY] + args + [options]), &block)
     else
-      sh("#{RUBY} #{args}", options, &block)
+      sh("#{RUBY} #{args.first}", options, &block)
     end
   end
-  
+
   LN_SUPPORTED = [true]
 
   #  Attempt to do a normal file link, but fall back to a copy if the link
@@ -783,10 +964,10 @@ module RakeFileUtils
   end
   RakeFileUtils.verbose_flag = true
   RakeFileUtils.nowrite_flag = false
-  
+
   $fileutils_verbose = true
   $fileutils_nowrite = false
-  
+
   FileUtils::OPT_TABLE.each do |name, opts|
     default_options = []
     if opts.include?('verbose')
@@ -807,7 +988,7 @@ module RakeFileUtils
     EOS
   end
 
-  # Get/set the verbose flag controlling output from the FileUtils utilities. 
+  # Get/set the verbose flag controlling output from the FileUtils utilities.
   # If verbose is true, then the utility method is echoed to standard output.
   #
   # Examples:
@@ -828,7 +1009,7 @@ module RakeFileUtils
     RakeFileUtils.verbose_flag
   end
 
-  # Get/set the nowrite flag controlling output from the FileUtils utilities. 
+  # Get/set the nowrite flag controlling output from the FileUtils utilities.
   # If verbose is true, then the utility method is echoed to standard output.
   #
   # Examples:
@@ -852,7 +1033,7 @@ module RakeFileUtils
   # Use this function to prevent protentially destructive ruby code from
   # running when the :nowrite flag is set.
   #
-  # Example: 
+  # Example:
   #
   #   when_writing("Building Project") do
   #     project.build
@@ -943,7 +1124,7 @@ module Rake
   # FileList/Array is requested, the pending patterns are resolved into a real
   # list of file names.
   #
-  class FileList 
+  class FileList
 
     include Cloneable
 
@@ -965,7 +1146,7 @@ module Rake
 
     # List of array methods (that are not in +Object+) that need to be
     # delegated.
-    ARRAY_METHODS = Array.instance_methods - Object.instance_methods
+    ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).map { |n| n.to_s }
 
     # List of additional methods that must be delegated.
     MUST_DEFINE = %w[to_a inspect]
@@ -981,16 +1162,16 @@ module Rake
       compact flatten uniq values_at
       + - & |
     ]
-    
+
     DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).collect{ |s| s.to_s }.sort.uniq
-    
+
     # Now do the delegation.
     DELEGATING_METHODS.each_with_index do |sym, i|
       if SPECIAL_RETURN.include?(sym)
         ln = __LINE__+1
         class_eval %{
           def #{sym}(*args, &block)
-            resolve if @pending
+            resolve
             result = @items.send(:#{sym}, *args, &block)
             FileList.new.import(result)
           end
@@ -999,7 +1180,7 @@ module Rake
         ln = __LINE__+1
         class_eval %{
           def #{sym}(*args, &block)
-            resolve if @pending
+            resolve
             result = @items.send(:#{sym}, *args, &block)
             result.object_id == @items.object_id ? self : result
           end
@@ -1048,8 +1229,8 @@ module Rake
       @pending = true
       self
     end
-    alias :add :include 
-    
+    alias :add :include
+
     # Register a list of file name patterns that should be excluded from the
     # list.  Patterns may be regular expressions, glob patterns or regular
     # strings.  In addition, a block given to exclude will remove entries that
@@ -1072,16 +1253,16 @@ module Rake
     #
     def exclude(*patterns, &block)
       patterns.each do |pat|
-        @exclude_patterns << pat 
+        @exclude_patterns << pat
       end
       if block_given?
         @exclude_procs << block
-      end        
+      end
       resolve_exclude if ! @pending
       self
     end
 
-    
+
     # Clear all the exclude patterns so that we exclude nothing.
     def clear_exclude
       @exclude_patterns = []
@@ -1105,7 +1286,7 @@ module Rake
     def to_ary
       to_a
     end
-    
+
     # Lie about our class.
     def is_a?(klass)
       klass == Array || super(klass)
@@ -1240,7 +1421,7 @@ module Rake
                 yield fn, count, line
               else
                 puts "#{fn}:#{count}:#{line}"
-              end               
+              end
             end
           end
         end
@@ -1250,14 +1431,14 @@ module Rake
     # Return a new file list that only contains file names from the current
     # file list that exist on the file system.
     def existing
-      select { |fn| File.exists?(fn) }
+      select { |fn| File.exist?(fn) }
     end
-    
+
     # Modify the current file list so that it contains only file name that
     # exist on the file system.
     def existing!
       resolve
-      @items = @items.select { |fn| File.exists?(fn) }
+      @items = @items.select { |fn| File.exist?(fn) }
       self
     end
 
@@ -1271,10 +1452,10 @@ module Rake
         FileList.new.import(result[1]),
       ]
     end
-    
+
     # Convert a FileList to a string by joining all elements with a space.
     def to_s
-      resolve if @pending
+      resolve
       self.join(' ')
     end
 
@@ -1301,7 +1482,7 @@ module Rake
     DEFAULT_IGNORE_PROCS = [
       proc { |fn| fn =~ /(^|[\/\\])core$/ && ! File.directory?(fn) }
     ]
-    @exclude_patterns = DEFAULT_IGNORE_PATTERNS.dup
+#    @exclude_patterns = DEFAULT_IGNORE_PATTERNS.dup
 
     def import(array)
       @items = array
@@ -1315,26 +1496,6 @@ module Rake
       def [](*args)
         new(*args)
       end
-
-      # 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"
-      #
-      # Note that file names beginning with "." are automatically ignored by
-      # Ruby's glob patterns and are not specifically listed in the ignore
-      # patterns.
-      def select_default_ignore_patterns
-        @exclude_patterns = DEFAULT_IGNORE_PATTERNS.dup
-      end
-
-      # Clear the ignore patterns.  
-      def clear_ignore_patterns
-        @exclude_patterns = [ /^$/ ]
-      end
     end
   end # FileList
 end
@@ -1352,7 +1513,7 @@ module Rake
       end
     end
   end
-end
+end # module Rake
 
 # Alias FileList to be available at the top level.
 FileList = Rake::FileList
@@ -1382,7 +1543,7 @@ module Rake
   end
 
   EARLY = EarlyTime.instance
-end
+end # module Rake
 
 # ###########################################################################
 # Extensions to time to allow comparisons with an early time class.
@@ -1395,8 +1556,8 @@ class Time
     else
       rake_original_time_compare(other)
     end
-  end     
-end
+  end
+end # class Time
 
 module Rake
 
@@ -1412,7 +1573,7 @@ module Rake
       @task_manager = task_manager
       @scope = scope_list.dup
     end
-    
+
     # Lookup a task named +name+ in the namespace.
     def [](name)
       @task_manager.lookup(name, @scope)
@@ -1422,37 +1583,39 @@ module Rake
     def tasks
       @task_manager.tasks
     end
-  end
+  end # NameSpace
 
 
   ####################################################################
-  # The TaskManager module is a mixin for managing tasks.  
+  # The TaskManager module is a mixin for managing tasks.
   module TaskManager
     # Track the last comment made in the Rakefile.
-    attr_accessor :last_comment
+    attr_accessor :last_description
+    alias :last_comment :last_description    # Backwards compatibility
 
     def initialize
       super
       @tasks = Hash.new
       @rules = Array.new
       @scope = Array.new
-      @last_comment = nil
+      @last_description = nil
     end
 
-    def create_rule(args, &block)
-      pattern, deps = resolve_args(args)
+    def create_rule(*args, &block)
+      pattern, arg_names, deps = resolve_args(args)
       pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern
       @rules << [pattern, deps, block]
     end
 
-    def define_task(task_class, args, &block)
-      task_name, deps = resolve_args(args)
+    def define_task(task_class, *args, &block)
+      task_name, arg_names, deps = resolve_args(args)
       task_name = task_class.scope_name(@scope, task_name)
       deps = [deps] unless deps.respond_to?(:to_ary)
       deps = deps.collect {|d| d.to_s }
       task = intern(task_class, task_name)
-      task.add_comment(@last_comment)
-      @last_comment = nil
+      task.set_arg_names(arg_names) unless arg_names.empty?
+      task.add_description(@last_description)
+      @last_description = nil
       task.enhance(deps, &block)
       task
     end
@@ -1463,7 +1626,7 @@ module Rake
       @tasks[task_name.to_s] ||= task_class.new(task_name, self)
     end
 
-    # Find a matching task for +task_name+.  
+    # Find a matching task for +task_name+.
     def [](task_name, scopes=nil)
       task_name = task_name.to_s
       self.lookup(task_name, scopes) or
@@ -1476,23 +1639,27 @@ module Rake
       return nil unless File.exist?(task_name)
       define_task(Rake::FileTask, task_name)
     end
-    
-    # Resolve the arguments for a task/rule.
+
+    # Resolve the arguments for a task/rule.  Returns a triplet of
+    # [task_name, arg_name_list, prerequisites].
     def resolve_args(args)
-      case args
-      when Hash
-        fail "Too Many Task Names: #{args.keys.join(' ')}" if args.size > 1
-        fail "No Task Name Given" if args.size < 1
-        task_name = args.keys[0]
-        deps = args[task_name]
-        deps = [deps] if (String===deps) || (Regexp===deps) || (Proc===deps)
-      else
-        task_name = args
-        deps = []
+      task_name = args.shift
+      arg_names = args #.map { |a| a.to_sym }
+      needs = []
+      if task_name.is_a?(Hash)
+        hash = task_name
+        task_name = hash.keys[0]
+        needs = hash[task_name]
+      end
+      if arg_names.last.is_a?(Hash)
+        hash = arg_names.pop
+        needs = hash[:needs]
+        fail "Unrecognized keys in task hash: #{hash.keys.inspect}" if hash.size > 1
       end
-      [task_name, deps]
+      needs = [needs] unless needs.respond_to?(:to_ary)
+      [task_name, arg_names, needs]
     end
-    
+
     # If a rule can be found that matches the task name, enhance the
     # task with the prerequisites and actions from the rule.  Set the
     # source attribute of the task appropriately for the rule.  Return
@@ -1511,7 +1678,7 @@ module Rake
       ex.add_target(task_name)
       fail ex
     end
-    
+
     # List of all defined tasks in this application.
     def tasks
       @tasks.values.sort_by { |t| t.name }
@@ -1543,7 +1710,7 @@ module Rake
       lookup_in_scope(task_name, scopes)
     end
 
-    # Lookup the task name 
+    # Lookup the task name
     def lookup_in_scope(name, scope)
       n = scope.size
       while n >= 0
@@ -1599,13 +1766,13 @@ module Rake
       task.sources = prereqs
       task
     end
-    
+
     # Make a list of sources from the list of file name extensions /
     # translation procs.
     def make_sources(task_name, extensions)
       extensions.collect { |ext|
         case ext
-        when /^%/
+        when /%/
           task_name.pathmap(ext)
         when %r{/}
           ext
@@ -1614,14 +1781,18 @@ module Rake
         when String
           ext
         when Proc
-          ext.call(task_name)
+          if ext.arity == 1
+            ext.call(task_name)
+          else
+            ext.call
+          end
         else
           fail "Don't know how to handle rule dependent: #{ext.inspect}"
         end
       }.flatten
     end
-    
-  end
+
+  end # TaskManager
 
   ######################################################################
   # Rake main application object.  When invoking +rake+ from the
@@ -1635,50 +1806,50 @@ module Rake
 
     # The original directory where rake was invoked.
     attr_reader :original_dir
-    
+
     # Name of the actual rakefile used.
     attr_reader :rakefile
-    
+
     # List of the top level task names (task names from the command line).
     attr_reader :top_level_tasks
 
     DEFAULT_RAKEFILES = ['rakefile', 'Rakefile', 'rakefile.rb', 'Rakefile.rb'].freeze
-    
+
     OPTIONS = [     # :nodoc:
-      ['--dry-run',  '-n', GetoptLong::NO_ARGUMENT,
-        "Do a dry run without executing actions."],
-      ['--help',     '-H', GetoptLong::NO_ARGUMENT,
+      ['--classic-namespace', '-C', GetoptLong::NO_ARGUMENT,
+        "Put Task and FileTask in the top level namespace"],
+      ['--describe',  '-D', GetoptLong::OPTIONAL_ARGUMENT,
+        "Describe the tasks (matching optional PATTERN), then exit."],
+      ['--rakefile', '-f', GetoptLong::OPTIONAL_ARGUMENT,
+        "Use FILE as the rakefile."],
+      ['--help',     '-h', '-H', GetoptLong::NO_ARGUMENT,
         "Display this help message."],
       ['--libdir',   '-I', GetoptLong::REQUIRED_ARGUMENT,
         "Include LIBDIR in the search path for required modules."],
-      ['--rakelibdir', '-R', GetoptLong::REQUIRED_ARGUMENT,
-        "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')"],
+      ['--dry-run',  '-n', GetoptLong::NO_ARGUMENT,
+        "Do a dry run without executing actions."],
       ['--nosearch', '-N', GetoptLong::NO_ARGUMENT,
         "Do not search parent directories for the Rakefile."],
       ['--prereqs',  '-P', GetoptLong::NO_ARGUMENT,
         "Display the tasks and dependencies, then exit."],
       ['--quiet',    '-q', GetoptLong::NO_ARGUMENT,
         "Do not log messages to standard output."],
-      ['--rakefile', '-f', GetoptLong::OPTIONAL_ARGUMENT,
-        "Use FILE as the rakefile."],
       ['--require',  '-r', GetoptLong::REQUIRED_ARGUMENT,
         "Require MODULE before executing rakefile."],
+      ['--rakelibdir', '-R', GetoptLong::REQUIRED_ARGUMENT,
+        "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')"],
       ['--silent',   '-s', GetoptLong::NO_ARGUMENT,
         "Like --quiet, but also suppresses the 'in directory' announcement."],
       ['--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,
-        "Display usage."],
       ['--verbose',  '-v', GetoptLong::NO_ARGUMENT,
         "Log message to standard output (default)."],
       ['--version',  '-V', GetoptLong::NO_ARGUMENT,
         "Display the program version."],
-      ['--classic-namespace', '-C', GetoptLong::NO_ARGUMENT,
-        "Put Task and FileTask in the top level namespace"],
     ]
-    
+
     # Initialize a Rake::Application object.
     def initialize
       super
@@ -1701,7 +1872,7 @@ module Rake
     # * Define the tasks (+load_rakefile+).
     # * Run the top level tasks (+run_tasks+).
     #
-    # If you wish to build a custom rake command, you should call +init+ on your 
+    # If you wish to build a custom rake command, you should call +init+ on your
     # application.  The define any tasks.  Finally, call +top_level+ to run your top
     # level tasks.
     def run
@@ -1726,7 +1897,7 @@ module Rake
       standard_exception_handling do
         raw_load_rakefile
       end
-    end 
+    end
 
     # Run the top level tasks of a Rake application.
     def top_level
@@ -1736,7 +1907,7 @@ module Rake
         elsif options.show_prereqs
           display_prerequisites
         else
-          top_level_tasks.each { |task_name| self[task_name].invoke }
+          top_level_tasks.each { |task_name| invoke_task(task_name) }
         end
       end
     end
@@ -1747,7 +1918,7 @@ module Rake
       ext = ".#{ext}" unless ext =~ /^\./
       @loaders[ext] = loader
     end
-    
+
     # Application options from the command line
     def options
       @options ||= OpenStruct.new
@@ -1755,10 +1926,30 @@ module Rake
 
     # private ----------------------------------------------------------------
 
+    def invoke_task(task_string)
+      name, args = parse_task_string(task_string)
+      t = self[name]
+      t.invoke(*args)
+    end
+
+    def parse_task_string(string)
+      if string =~ /^([^\[]+)(\[(.*)\])$/
+        name = $1
+        args = $3.split(/\s*,\s*/)
+      else
+        name = string
+        args = []
+      end
+      [name, args]
+    end
+
     # Provide standard execption handling for the given block.
     def standard_exception_handling
       begin
         yield
+      rescue SystemExit => ex
+        # Exit silently with current status
+        exit(ex.status)
       rescue SystemExit, GetoptLong::InvalidOption => ex
         # Exit silently
         exit(1)
@@ -1773,9 +1964,9 @@ module Rake
           $stderr.puts "(See full trace by running task with --trace)"
         end
         exit(1)
-      end    
+      end
     end
-        
+
     # True if one of the files in RAKEFILES is in the current directory.
     # If a match is found, it is copied into @rakefile.
     def have_rakefile
@@ -1787,15 +1978,10 @@ module Rake
       end
       return false
     end
-    
-    # Display the program usage line.
-    def usage
-      puts "rake [-f rakefile] {options} targets..."
-    end
-    
+
     # Display the rake command line help.
     def help
-      usage
+      puts "rake [-f rakefile] {options} targets..."
       puts
       puts "Options are ..."
       puts
@@ -1809,18 +1995,38 @@ module Rake
         printf "      %s\n", desc
       end
     end
-    
+
     # Display the tasks and dependencies.
     def display_tasks_and_comments
       displayable_tasks = tasks.select { |t|
         t.comment && t.name =~ options.show_task_pattern
       }
-      width = displayable_tasks.collect { |t| t.name.length }.max
-      displayable_tasks.each do |t|
-        printf "#{name} %-#{width}s  # %s\n", t.name, t.comment
+      if options.full_description
+        displayable_tasks.each do |t|
+          puts "rake #{t.name_with_args}"
+          t.full_comment.split("\n").each do |line|
+            puts "    #{line}"
+          end
+          puts
+        end
+      else
+        width = displayable_tasks.collect { |t| t.name_with_args.length }.max || 10
+        max_column = 80 - name.size - width - 7
+        displayable_tasks.each do |t|
+          printf "#{name} %-#{width}s  # %s\n",
+            t.name_with_args, truncate(t.comment, max_column)
+        end
       end
     end
-    
+
+    def truncate(string, width)
+      if string.length <= width
+        string
+      else
+        string[0, width-3] + "..."
+      end
+    end
+
     # Display the tasks and prerequisites
     def display_prerequisites
       tasks.each do |t|
@@ -1828,16 +2034,20 @@ module Rake
         t.prerequisites.each { |pre| puts "    #{pre}" }
       end
     end
-    
+
     # Return a list of the command line options supported by the
     # program.
     def command_line_options
       OPTIONS.collect { |lst| lst[0..-2] }
     end
-    
+
     # Do the option defined by +opt+ and +value+.
     def do_option(opt, value)
       case opt
+      when '--describe'
+        options.show_tasks = true
+        options.show_task_pattern = Regexp.new(value || '.')
+        options.full_description = true
       when '--dry-run'
         verbose(true)
         nowrite(true)
@@ -1875,12 +2085,10 @@ module Rake
       when '--tasks'
         options.show_tasks = true
         options.show_task_pattern = Regexp.new(value || '.')
+        options.full_description = false
       when '--trace'
         options.trace = true
         verbose(true)
-      when '--usage'
-        usage
-        exit
       when '--verbose'
         verbose(true)
       when '--version'
@@ -1891,10 +2099,10 @@ module Rake
         options.classic_namespace = true
       end
     end
-    
+
     # Read and handle the command line options.
     def handle_options
-      options.rakelib = 'rakelib'
+      options.rakelib = ['rakelib']
 
       opts = GetoptLong.new(*command_line_options)
       opts.each { |opt, value| do_option(opt, value) }
@@ -1908,8 +2116,10 @@ module Rake
         $dryrun = options.dryrun
         $silent = options.silent
       end
+    rescue NoMethodError => ex
+      raise GetoptLong::InvalidOption, "While parsing options, error = #{ex.class}:#{ex.message}"
     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=$")
@@ -1943,7 +2153,7 @@ module Rake
       end
       load_imports
     end
-    
+
     # Collect the list of tasks on the command line.  If no tasks are
     # given, return a list containing only the default task.
     # Environmental assignments are processed at this time as well.
@@ -1958,12 +2168,12 @@ module Rake
       end
       @top_level_tasks.push("default") if @top_level_tasks.size == 0
     end
-    
+
     # Add a file to the list of files to be imported.
     def add_import(fn)
       @pending_imports << fn
     end
-    
+
     # Load the pending list of imported files.
     def load_imports
       while fn = @pending_imports.shift
@@ -1977,7 +2187,7 @@ module Rake
         @imported << fn
       end
     end
-    
+
     # Warn about deprecated use of top level constant names.
     def const_warning(const_name)
       @const_warning ||= false
@@ -2004,7 +2214,7 @@ end
 class Module
   # Rename the original handler to make it available.
   alias :rake_original_const_missing :const_missing
-  
+
   # Check for deprecated uses of top level (i.e. in Object) uses of
   # Rake class names.  If someone tries to reference the constant
   # name, display a warning and return the proper object.  Using the