rake 0.9.6 → 10.0.0.beta.1

data/README.rdoc

@@ -31,6 +31,18 @@ Download and install rake with the following.
 
    gem install rake
 
+=== Normal Installation
+
+You can download the source tarball of the latest version of Rake from
+
+* http://rubyforge.org/project/showfiles.php?group_id=50
+
+Extract the tarball and run
+
+  % ruby install.rb
+
+from its distribution directory.
+
 == Usage
 
 === Simple Example

data/Rakefile

@@ -60,7 +60,6 @@ task :default => :test
 
 Rake::TestTask.new do |t|
   files = FileList['test/helper.rb', 'test/test_*.rb']
-  t.loader = :rake
   t.test_files = files
   t.libs << "."
   t.warning = true

data/doc/command_line_usage.rdoc

@@ -2,7 +2,7 @@
 
 Rake is invoked from the command line using:
 
-    % rake [options ...]  [VAR=VALUE ...]  [targets ...]
+   % rake [<em>options</em> ...]  [<em>VAR</em>=<em>VALUE</em>]  [<em>targets</em> ...]
 
 Options are:
 
@@ -11,18 +11,6 @@ Options are:
     during the execution of the <b>rake</b> command.  You can access
     the value by using ENV['<em>name</em>'].
 
-[<tt>--all</tt> (-A)]
-    Used in combination with the -T and -D options, will force
-    those options to show all the tasks, even the ones without comments.
-
-[<tt>--backtrace</tt>{=_output_} (-n)]
-    Enable a full backtrace (i.e. like --trace, but without the task
-    tracing details). The _output_ parameter is optional, but if
-    specified it controls where the backtrace output is sent. If
-    _output_ is <tt>stdout</tt>, then backtrace output is directed to
-    stardard output. If _output_ is <tt>stderr</tt>, or if it is
-    missing, then the backtrace output is sent to standard error.
-
 [<tt>--classic-namespace</tt> (-n)]
     Import the Task, FileTask, and FileCreateTask into the top-level
     scope to be compatible with older versions of Rake.  Alternatively
@@ -30,11 +18,6 @@ Options are:
     'rake/classic_namespace'</code> in your Rakefile to get the
     classic behavior.
 
-[<tt>--comments</tt>]
-    Used in combination with the -W options to force the output to
-    contain commented options only. This is the reverse of
-    <tt>--all</tt>.
-
 [<tt>--describe</tt> _pattern_ (-D)]
     Describe the tasks (matching optional PATTERN), then exit.
 
@@ -55,27 +38,14 @@ Options are:
     Display some help text and exit.
 
 [<tt>--jobs</tt> _number_  (-j)]
-    Specifies the number of active concurrent tasks used. The
-    suggested value is equal to the number of CPUs. The concurrent
-    tasks are used to execute the <tt>multitask</tt> prerequisites.
-    Also see the <tt>-m</tt> option which turns all tasks into
-    multitasks.
-
+    Specifies the maximum number of concurrent tasks. The suggested
+    value is equal to the number of CPUs.
+    
     Sample values:
      (no -j) : unlimited concurrent tasks (standard rake behavior)
      -j      : 2 concurrent tasks (exact number may change)
      -j 16   : 16 concurrent tasks
 
-[<tt>--job-stats</tt> _level_]
-
-    Display job statistics at the completion of the run. By default,
-    this will display the requested number of active tasks (from the
-    -j options) and the maximum number of tasks in play at any given
-    time.
-
-    If the optional _level_ is <tt>history</tt>, then a complete trace
-    of task history will be displayed on standard output.
-
 [<tt>--libdir</tt> _directory_  (-I)]
     Add _directory_ to the list of directories searched for require.
 
@@ -102,16 +72,6 @@ Options are:
 [<tt>--rakelibdir</tt> _rakelibdir_ (-R)]
     Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')
 
-[<tt>--reduce-compat</tt>]
-
-    Remove the DSL commands from the Object inheritance hierarchy and
-    do not define top level constants. This reduces the backwards
-    compatibility of Rake, but allows rake to be used with software
-    that would otherwise have conflicting definitions.
-
-    *NOTE:* The next major version of Rake will only be able to be run
-    in "reduce-compat" mode.
-
 [<tt>--require</tt> _name_ (-r)]
     Require _name_ before executing the Rakefile.
 
@@ -121,11 +81,6 @@ Options are:
 [<tt>--silent (-s)</tt>]
     Like --quiet, but also suppresses the 'in directory' announcement.
 
-[<tt>--suppress-backtrace _pattern_ </tt>]
-    Line matching the regular expression _pattern_ will be removed
-    from the backtrace output. Note that the --backtrace option is the
-    full backtrace without these lines suppressed.
-
 [<tt>--system</tt> (-g)]
     Use the system wide (global) rakefiles. The project Rakefile is
     ignored. By default, the system wide rakefiles are used only if no
