rake 0.9.2 → 13.0.3

data/exe/rake

@@ -0,0 +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.
+#++
+
+require "rake"
+
+Rake.application.run

data/lib/rake.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
 #--
-
 # Copyright 2003-2010 by Jim Weirich (jim.weirich@gmail.com)
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -21,44 +21,50 @@
 # IN THE SOFTWARE.
 #++
 
-require 'rake/version'
+module Rake; end
 
-RAKEVERSION = Rake::VERSION
+require "rake/version"
 
-require 'rbconfig'
-require 'fileutils'
-require 'singleton'
-require 'monitor'
-require 'optparse'
-require 'ostruct'
+require "rbconfig"
+require "fileutils"
+require "singleton"
+require "monitor"
+require "optparse"
+require "ostruct"
 
-require 'rake/ext/module'
-require 'rake/ext/string'
-require 'rake/ext/time'
+require "rake/ext/string"
 
-require 'rake/win32'
+require "rake/win32"
 
-require 'rake/task_argument_error'
-require 'rake/rule_recursion_overflow_error'
-require 'rake/rake_module'
-require 'rake/pseudo_status'
-require 'rake/task_arguments'
-require 'rake/invocation_chain'
-require 'rake/task'
-require 'rake/file_task'
-require 'rake/file_creation_task'
-require 'rake/multi_task'
-require 'rake/dsl_definition'
-require 'rake/file_utils_ext'
-require 'rake/file_list'
-require 'rake/default_loader'
-require 'rake/early_time'
-require 'rake/name_space'
-require 'rake/task_manager'
-require 'rake/application'
+require "rake/linked_list"
+require "rake/cpu_counter"
+require "rake/scope"
+require "rake/task_argument_error"
+require "rake/rule_recursion_overflow_error"
+require "rake/rake_module"
+require "rake/trace_output"
+require "rake/pseudo_status"
+require "rake/task_arguments"
+require "rake/invocation_chain"
+require "rake/task"
+require "rake/file_task"
+require "rake/file_creation_task"
+require "rake/multi_task"
+require "rake/dsl_definition"
+require "rake/file_utils_ext"
+require "rake/file_list"
+require "rake/default_loader"
+require "rake/early_time"
+require "rake/late_time"
+require "rake/name_space"
+require "rake/task_manager"
+require "rake/application"
+require "rake/backtrace"
 
 $trace = false
 
+# :stopdoc:
+#
 # Some top level Constants.
 
 FileList = Rake::FileList

data/lib/rake/application.rb

@@ -1,17 +1,24 @@
-require 'shellwords'
-require 'optparse'
+# frozen_string_literal: true
+require "optparse"
 
-require 'rake/task_manager'
-require 'rake/win32'
+require "rake/task_manager"
+require "rake/file_list"
+require "rake/thread_pool"
+require "rake/thread_history_display"
+require "rake/trace_output"
+require "rake/win32"
 
 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
 
     # The name of the application (typically 'rake')
     attr_reader :name
@@ -22,15 +29,26 @@ module Rake
     # Name of the actual rakefile used.
     attr_reader :rakefile
 
+    # Number of columns on the terminal
+    attr_accessor :terminal_columns
+
     # 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
+    # Override the detected TTY output state (mostly for testing)
+    attr_writer :tty_output
+
+    DEFAULT_RAKEFILES = [
+      "rakefile",
+      "Rakefile",
+      "rakefile.rb",
+      "Rakefile.rb"
+    ].freeze
 
     # Initialize a Rake::Application object.
     def initialize
       super
-      @name = 'rake'
+      @name = "rake"
       @rakefiles = DEFAULT_RAKEFILES.dup
       @rakefile = nil
       @pending_imports = []
@@ -39,10 +57,13 @@ module Rake
       @default_loader = Rake::DefaultLoader.new
       @original_dir = Dir.pwd
       @top_level_tasks = []
-      add_loader('rb', DefaultLoader.new)
-      add_loader('rf', DefaultLoader.new)
-      add_loader('rake', DefaultLoader.new)
+      add_loader("rb", DefaultLoader.new)
+      add_loader("rf", DefaultLoader.new)
+      add_loader("rake", DefaultLoader.new)
       @tty_output = STDOUT.tty?
