rake 10.1.1 → 10.2.0

data/doc/release_notes/rake-0.9.6.rdoc

@@ -5,69 +5,6 @@ Rake into the Ruby source tree and fixing tests.
 
 == Changes
 
-=== New Features (in 0.9.3)
-
-* Multitask tasks now use a thread pool. Use -j to limit the number of
-  available threads.
-
-* Use -m to turn regular tasks into multitasks (use at your own risk).
-
-* You can now do "Rake.add_rakelib 'dir'" in your Rakefile to
-  programatically add rake task libraries.
-
-* You can specific backtrace suppression patterns (see
-  --supress-backtrace)
-
-* Directory tasks can now take prerequisites and actions
-
-* Use --backtrace to request a full backtrace without the task trace.
-
-* You can say "--backtrace=stdout" and "--trace=stdout" to route trace
-  output to standard output rather than standard error.
-
-* Optional 'phony' target (enable with 'require 'rake/phony'") for
-  special purpose builds.
-
-* Task#clear now clears task comments as well as actions and
-  prerequisites. Task#clear_comment will specifically target comments.
-
-* The --all option will force -T and -D to consider all the tasks,
-  with and without descriptions.
-
-=== Bug Fixes (0.9.3)
-
-* Semi-colons in windows rakefile paths now work.
-
-* Improved Control-C support when invoking multiple test suites.
-
-* egrep method now reads files in text mode (better support for
-  Windows)
-
-* Better deprecation line number reporting.
-
-* The -W option now works with all tasks, whether they have a
-  description or not.
-
-* File globs in rake should not be sorted alphabetically, independent
-  of file system and platform.
-
-* Numerous internal improvements.
-
-* Documentation typos and fixes.
-
-=== Bug Fixes (0.9.4)
-
-* Exit status with failing tests is not correctly set to non-zero.
-
-* Simplified syntax for phony task (for older versions of RDoc).
-
-* Stand alone FileList usage gets glob function (without loading in
-  extra dependencies)
-
-=== Bug Fixes (0.9.5)
-
-* --trace and --backtrace no longer swallow following task names.
-
 === Bug Fixes (0.9.6)
 
 * Better trace output when using a multi-threaded Rakefile.

data/doc/release_notes/rake-10.0.1.rdoc

@@ -1,137 +1,8 @@
 = Rake 10.0.1 Released
 
-  "Jim, when will Rake reach version 1.0?"
+== Changes in 10.0.1
 
-Over the past several years I've been asked that question at
-conferences, panels and over twitter. Due to historical reasons (or
-maybe just plain laziness) Rake has (incorrectly) been treating the
-second digit of the version as the major release number. So in my head
-Rake was already at version 9.
-
-Well, it's time to fix things. This next version of Rake drops old,
-crufty, backwards compatibility hacks such as top level constants, DSL
-methods defined in Object and numerous other features that are just no
-longer desired. It's also time to drop the leading zero from the
-version number as well and call this new version of rake what it
-really is: Version 10.
-
-So, welcome to Rake 10.0!
-
-Rake 10 is actually feature identical to the latest version of Rake 9
-(that would be the version spelled 0.9.3), *except* that Rake 10 drops
-all the sundry deprecated features that have accumulated over the years.
-
-If your Rakefile is up to date and current with all the new features
-of Rake 10, you are ready to go. If your Rakefile still uses a few
-deprecated feeatures, feel free to use Rake 9 (0.9.3) with the same
-feature set. Just be aware that future features will be in Rake 10
-family line.
-
-== Changes in 10.0
-
-As mentioned above, there are no new features in Rake 10. However,
-there are a number of features missing:
-
-* Classic namespaces are now gone. Rake is no longer able to reflect
-  the options settings in the global variables ($rakefile, $show_tasks,
-  $show_prereqs, $trace, $dryrun and $silent). The
-  <tt>--classic-namespace</tt> option is no longer supported.
-
-* Global constants are no longer supported. This includes
-  <tt>Task</tt>, <tt>FileTask</tt>, <tt>FileCreationTask</tt> and
-  <tt>RakeApp</tt>). The constant missing hook to warn about using
-  global rake constants has been removed.
-
-* The Rake DSL methods (task, file, directory, etc) are in their own
-  module (Rake::DSL). The stub versions of these methods (that printed
-  warnings) in Object have been removed. However, the DSL methods are
-  added to the top-level <tt>main</tt> object. Since <tt>main</tt> is
-  not in the inheritance tree, the presence of the DSL methods in main
-  should be low impact on other libraries.
-
-  If you want to use the Rake DSL commands from your own code, just
-  include <tt>Rake::DSL</tt> into your own classes and modules.
-
-* The deprecated syntax for task arguments (the one using
-  <tt>:needs</tt>) has been removed.
-
-* The <tt>--reduce-compat</tt> flag has been removed (it's not needed
-  anymore).
-
-* The deprecated <tt>rake/sys.rb</tt> library has been removed.
-
-* The deprecated <tt>rake/rdoctask.rb</tt> library has been removed.
-  RDoc supplies its own rake task now.
-
-* The deprecated <tt>rake/gempackagetask.rb</tt> library has been
-  removed. Gem supplies its own package task now.
-
-There is one small behavioral change:
-
-* Non-file tasks now always report the current time as their time
-  stamp. This is different from the previous behavior where non-file
-  tasks reported current time only if there were no prerequisites, and
-  the max prerequisite timestamp otherwise. This lead to inconsistent
-  and surprising behavior when adding prerequisites to tasks that in
-  turn were prequisites to file tasks. The new behavior is more
-  consistent and predictable.
-
-== Changes (from 0.9.3 & 0.9.4)
-
-Since Rake 10 includes the changes from the last version of Rake 9,
-we'll repeat the changes for version 0.9.3 here.
-
-=== New Features (in 0.9.3)
-
-* Multitask tasks now use a thread pool. Use -j to limit the number of
-  available threads.
-
-* Use -m to turn regular tasks into multitasks (use at your own risk).
-
-* You can now do "Rake.add_rakelib 'dir'" in your Rakefile to
-  programatically add rake task libraries.
-
-* You can specific backtrace suppression patterns (see
-  --supress-backtrace)
-
-* Directory tasks can now take prerequisites and actions
-
-* Use --backtrace to request a full backtrace without the task trace.
-
-* You can say "--backtrace=stdout" and "--trace=stdout" to route trace
-  output to standard output rather than standard error.
-
-* Optional 'phony' target (enable with 'require 'rake/phony'") for
-  special purpose builds.
-
-* Task#clear now clears task comments as well as actions and
-  prerequisites. Task#clear_comment will specifically target comments.
-
-* The --all option will force -T and -D to consider all the tasks,
-  with and without descriptions.
-
-=== Bug Fixes (in 0.9.3)
-
-* Semi-colons in windows rakefile paths now work.
-
-* Improved Control-C support when invoking multiple test suites.
-
-* egrep method now reads files in text mode (better support for
-  Windows)
-
-* Better deprecation line number reporting.
-
-* The -W option now works with all tasks, whether they have a
-  description or not.
-
-* File globs in rake should not be sorted alphabetically, independent
-  of file system and platform.
-
-* Numerous internal improvements.
-
-* Documentation typos and fixes.
-
-=== Bug Fixes (in 0.9.4)
+=== Bug Fixes
 
 * Exit status with failing tests is not correctly set to non-zero.
 

data/doc/release_notes/rake-10.0.2.rdoc

@@ -1,146 +1,8 @@
 = Rake 10.0.2 Released
 
-  "Jim, when will Rake reach version 1.0?"
+== Changes in Rake 10.0.2
 
-Over the past several years I've been asked that question at
-conferences, panels and over twitter. Due to historical reasons (or
-maybe just plain laziness) Rake has (incorrectly) been treating the
-second digit of the version as the major release number. So in my head
-Rake was already at version 9.
-
-Well, it's time to fix things. This next version of Rake drops old,
-crufty, backwards compatibility hacks such as top level constants, DSL
-methods defined in Object and numerous other features that are just no
-longer desired. It's also time to drop the leading zero from the
-version number as well and call this new version of rake what it
-really is: Version 10.
-
-So, welcome to Rake 10.0!
-
-Rake 10 is actually feature identical to the latest version of Rake 9
-(that would be the version spelled 0.9.3), *except* that Rake 10 drops
-all the sundry deprecated features that have accumulated over the years.
-
-If your Rakefile is up to date and current with all the new features
-of Rake 10, you are ready to go. If your Rakefile still uses a few
-deprecated feeatures, feel free to use Rake 9 (0.9.3) with the same
-feature set. Just be aware that future features will be in Rake 10
-family line.
-
-== Changes in Version 10
-
-As mentioned above, there are no new features in Rake 10. However,
-there are a number of features missing:
-
-* Classic namespaces are now gone. Rake is no longer able to reflect
-  the options settings in the global variables ($rakefile, $show_tasks,
-  $show_prereqs, $trace, $dryrun and $silent). The
-  <tt>--classic-namespace</tt> option is no longer supported.
-
-* Global constants are no longer supported. This includes
-  <tt>Task</tt>, <tt>FileTask</tt>, <tt>FileCreationTask</tt> and
-  <tt>RakeApp</tt>). The constant missing hook to warn about using
-  global rake constants has been removed.
-
-* The Rake DSL methods (task, file, directory, etc) are in their own
-  module (Rake::DSL). The stub versions of these methods (that printed
-  warnings) in Object have been removed. However, the DSL methods are
-  added to the top-level <tt>main</tt> object. Since <tt>main</tt> is
-  not in the inheritance tree, the presence of the DSL methods in main
-  should be low impact on other libraries.
-
-  If you want to use the Rake DSL commands from your own code, just
-  include <tt>Rake::DSL</tt> into your own classes and modules.
-
-* The deprecated syntax for task arguments (the one using
-  <tt>:needs</tt>) has been removed.
-
-* The <tt>--reduce-compat</tt> flag has been removed (it's not needed
-  anymore).
-
-* The deprecated <tt>rake/sys.rb</tt> library has been removed.
-
-* The deprecated <tt>rake/rdoctask.rb</tt> library has been removed.
-  RDoc supplies its own rake task now.
-
-* The deprecated <tt>rake/gempackagetask.rb</tt> library has been
-  removed. Gem supplies its own package task now.
-
-There is one small behavioral change:
-
-* Non-file tasks now always report the current time as their time
-  stamp. This is different from the previous behavior where non-file
-  tasks reported current time only if there were no prerequisites, and
-  the max prerequisite timestamp otherwise. This lead to inconsistent
-  and surprising behavior when adding prerequisites to tasks that in
-  turn were prequisites to file tasks. The new behavior is more
-  consistent and predictable.
-
-== Changes (from 0.9.3, 0.9.4, 0.9.5)
-
-Since Rake 10 includes the changes from the last version of Rake 9,
-we'll repeat the changes for versions 0.9.3 through 0.9.5 here.
-
-=== New Features (in 0.9.3)
-
-* Multitask tasks now use a thread pool. Use -j to limit the number of
-  available threads.
-
-* Use -m to turn regular tasks into multitasks (use at your own risk).
-
-* You can now do "Rake.add_rakelib 'dir'" in your Rakefile to
-  programatically add rake task libraries.
-
-* You can specific backtrace suppression patterns (see
-  --supress-backtrace)
-
-* Directory tasks can now take prerequisites and actions
-
-* Use --backtrace to request a full backtrace without the task trace.
-
-* You can say "--backtrace=stdout" and "--trace=stdout" to route trace
-  output to standard output rather than standard error.
-
-* Optional 'phony' target (enable with 'require 'rake/phony'") for
-  special purpose builds.
-
-* Task#clear now clears task comments as well as actions and
-  prerequisites. Task#clear_comment will specifically target comments.
-
-* The --all option will force -T and -D to consider all the tasks,
-  with and without descriptions.
-
-=== Bug Fixes (in 0.9.3)
-
-* Semi-colons in windows rakefile paths now work.
-
-* Improved Control-C support when invoking multiple test suites.
-
-* egrep method now reads files in text mode (better support for
-  Windows)
-
-* Better deprecation line number reporting.
-
-* The -W option now works with all tasks, whether they have a
-  description or not.
-
-* File globs in rake should not be sorted alphabetically, independent
-  of file system and platform.
-
-* Numerous internal improvements.
-
-* Documentation typos and fixes.
-
-=== Bug Fixes (in 0.9.4)
-
-* Exit status with failing tests is not correctly set to non-zero.
-
-* Simplified syntax for phony task (for older versions of RDoc).
-
-* Stand alone FileList usage gets glob function (without loading in
-  extra dependencies)
-
-=== Bug Fixes (in 0.9.5)
+=== Bug Fixes
 
 * --trace and --backtrace no longer swallow following task names.
 

data/doc/release_notes/rake-10.1.0.rdoc

@@ -2,7 +2,7 @@
 
 == Changes in Version 10.1
 
-Here are new features in this version of Rake:
+=== New Features
 
 * Add support for variable length task argument lists. If more actual
   arguments are supplied than named arguments, then the extra
@@ -12,7 +12,7 @@ Here are new features in this version of Rake:
   "rake" was hardcoded, now rake-based applications can display their
   own names).
 