@@ -142,13 +97,19 @@ Options are:
     are defined using the "desc" command.  If a pattern is given, then
     only tasks matching the pattern are displayed.
 
-[<tt>--trace</tt>{=_output_} (-t)]
+[<tt>--no-top-level-dsl</tt> (-X)]
+    Do not put the Rake DSL commands into the top level scope.
+
+[<tt>--top-level-dsl</tt>]
+    Put the Rake DSL commands into the top level scope (default).
+
+    NOTE: Although currently Rake defaults to its DSL in the top level
+    scope, the plan is to deprecate this in the future and default ot
+    having the DSL commands *not* appear in the top level scope.
+
+[<tt>--trace</tt> (-t)]
     Turn on invoke/execute tracing. Also enable full backtrace on
-    errors. The _output_ parameter is optional, but if specified it
-    controls where the trace output is sent. If _output_ is
-    <tt>stdout</tt>, then trace output is directed to stardard output.
-    If _output_ is <tt>stderr</tt>, or if it is missing, then trace
-    output is sent to standard error.
+    errors.
 
 [<tt>--verbose</tt> (-v)]
     Echo the Sys commands to standard output.
@@ -158,11 +119,7 @@ Options are:
 
 [<tt>--where</tt> <em>pattern</em> (-W)]
     Display tasks that match <em>pattern</em> and the file and line
-    number where the task is defined. By default this option will
-    display all tasks, not just the tasks that have descriptions.
-
-[<tt>--no-deprecation-warnings</tt> (-W)]
-    Do not display the deprecation warnings.
+    number where the task is defined.
 
 In addition, any command line option of the form
 <em>VAR</em>=<em>VALUE</em> will be added to the environment hash

data/doc/release_notes/rake-0.9.3.rdoc

@@ -1,59 +1,17 @@
 = Rake 0.9.3 Released
 
-Rake version 0.9.3 contains some new, backwards compatible features and
-a number of bug fixes.
+Rake version 0.9.3 is mainly bug fixes.
 
 == Changes
 
-=== New Features
-
-* 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
-
-* 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.
+* The rake test loader now removes arguments it has processed.  Issue #51
+* Rake::TaskArguments now responds to #values_at
+* RakeFileUtils.verbose_flag = nil silences output the same as 0.8.7
+* Rake tests are now directory-independent
+* Rake tests are no longer require flexmock
+* Commands constant is no longer polluting top level namespace.
+* Show only the interesting portion of the backtrace by default (James M. Lawrence).
+* Added --reduce-compat optiont to remove backward compatible DSL hacks (James M. Lawrence).
 
 == What is Rake
 
@@ -70,7 +28,7 @@ The easiest way to get and install rake is via RubyGems ...
 
 Otherwise, you can get it from the more traditional places:
 
-Home Page:: http://github.com/jimweirich/rake
+Home Page:: http://rake.rubyforge.org/
 Download::  http://rubyforge.org/project/showfiles.php?group_id=50
 GitHub::    git://github.com/jimweirich/rake.git
 
@@ -80,23 +38,18 @@ As usual, it was input from users that drove a alot of these changes. The
 following people either contributed patches, made suggestions or made
 otherwise helpful comments.  Thanks to ...
 
-* Aaron Patterson
-* Dylan Smith
-* Jo Liss
-* Jonas Pfenniger
-* Kazuki Tsujimoto
-* Michael Bishop
-* Michael Elufimov
-* NAKAMURA Usaku
-* Ryan Davis
-* Sam Grönblom
-* Sam Phippen
-* Sergio Wong
-* Tay Ray Chuan
-* grosser
-* quix
-
-Also, many thanks to Eric Hodel for assisting with getting this release
-out the door.
+* James M. Lawrence (quix)
+* Roger Pack
+* Cezary Baginski
+* Sean Scot August Moon
+* R.T. Lechow
+* Alex Chaffee
+* James Tucker
+* Matthias Lüdtke
+* Santiago Pastorino
+
+Also, bit thanks to Eric Hodel for assisting with getting this release
+out the door (where "assisting" includes, but is not by any means
+limited to, "pushing" me to get it done).
 
 -- Jim Weirich

data/lib/rake.rb

@@ -43,7 +43,6 @@ require 'rake/win32'
 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'

data/lib/rake/application.rb

@@ -2,10 +2,8 @@ require 'shellwords'
 require 'optparse'
 
 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
@@ -18,7 +16,6 @@ module Rake
   #
   class Application
     include TaskManager