+      @terminal_columns = ENV["RAKE_COLUMNS"].to_i
+
+      set_default_options
     end
 
     # Run the Rake application.  The run method performs the following
@@ -50,25 +71,30 @@ module Rake
     #
     # * Initialize the command line options (+init+).
     # * Define the tasks (+load_rakefile+).
-    # * Run the top level tasks (+run_tasks+).
+    # * Run the top level tasks (+top_level+).
     #
     # If you wish to build a custom rake command, you should call
     # +init+ on your application.  Then define any tasks.  Finally,
     # call +top_level+ to run your top level tasks.
-    def run
+    def run(argv = ARGV)
       standard_exception_handling do
-        init
+        init "rake", argv
         load_rakefile
         top_level
       end
     end
 
     # Initialize the command line parameters and app name.
-    def init(app_name='rake')
+    def init(app_name="rake", argv = ARGV)
       standard_exception_handling do
         @name = app_name
-        handle_options
-        collect_tasks
+        begin
+          args = handle_options argv
+        rescue ArgumentError
+          # Backward compatibility for capistrano
+          args = handle_options
+        end
+        collect_command_line_tasks(args)
       end
     end
 
@@ -81,7 +107,7 @@ module Rake
 
     # Run the top level tasks of a Rake application.
     def top_level
-      standard_exception_handling do
+      run_with_threads do
         if options.show_tasks
           display_tasks_and_comments
         elsif options.show_prereqs
@@ -92,6 +118,22 @@ module Rake
       end
     end
 
+    # Run the given block with the thread startup and shutdown.
+    def run_with_threads
+      thread_pool.gather_history if options.job_stats == :history
+
+      yield
+
+      thread_pool.join
+      if options.job_stats
+        stats = thread_pool.statistics
+        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
+    end
+
     # Add a loader to handle imported files ending in the extension
     # +ext+.
     def add_loader(ext, loader)
@@ -104,53 +146,108 @@ module Rake
       @options ||= OpenStruct.new
     end
 
-    # private ----------------------------------------------------------------
+    # Return the thread pool used for multithreaded processing.
+    def thread_pool             # :nodoc:
+      @thread_pool ||= ThreadPool.new(options.thread_pool_size || Rake.suggested_thread_count-1)
+    end
+
+    # 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:
+      /^([^\[]+)(?:\[(.*)\])$/ =~ string.to_s
+
+      name           = $1
+      remaining_args = $2
+
+      return string, [] unless name
+      return name,   [] if     remaining_args.empty?
+
+      args = []
+
+      begin
+        /\s*((?:[^\\,]|\\.)*?)\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
-      begin
-        yield
-      rescue SystemExit => ex
-        # Exit silently with current status
-        raise
-      rescue OptionParser::InvalidOption => ex
-        $stderr.puts ex.message
-        exit(false)
-      rescue Exception => ex
-        # Exit with error message
-        display_error_message(ex)
-        exit(false)
-      end
+    def standard_exception_handling # :nodoc:
+      yield
+    rescue SystemExit
+      # Exit silently with current status
+      raise
+    rescue OptionParser::InvalidOption => ex
+      $stderr.puts ex.message
+      exit(false)
+    rescue Exception => ex
+      # Exit with error message
+      display_error_message(ex)
+      exit_because_of_exception(ex)
+    end
+
+    # Exit the program because of an unhandled exception.
+    # (may be overridden by subclasses)
+    def exit_because_of_exception(ex) # :nodoc:
+      exit(false)
     end
 
     # Display the error message that caused the exception.
-    def display_error_message(ex)
-      $stderr.puts "#{name} aborted!"
-      $stderr.puts ex.message
-      if options.trace
-        $stderr.puts ex.backtrace.join("\n")
+    def display_error_message(ex) # :nodoc:
+      trace "#{name} aborted!"
+      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_details_seen << ex
+
+      display_exception_message_details(ex)
+      display_exception_backtrace(ex)
+      display_cause_details(ex.cause) if has_cause?(ex)
+    end
+
+    def display_cause_details(ex) # :nodoc:
+      return if display_exception_details_seen.include? ex
+
+      trace "\nCaused by:"
+      display_exception_details(ex)
+    end
+
+    def display_exception_details_seen # :nodoc:
+      Thread.current[:rake_display_exception_details_seen] ||= []
+    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
-        $stderr.puts rakefile_location(ex.backtrace)
+        trace Backtrace.collapse(ex.backtrace).join("\n")
       end
-      $stderr.puts "Tasks: #{ex.chain}" if has_chain?(ex)
-      $stderr.puts "(See full trace by running task with --trace)" unless options.trace
     end
 
     # Warn about deprecated usage.
@@ -158,27 +255,28 @@ module Rake
     # Example:
     #    Rake.application.deprecate("import", "Rake.import", caller.first)
     #
-    def deprecate(old_usage, new_usage, call_site)
-      return if options.ignore_deprecate
-      $stderr.puts "WARNING: '#{old_usage}' is deprecated.  " +
-        "Please use '#{new_usage}' instead.\n" +
-        "    at #{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" +
+          "    at #{call_site}"
+      end
     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 = Dir.glob(fn, File::FNM_CASEFOLD)
+          others = FileList.glob(fn, File::FNM_CASEFOLD)
           return others.size == 1 ? others.first : fn
-        elsif fn == ''
+        elsif fn == ""
           return fn
         end
       end
@@ -186,38 +284,41 @@ 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 )
-      @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?
-      tty_output? || ENV['RAKE_COLUMNS']
+    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|
-        t.comment && t.name =~ options.show_task_pattern
+        (options.show_all_tasks || t.comment) &&
+          t.name =~ options.show_task_pattern
       }
       case options.show_tasks
       when :tasks