-=== Bug Fixes (in 10.1)
+=== Bug Fixes
 
 Bug fixes include:
 

data/lib/rake.rb

@@ -1,5 +1,4 @@
 #--
-
 # Copyright 2003-2010 by Jim Weirich (jim.weirich@gmail.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -21,9 +20,14 @@
 # IN THE SOFTWARE.
 #++
 
+module Rake
+  VERSION = '10.2.0'
+end
+
 require 'rake/version'
 
 # :stopdoc:
+# TODO: Remove in Rake 11
 RAKEVERSION = Rake::VERSION
 # :startdoc:
 
@@ -41,6 +45,7 @@ require 'rake/ext/time'
 require 'rake/win32'
 
 require 'rake/linked_list'
+require 'rake/cpu_counter'
 require 'rake/scope'
 require 'rake/task_argument_error'
 require 'rake/rule_recursion_overflow_error'

data/lib/rake/alt_system.rb

@@ -24,11 +24,13 @@
 
 require 'rbconfig'
 
-#
+##
 # Alternate implementations of system() and backticks `` on Windows
 # for ruby-1.8 and earlier.
-#
-module Rake::AltSystem
+#--
+# TODO: Remove in Rake 11
+
+module Rake::AltSystem # :nodoc: all
   WINDOWS = RbConfig::CONFIG["host_os"] =~
     %r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
 