-    include TraceOutput
 
     # The name of the application (typically 'rake')
     attr_reader :name
@@ -61,7 +58,7 @@ module Rake
     #
     # * Initialize the command line options (+init+).
     # * Define the tasks (+load_rakefile+).
-    # * Run the top level tasks (+top_level+).
+    # * Run the top level tasks (+run_tasks+).
     #
     # If you wish to build a custom rake command, you should call
     # +init+ on your application.  Then define any tasks.  Finally,
@@ -70,7 +67,15 @@ module Rake
       standard_exception_handling do
         init
         load_rakefile
+        thread_pool.gather_history if options.job_stats == :history
         top_level
+        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]}"
+        end
+        ThreadHistoryDisplay.new(thread_pool.history).show if options.job_stats == :history
       end
     end
 
@@ -92,30 +97,13 @@ module Rake
 
     # Run the top level tasks of a Rake application.
     def top_level
-      run_with_threads do
-        if options.show_tasks
-          display_tasks_and_comments
-        elsif options.show_prereqs
-          display_prerequisites
-        else
-          top_level_tasks.each { |task_name| invoke_task(task_name) }
-        end
-      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]}"
-        puts "Total threads in play:  #{stats[:total_threads_in_play]}"
+      if options.show_tasks
+        display_tasks_and_comments
+      elsif options.show_prereqs
+        display_prerequisites
+      else
+        top_level_tasks.each { |task_name| invoke_task(task_name) }
       end
-      ThreadHistoryDisplay.new(thread_pool.history).show if options.job_stats == :history
     end
 
     # Add a loader to handle imported files ending in the extension
@@ -178,7 +166,7 @@ module Rake
       if options.backtrace
         trace ex.backtrace.join("\n")
       else
-        trace Backtrace.collapse(ex.backtrace).join("\n")
+        trace Backtrace.collapse(ex.backtrace)
       end
       trace "Tasks: #{ex.chain}" if has_chain?(ex)
       trace "(See full trace by running task with --trace)" unless options.backtrace
@@ -190,6 +178,7 @@ module Rake
     #    Rake.application.deprecate("import", "Rake.import", caller.first)
     #
     def deprecate(old_usage, new_usage, call_site)
+      fail "GONE"
       return if options.ignore_deprecate
       $stderr.puts "WARNING: '#{old_usage}' is deprecated.  " +
         "Please use '#{new_usage}' instead.\n" +
@@ -207,7 +196,7 @@ module Rake
     def have_rakefile
       @rakefiles.each do |fn|
         if File.exist?(fn)
-          others = FileList.glob(fn, File::FNM_CASEFOLD)
+          others = Rake.glob(fn, File::FNM_CASEFOLD)
           return others.size == 1 ? others.first : fn
         elsif fn == ''
           return fn
@@ -316,9 +305,9 @@ module Rake
       end
     end
 
-    def trace(*strings)
+    def trace(*str)
       options.trace_output ||= $stderr
-      trace_on(options.trace_output, *strings)
+      options.trace_output.puts(*str)
     end
 
     def sort_options(options)
@@ -338,18 +327,12 @@ module Rake
               options.show_all_tasks = value
             }
           ],
-          ['--backtrace=[OUT]', "Enable full backtrace.  OUT can be stderr (default) or stdout.",
+          ['--backtrace [OUT]', "Enable full backtrace.  OUT can be stderr (default) or stdout.",
             lambda { |value|
               options.backtrace = true
               select_trace_output(options, 'backtrace', value)
             }
           ],
-          ['--classic-namespace', '-C', "Put Task and FileTask in the top level namespace",
-            lambda { |value|
-              require 'rake/classic_namespace'
-              options.classic_namespace = true
-            }
-          ],
           ['--comments', "Show commented tasks only",
             lambda { |value|
               options.show_all_tasks = !value
@@ -469,7 +452,7 @@ module Rake
               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.",
+          ['--trace', '-t [OUT]', "Turn on invoke/execute tracing, enable full backtrace. OUT can be stderr (default) or stdout.",
             lambda { |value|
               options.trace = true
               options.backtrace = true
@@ -538,16 +521,6 @@ module Rake
         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
     end
 
     # Similar to the regular Ruby +require+ command, but will check
@@ -600,7 +573,6 @@ 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 != ''
         options.rakelib.each do |rlib|
           glob("#{rlib}/*.rake") do |name|
@@ -612,7 +584,7 @@ module Rake
     end
 
     def glob(path, &block)
-      FileList.glob(path.gsub("\\", '/')).each(&block)
+      Rake.glob(path.gsub("\\", '/')).each(&block)
     end
     private :glob
 
@@ -674,18 +646,6 @@ module Rake
       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] }