-        width = displayable_tasks.collect { |t| t.name_with_args.length }.max || 10
-        max_column = truncate_output? ? terminal_width - name.size - width - 7 : nil
+        width = displayable_tasks.map { |t| t.name_with_args.length }.max || 10
+        if truncate_output?
+          max_column = terminal_width - name.size - width - 7
+        else
+          max_column = nil
+        end
+
         displayable_tasks.each do |t|
-          printf "#{name} %-#{width}s  # %s\n",
-            t.name_with_args, max_column ? truncate(t.comment, max_column) : t.comment
+          printf("#{name} %-#{width}s  # %s\n",
+            t.name_with_args,
+            max_column ? truncate(t.comment, max_column) : t.comment)
         end
       when :describe
         displayable_tasks.each do |t|
           puts "#{name} #{t.name_with_args}"
-          t.full_comment.split("\n").each do |line|
+          comment = t.full_comment || ""
+          comment.split("\n").each do |line|
             puts "    #{line}"
           end
           puts
@@ -225,7 +326,7 @@ module Rake
       when :lines
         displayable_tasks.each do |t|
           t.locations.each do |loc|
-            printf "#{name} %-30s %s\n",t.name_with_args, loc
+            printf "#{name} %-30s %s\n", t.name_with_args, loc
           end
         end
       else
@@ -233,9 +334,9 @@ module Rake
       end
     end
 
-    def terminal_width
-      if ENV['RAKE_COLUMNS']
-        result = ENV['RAKE_COLUMNS'].to_i
+    def terminal_width # :nodoc:
+      if @terminal_columns.nonzero?
+        result = @terminal_columns
       else
         result = unix? ? dynamic_width : 80
       end
@@ -245,179 +346,299 @@ 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?
-      RbConfig::CONFIG['host_os'] =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
+    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)
-      if string.length <= width
+    def truncate(string, width) # :nodoc:
+      if string.nil?
+        ""
+      elsif string.length <= width
         string
       else
-        ( string[0, width-3] || "" ) + "..."
+        (string[0, width - 3] || "") + "..."
       end
     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) # :nodoc:
+      options.trace_output ||= $stderr
+      trace_on(options.trace_output, *strings)
+    end
+
+    def sort_options(options) # :nodoc:
+      options.sort_by { |opt|
+        opt.select { |o| o.is_a?(String) && o =~ /^-/ }.map(&:downcase).sort.reverse
+      }
+    end
+    private :sort_options
+
     # A list of all the standard options used in rake, suitable for
     # passing to OptionParser.