data/lib/rake/application.rb

@@ -12,10 +12,10 @@ module Rake
 
   CommandLineOptionError = Class.new(StandardError)
 
-  ######################################################################
+  ##
   # Rake main application object.  When invoking +rake+ from the
   # command line, a Rake::Application object is created and run.
-  #
+
   class Application
     include TaskManager
     include TraceOutput
@@ -84,7 +84,7 @@ module Rake
       standard_exception_handling do
         @name = app_name
         handle_options
-        collect_tasks
+        collect_command_line_tasks
       end
     end
 
@@ -117,8 +117,8 @@ module Rake
       thread_pool.join
       if options.job_stats
         stats = thread_pool.statistics
-        puts "Maximum active threads: #{stats[:max_active_threads]}"
-        puts "Total threads in play:  #{stats[:total_threads_in_play]}"
+        puts "Maximum active threads: #{stats[:max_active_threads]} + main"
+        puts "Total threads in play:  #{stats[:total_threads_in_play]} + main"
       end
       ThreadHistoryDisplay.new(thread_pool.history).show if
         options.job_stats == :history
@@ -138,30 +138,38 @@ module Rake
 
     # Return the thread pool used for multithreaded processing.
     def thread_pool             # :nodoc:
-      @thread_pool ||= ThreadPool.new(options.thread_pool_size || FIXNUM_MAX)
+      @thread_pool ||= ThreadPool.new(options.thread_pool_size || Rake.suggested_thread_count-1)
     end
 
-    # private ----------------------------------------------------------------
+    # internal ----------------------------------------------------------------
 
-    def invoke_task(task_string)
+    # Invokes a task with arguments that are extracted from +task_string+
+    def invoke_task(task_string) # :nodoc:
       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]
+    def parse_task_string(string) # :nodoc:
+      /^(?<name>[^\[]+)(\[(?<remaining_args>.*)\])$/ =~ string
+
+      return string, [] unless name
+      return name,   [] if     remaining_args.empty?
+
+      args = []
+
+      begin
+        /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
+
+        remaining_args = $2
+        args << $1.gsub(/\\(.)/, '\1')
+      end while remaining_args
+
+      return name, args
     end
 
     # Provide standard exception handling for the given block.
-    def standard_exception_handling
+    def standard_exception_handling # :nodoc:
       yield
     rescue SystemExit
       # Exit silently with current status
@@ -177,22 +185,43 @@ module Rake
 
     # Exit the program because of an unhandle exception.
     # (may be overridden by subclasses)
-    def exit_because_of_exception(ex)
+    def exit_because_of_exception(ex) # :nodoc:
       exit(false)
     end
 
     # Display the error message that caused the exception.
-    def display_error_message(ex)
+    def display_error_message(ex) # :nodoc:
       trace "#{name} aborted!"
-      trace ex.message
+      display_exception_details(ex)
+      trace "Tasks: #{ex.chain}" if has_chain?(ex)
+      trace "(See full trace by running task with --trace)" unless
+         options.backtrace
+    end
+
+    def display_exception_details(ex) # :nodoc:
+      display_exception_message_details(ex)
+      display_exception_backtrace(ex)
+      display_exception_details(ex.cause) if has_cause?(ex)
+    end
+
+    def has_cause?(ex) # :nodoc:
+      ex.respond_to?(:cause) && ex.cause
+    end
+
+    def display_exception_message_details(ex) # :nodoc:
+      if ex.instance_of?(RuntimeError)
+        trace ex.message
+      else
+        trace "#{ex.class.name}: #{ex.message}"
+      end
+    end
+
+    def display_exception_backtrace(ex) # :nodoc:
       if options.backtrace
         trace ex.backtrace.join("\n")
       else
         trace Backtrace.collapse(ex.backtrace).join("\n")
       end
-      trace "Tasks: #{ex.chain}" if has_chain?(ex)
-      trace "(See full trace by running task with --trace)" unless
-        options.backtrace
     end
 
     # Warn about deprecated usage.
@@ -200,7 +229,7 @@ module Rake
     # Example:
     #    Rake.application.deprecate("import", "Rake.import", caller.first)
     #
-    def deprecate(old_usage, new_usage, call_site)
+    def deprecate(old_usage, new_usage, call_site) # :nodoc:
       unless options.ignore_deprecate
         $stderr.puts "WARNING: '#{old_usage}' is deprecated.  " +
           "Please use '#{new_usage}' instead.\n" +
@@ -209,14 +238,14 @@ module Rake
     end
 
     # Does the exception have a task invocation chain?
-    def has_chain?(exception)
+    def has_chain?(exception) # :nodoc:
       exception.respond_to?(:chain) && exception.chain
     end
     private :has_chain?
 
     # 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
+    def have_rakefile # :nodoc:
       @rakefiles.each do |fn|
         if File.exist?(fn)
           others = FileList.glob(fn, File::FNM_CASEFOLD)
@@ -229,23 +258,23 @@ module Rake
     end
 
     # True if we are outputting to TTY, false otherwise
-    def tty_output?
+    def tty_output? # :nodoc:
       @tty_output
     end
 
     # Override the detected TTY output state (mostly for testing)
-    def tty_output=(tty_output_state)
+    def tty_output=(tty_output_state) # :nodoc:
       @tty_output = tty_output_state
     end
 
     # We will truncate output if we are outputting to a TTY or if we've been
     # given an explicit column width to honor
-    def truncate_output?
+    def truncate_output? # :nodoc:
       tty_output? || @terminal_columns.nonzero?
     end
 
     # Display the tasks and comments.
-    def display_tasks_and_comments
+    def display_tasks_and_comments # :nodoc:
       displayable_tasks = tasks.select { |t|
         (options.show_all_tasks || t.comment) &&
           t.name =~ options.show_task_pattern
@@ -284,7 +313,7 @@ module Rake
       end
     end
 
-    def terminal_width
+    def terminal_width # :nodoc:
       if @terminal_columns.nonzero?
         result = @terminal_columns
       else
@@ -296,28 +325,28 @@ module Rake
     end
 
     # Calculate the dynamic width of the
-    def dynamic_width
+    def dynamic_width # :nodoc:
       @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
     end
 
-    def dynamic_width_stty
+    def dynamic_width_stty # :nodoc:
       %x{stty size 2>/dev/null}.split[1].to_i
     end
 
-    def dynamic_width_tput
+    def dynamic_width_tput # :nodoc:
       %x{tput cols 2>/dev/null}.to_i
     end
 
-    def unix?
+    def unix? # :nodoc:
       RbConfig::CONFIG['host_os'] =~
         /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
     end
 
-    def windows?
+    def windows? # :nodoc:
       Win32.windows?
     end
 
-    def truncate(string, width)
+    def truncate(string, width) # :nodoc:
       if string.nil?
         ""
       elsif string.length <= width
@@ -328,19 +357,19 @@ module Rake
     end
 
     # Display the tasks and prerequisites
-    def display_prerequisites
+    def display_prerequisites # :nodoc:
       tasks.each do |t|
         puts "#{name} #{t.name}"
         t.prerequisites.each { |pre| puts "    #{pre}" }
       end
     end
 
-    def trace(*strings)
+    def trace(*strings) # :nodoc:
       options.trace_output ||= $stderr
       trace_on(options.trace_output, *strings)
     end
 
-    def sort_options(options)
+    def sort_options(options) # :nodoc:
       options.sort_by { |opt|
         opt.select { |o| o =~ /^-/ }.map { |o| o.downcase }.sort.reverse
       }
@@ -349,11 +378,11 @@ module Rake
 
     # A list of all the standard options used in rake, suitable for
     # passing to OptionParser.
-    def standard_rake_options
+    def standard_rake_options # :nodoc:
       sort_options(
         [
           ['--all', '-A',
-            "Show all tasks, even uncommented ones",
+            "Show all tasks, even uncommented ones (in combination with -T or -D)",
             lambda { |value|
               options.show_all_tasks = value
             }
@@ -407,9 +436,17 @@ module Rake
           ],
           ['--jobs',  '-j [NUMBER]',
             "Specifies the maximum number of tasks to execute in parallel. " +
-            "(default is 2)",
+            "(default is number of CPU cores + 4)",
             lambda { |value|
-              options.thread_pool_size = [(value || 2).to_i, 2].max
+              if value.nil? || value == ''
+                value = FIXNUM_MAX
+              elsif value =~ /^\d+$/
+                value = value.to_i
+              else
+                value = Rake.suggested_thread_count
+              end
+              value = 1 if value < 1
+              options.thread_pool_size = value - 1
             }
           ],
           ['--job-stats [LEVEL]',
@@ -443,8 +480,8 @@ module Rake
             "Do not log messages to standard output.",
             lambda { |value| Rake.verbose(false) }
           ],
-          ['--rakefile', '-f [FILE]',
-            "Use FILE as the rakefile.",
+          ['--rakefile', '-f [FILENAME]',
+            "Use FILENAME as the rakefile to search for.",
             lambda { |value|
               value ||= ''
               @rakefiles.clear
@@ -545,14 +582,14 @@ module Rake
         ])
     end
 
-    def select_tasks_to_show(options, show_tasks, value)
+    def select_tasks_to_show(options, show_tasks, value) # :nodoc:
       options.show_tasks = show_tasks
       options.show_task_pattern = Regexp.new(value || '')
       Rake::TaskManager.record_task_metadata = true
     end
     private :select_tasks_to_show
 
-    def select_trace_output(options, trace_option, value)
+    def select_trace_output(options, trace_option, value) # :nodoc:
       value = value.strip unless value.nil?
       case value
       when 'stdout'
@@ -567,7 +604,7 @@ module Rake
     private :select_trace_output
 
     # Read and handle the command line options.
-    def handle_options
+    def handle_options # :nodoc:
       options.rakelib = ['rakelib']
       options.trace_output = $stderr
 
@@ -588,7 +625,7 @@ module Rake
 
     # 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=$")
+    def rake_require(file_name, paths=$LOAD_PATH, loaded=$") # :nodoc:
       fn = file_name + ".rake"
       return false if loaded.include?(fn)
       paths.each do |path|
@@ -602,7 +639,7 @@ module Rake
       fail LoadError, "Can't find #{file_name}"
     end
 
-    def find_rakefile_location
+    def find_rakefile_location # :nodoc:
       here = Dir.pwd
       until (fn = have_rakefile)
         Dir.chdir("..")
@@ -614,7 +651,7 @@ module Rake
       Dir.chdir(Rake.original_dir)
     end
 
-    def print_rakefile_directory(location)
+    def print_rakefile_directory(location) # :nodoc:
       $stderr.puts "(in #{Dir.pwd})" unless
         options.silent or original_dir == location
     end
@@ -645,13 +682,13 @@ module Rake
       load_imports
     end
 
-    def glob(path, &block)
+    def glob(path, &block) # :nodoc:
       FileList.glob(path.gsub("\\", '/')).each(&block)
     end
     private :glob
 
     # The directory path containing the system wide rakefiles.
-    def system_dir
+    def system_dir # :nodoc:
       @system_dir ||=
         begin
           if ENV['RAKE_SYSTEM']
@@ -677,7 +714,7 @@ module Rake
     # 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.
-    def collect_tasks
+    def collect_command_line_tasks # :nodoc:
       @top_level_tasks = []
       ARGV.each do |arg|
         if arg =~ /^(\w+)=(.*)$/m
@@ -691,28 +728,33 @@ module Rake
 
     # Default task name ("default").
     # (May be overridden by subclasses)
-    def default_task_name
+    def default_task_name # :nodoc:
       "default"
     end
 
     # Add a file to the list of files to be imported.
-    def add_import(fn)
+    def add_import(fn) # :nodoc:
       @pending_imports << fn
     end
 
     # Load the pending list of imported files.
-    def load_imports
+    def load_imports # :nodoc:
       while fn = @pending_imports.shift
         next if @imported.member?(fn)
         fn_task = lookup(fn) and fn_task.invoke
         ext = File.extname(fn)
         loader = @loaders[ext] || @default_loader
         loader.load(fn)
+        if fn_task = lookup(fn) and fn_task.needed?
+          fn_task.reenable
+          fn_task.invoke
+          loader.load(fn)
+        end
         @imported << fn
       end
     end
 
-    def rakefile_location(backtrace=caller)
+    def rakefile_location(backtrace=caller) # :nodoc:
       backtrace.map { |t| t[/([^:]+):/, 1] }
 
       re = /^#{@rakefile}$/