-    def standard_rake_options
-      [
-        ['--classic-namespace', '-C', "Put Task and FileTask in the top level namespace",
-          lambda { |value|
-            require 'rake/classic_namespace'
-            options.classic_namespace = true
-          }
-        ],
-        ['--describe', '-D [PATTERN]', "Describe the tasks (matching optional PATTERN), then exit.",
-          lambda { |value|
-            options.show_tasks = :describe
-            options.show_task_pattern = Regexp.new(value || '')
-            TaskManager.record_task_metadata = true
-          }
-        ],
-        ['--dry-run', '-n', "Do a dry run without executing actions.",
-          lambda { |value|
-            Rake.verbose(true)
-            Rake.nowrite(true)
-            options.dryrun = true
-            options.trace = true
-          }
-        ],
-        ['--execute',  '-e CODE', "Execute some Ruby code and exit.",
-          lambda { |value|
-            eval(value)
-            exit
-          }
-        ],
-        ['--execute-print',  '-p CODE', "Execute some Ruby code, print the result, then exit.",
-          lambda { |value|
-            puts eval(value)
-            exit
-          }
-        ],
-        ['--execute-continue',  '-E CODE',
-          "Execute some Ruby code, then continue with normal task processing.",
-          lambda { |value| eval(value) }
-        ],
-        ['--libdir', '-I LIBDIR', "Include LIBDIR in the search path for required modules.",
-          lambda { |value| $:.push(value) }
-        ],
-        ['--no-search', '--nosearch', '-N', "Do not search parent directories for the Rakefile.",
-          lambda { |value| options.nosearch = true }
-        ],
-        ['--prereqs', '-P', "Display the tasks and dependencies, then exit.",
-          lambda { |value| options.show_prereqs = true }
-        ],
-        ['--quiet', '-q', "Do not log messages to standard output.",
-          lambda { |value| Rake.verbose(false) }
-        ],
-        ['--rakefile', '-f [FILE]', "Use FILE as the rakefile.",
-          lambda { |value|
-            value ||= ''
-            @rakefiles.clear
-            @rakefiles << value
-          }
-        ],
-        ['--rakelibdir', '--rakelib', '-R RAKELIBDIR',
-          "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')",
-          lambda { |value| options.rakelib = value.split(':') }
-        ],
-        ['--require', '-r MODULE', "Require MODULE before executing rakefile.",
-          lambda { |value|
-            begin
-              require value
-            rescue LoadError => ex
+    def standard_rake_options # :nodoc:
+      sort_options(
+        [
+          ["--all", "-A",
+            "Show all tasks, even uncommented ones (in combination with -T or -D)",
+            lambda { |value|
+              options.show_all_tasks = value
+            }
+          ],
+          ["--backtrace=[OUT]",
+            "Enable full backtrace.  OUT can be stderr (default) or stdout.",
+            lambda { |value|
+              options.backtrace = true
+              select_trace_output(options, "backtrace", value)
+            }
+          ],
+          ["--build-all", "-B",
+           "Build all prerequisites, including those which are up-to-date.",
+           lambda { |value|
+             options.build_all = true
+           }
+          ],
+          ["--comments",
+            "Show commented tasks only",
+            lambda { |value|
+              options.show_all_tasks = !value
+            }
+          ],
+          ["--describe", "-D [PATTERN]",
+            "Describe the tasks (matching optional PATTERN), then exit.",
+            lambda { |value|
+              select_tasks_to_show(options, :describe, value)
+            }
+          ],
+          ["--dry-run", "-n",
+            "Do a dry run without executing actions.",
+            lambda { |value|
+              Rake.verbose(true)
+              Rake.nowrite(true)
+              options.dryrun = true
+              options.trace = true
+            }
+          ],
+          ["--execute", "-e CODE",
+            "Execute some Ruby code and exit.",
+            lambda { |value|
+              eval(value)
+              exit
+            }
+          ],
+          ["--execute-print", "-p CODE",
+            "Execute some Ruby code, print the result, then exit.",
+            lambda { |value|
+              puts eval(value)
+              exit
+            }
+          ],
+          ["--execute-continue",  "-E CODE",
+            "Execute some Ruby code, " +
+            "then continue with normal task processing.",
+            lambda { |value| eval(value) }
+          ],
+          ["--jobs",  "-j [NUMBER]",
+            "Specifies the maximum number of tasks to execute in parallel. " +
+            "(default is number of CPU cores + 4)",
+            lambda { |value|
+              if value.nil? || value == ""
+                value = Float::INFINITY
+              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]",
+            "Display job statistics. " +
+            "LEVEL=history displays a complete job list",
+            lambda { |value|
+              if value =~ /^history/i
+                options.job_stats = :history
+              else
+                options.job_stats = true
+              end
+            }
+          ],
+          ["--libdir", "-I LIBDIR",
+            "Include LIBDIR in the search path for required modules.",
+            lambda { |value| $:.push(value) }
+          ],
+          ["--multitask", "-m",
+            "Treat all tasks as multitasks.",
+            lambda { |value| options.always_multitask = true }
+          ],
+          ["--no-search", "--nosearch",
+            "-N", "Do not search parent directories for the Rakefile.",
+            lambda { |value| options.nosearch = true }
+          ],
+          ["--prereqs", "-P",
+            "Display the tasks and dependencies, then exit.",
+            lambda { |value| options.show_prereqs = true }
+          ],
+          ["--quiet", "-q",
+            "Do not log messages to standard output.",
+            lambda { |value| Rake.verbose(false) }
+          ],
+          ["--rakefile", "-f [FILENAME]",
+            "Use FILENAME as the rakefile to search for.",
+            lambda { |value|
+              value ||= ""
+              @rakefiles.clear
+              @rakefiles << value
+            }
+          ],
+          ["--rakelibdir", "--rakelib", "-R RAKELIBDIR",
+            "Auto-import any .rake files in RAKELIBDIR. " +
+            "(default is 'rakelib')",
+            lambda { |value|
+              options.rakelib = value.split(File::PATH_SEPARATOR)
+            }
+          ],
+          ["--require", "-r MODULE",
+            "Require MODULE before executing rakefile.",
+            lambda { |value|
               begin
-                rake_require value
-              rescue LoadError
-                raise ex
+                require value
+              rescue LoadError => ex
+                begin
+                  rake_require value
+                rescue LoadError
+                  raise ex
+                end
               end
-            end
-          }
-        ],
-        ['--rules', "Trace the rules resolution.",
-          lambda { |value| options.trace_rules = true }
-        ],
-        ['--silent', '-s', "Like --quiet, but also suppresses the 'in directory' announcement.",
-          lambda { |value|
-            Rake.verbose(false)
-            options.silent = true
-          }
-        ],
-        ['--system',  '-g',
-          "Using system wide (global) rakefiles (usually '~/.rake/*.rake').",
-          lambda { |value| options.load_system = true }
-        ],
-        ['--no-system', '--nosystem', '-G',
-          "Use standard project Rakefile search paths, ignore system wide rakefiles.",
-          lambda { |value| options.ignore_system = true }
-        ],
-        ['--tasks', '-T [PATTERN]', "Display the tasks (matching optional PATTERN) with descriptions, then exit.",
-          lambda { |value|
-            options.show_tasks = :tasks
-            options.show_task_pattern = Regexp.new(value || '')
-            Rake::TaskManager.record_task_metadata = true
-          }
-        ],
-        ['--trace', '-t', "Turn on invoke/execute tracing, enable full backtrace.",
-          lambda { |value|
-            options.trace = true
-            Rake.verbose(true)
-          }
-        ],
-        ['--verbose', '-v', "Log message to standard output.",
-          lambda { |value| Rake.verbose(true) }
-        ],
-        ['--version', '-V', "Display the program version.",
-          lambda { |value|
-            puts "rake, version #{RAKEVERSION}"
-            exit
-          }
-        ],
-        ['--where', '-W [PATTERN]', "Describe the tasks (matching optional PATTERN), then exit.",
-          lambda { |value|
-            options.show_tasks = :lines
-            options.show_task_pattern = Regexp.new(value || '')
-            Rake::TaskManager.record_task_metadata = true
-          }
-        ],
-        ['--no-deprecation-warnings', '-X', "Disable the deprecation warnings.",
-          lambda { |value|
-            options.ignore_deprecate = true
-          }
-        ],
-      ]
-    end
-
-    # Read and handle the command line options.
-    def handle_options
-      options.rakelib = ['rakelib']
+            }
+          ],
+          ["--rules",
+            "Trace the rules resolution.",
+            lambda { |value| options.trace_rules = true }
+          ],
+          ["--silent", "-s",
+            "Like --quiet, but also suppresses the " +
+            "'in directory' announcement.",
+            lambda { |value|
+              Rake.verbose(false)
+              options.silent = true
+            }
+          ],
+          ["--suppress-backtrace PATTERN",
+            "Suppress backtrace lines matching regexp PATTERN. " +
+            "Ignored if --trace is on.",
+            lambda { |value|
+              options.suppress_backtrace_pattern = Regexp.new(value)
+            }
+          ],
+          ["--system",  "-g",
+            "Using system wide (global) rakefiles " +
+            "(usually '~/.rake/*.rake').",
+            lambda { |value| options.load_system = true }
+          ],
+          ["--no-system", "--nosystem", "-G",
+            "Use standard project Rakefile search paths, " +
+            "ignore system wide rakefiles.",
+            lambda { |value| options.ignore_system = true }
+          ],
+          ["--tasks", "-T [PATTERN]",
+            "Display the tasks (matching optional PATTERN) " +
+            "with descriptions, then exit. " +
+            "-AT combination displays all of tasks contained no description.",
+            lambda { |value|
+              select_tasks_to_show(options, :tasks, value)
+            }
+          ],
+          ["--trace=[OUT]", "-t",
+            "Turn on invoke/execute tracing, enable full backtrace. " +
+            "OUT can be stderr (default) or stdout.",
+            lambda { |value|
+              options.trace = true
+              options.backtrace = true
+              select_trace_output(options, "trace", value)
+              Rake.verbose(true)
+            }
+          ],
+          ["--verbose", "-v",
+            "Log message to standard output.",
+            lambda { |value| Rake.verbose(true) }
+          ],
+          ["--version", "-V",
+            "Display the program version.",
+            lambda { |value|
+              puts "rake, version #{Rake::VERSION}"
+              exit
+            }
+          ],
+          ["--where", "-W [PATTERN]",
+            "Describe the tasks (matching optional PATTERN), then exit.",
+            lambda { |value|
+              select_tasks_to_show(options, :lines, value)
+              options.show_all_tasks = true
+            }
+          ],
+          ["--no-deprecation-warnings", "-X",
+            "Disable the deprecation warnings.",
+            lambda { |value|
+              options.ignore_deprecate = true
+            }
+          ],
+        ])
+    end
+
+    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) # :nodoc:
+      value = value.strip unless value.nil?
+      case value
+      when "stdout"
+        options.trace_output = $stdout
+      when "stderr", nil
+        options.trace_output = $stderr
+      else
+        fail CommandLineOptionError,
+          "Unrecognized --#{trace_option} option '#{value}'"
+      end
+    end
+    private :select_trace_output
+
+    # Read and handle the command line options.  Returns the command line
+    # arguments that we didn't understand, which should (in theory) be just
+    # task names and env vars.
+    def handle_options(argv) # :nodoc:
+      set_default_options
 
       OptionParser.new do |opts|
-        opts.banner = "rake [-f rakefile] {options} targets..."
+        opts.banner = "#{Rake.application.name} [-f rakefile] {options} targets..."
         opts.separator ""
         opts.separator "Options are ..."
 
@@ -427,23 +648,13 @@ module Rake
         end
 
         standard_rake_options.each { |args| opts.on(*args) }
-        opts.environment('RAKEOPT')
-      end.parse!
-
-      # If class namespaces are requested, set the global options
-      # according to the values in the options structure.
-      if options.classic_namespace
-        $show_tasks = options.show_tasks
-        $show_prereqs = options.show_prereqs
-        $trace = options.trace
-        $dryrun = options.dryrun
-        $silent = options.silent
-      end
+        opts.environment("RAKEOPT")
+      end.parse(argv)
     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=$")
+    def rake_require(file_name, paths=$LOAD_PATH, loaded=$") # :nodoc:
       fn = file_name + ".rake"
       return false if loaded.include?(fn)
       paths.each do |path|
@@ -457,13 +668,11 @@ module Rake
       fail LoadError, "Can't find #{file_name}"
     end
 
-    def find_rakefile_location
+    def find_rakefile_location # :nodoc:
       here = Dir.pwd
-      while ! (fn = have_rakefile)
+      until (fn = have_rakefile)
         Dir.chdir("..")
-        if Dir.pwd == here || options.nosearch
-          return nil
-        end
+        return nil if Dir.pwd == here || options.nosearch
         here = Dir.pwd
       end
       [fn, here]
@@ -471,14 +680,14 @@ 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
 
     def raw_load_rakefile # :nodoc:
       rakefile, location = find_rakefile_location
-      if (! options.ignore_system) &&
+      if (!options.ignore_system) &&
           (options.load_system || rakefile.nil?) &&
           system_dir && File.directory?(system_dir)
         print_rakefile_directory(location)
@@ -491,8 +700,8 @@ module Rake
         @rakefile = rakefile
         Dir.chdir(location)
         print_rakefile_directory(location)
-        $rakefile = @rakefile if options.classic_namespace
-        Rake.load_rakefile(File.expand_path(@rakefile)) if @rakefile && @rakefile != ''
+        Rake.load_rakefile(File.expand_path(@rakefile)) if
+          @rakefile && @rakefile != ""
         options.rakelib.each do |rlib|
           glob("#{rlib}/*.rake") do |name|
             add_import name
@@ -502,17 +711,17 @@ module Rake
       load_imports
     end
 
-    def glob(path, &block)
-      Dir[path.gsub("\\", '/')].each(&block)
+    def glob(path, &block) # :nodoc:
+      FileList.glob(path.tr("\\", "/")).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']
-            ENV['RAKE_SYSTEM']
+          if ENV["RAKE_SYSTEM"]
+            ENV["RAKE_SYSTEM"]
           else
             standard_system_dir
           end
@@ -526,7 +735,7 @@ module Rake
       end
     else
       def standard_system_dir #:nodoc:
-        File.join(File.expand_path('~'), '.rake')
+        File.join(File.expand_path("~"), ".rake")
       end
     end
     private :standard_system_dir
@@ -534,56 +743,82 @@ 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
+    #
+    # `args` is the list of arguments to peruse to get the list of tasks.
+    # It should be the command line that was given to rake, less any
+    # recognised command-line options, which OptionParser.parse will
+    # have taken care of already.
+    def collect_command_line_tasks(args) # :nodoc:
       @top_level_tasks = []
-      ARGV.each do |arg|
-        if arg =~ /^(\w+)=(.*)$/
+      args.each do |arg|
+        if arg =~ /^(\w+)=(.*)$/m
           ENV[$1] = $2
         else
           @top_level_tasks << arg unless arg =~ /^-/
         end
       end
-      @top_level_tasks.push("default") if @top_level_tasks.size == 0
+      @top_level_tasks.push(default_task_name) if @top_level_tasks.empty?
+    end
+
+    # Default task name ("default").
+    # (May be overridden by subclasses)
+    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)
-        if fn_task = lookup(fn)
-          fn_task.invoke
-        end
+        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
 
-    # Warn about deprecated use of top level constant names.
-    def const_warning(const_name)
-      @const_warning ||= false
-      if ! @const_warning
-        $stderr.puts %{WARNING: Deprecated reference to top-level constant '#{const_name}' } +
-          %{found at: #{rakefile_location}} # '
-        $stderr.puts %{    Use --classic-namespace on rake command}
-        $stderr.puts %{    or 'require "rake/classic_namespace"' in Rakefile}
-      end
-      @const_warning = true
-    end
-
-    def rakefile_location backtrace = caller
-      backtrace.map { |t| t[/([^:]+):/,1] }
+    def rakefile_location(backtrace=caller) # :nodoc:
+      backtrace.map { |t| t[/([^:]+):/, 1] }
 
       re = /^#{@rakefile}$/
       re = /#{re.source}/i if windows?
 
-      backtrace.find { |str| str =~ re } || ''
+      backtrace.find { |str| str =~ re } || ""
+    end
+
+    def set_default_options # :nodoc:
+      options.always_multitask           = false
+      options.backtrace                  = false
+      options.build_all                  = false
+      options.dryrun                     = false
+      options.ignore_deprecate           = false
+      options.ignore_system              = false
+      options.job_stats                  = false
+      options.load_system                = false
+      options.nosearch                   = false
+      options.rakelib                    = %w[rakelib]
+      options.show_all_tasks             = false
+      options.show_prereqs               = false
+      options.show_task_pattern          = nil
+      options.show_tasks                 = nil
+      options.silent                     = false
+      options.suppress_backtrace_pattern = nil
+      options.thread_pool_size           = Rake.suggested_thread_count
+      options.trace                      = false
+      options.trace_output               = $stderr
+      options.trace_rules                = false
     end
+
   end
 end