rake 10.1.1 → 10.2.0

data/lib/rake/task_arguments.rb

@@ -1,16 +1,16 @@
 module Rake
 
-  ####################################################################
+  ##
   # TaskArguments manage the arguments passed to a task.
   #
   class TaskArguments
     include Enumerable
 
+    # Argument names
     attr_reader :names
 
-    # Create a TaskArgument object with a list of named arguments
-    # (given by :names) and a set of associated values (given by
-    # :values).  :parent is the parent argument object.
+    # Create a TaskArgument object with a list of argument +names+ and a set
+    # of associated +values+.  +parent+ is the parent argument object.
     def initialize(names, values, parent=nil)
       @names = names
       @parent = parent
@@ -21,12 +21,12 @@ module Rake
       }
     end
 
-    # Retrive the complete array of sequential values
+    # Retrieve the complete array of sequential values
     def to_a
       @values.dup
     end
 
-    # Retrive the list of values not associated with named arguments
+    # Retrieve the list of values not associated with named arguments
     def extras
       @values[@names.length..-1] || []
     end
@@ -50,33 +50,42 @@ module Rake
       @hash = defaults.merge(@hash)
     end
 
+    # Enumerates the arguments and their values
     def each(&block)
       @hash.each(&block)
     end
 
+    # Extracts the argument values at +keys+
     def values_at(*keys)
       keys.map { |k| lookup(k) }
     end
 
+    # Returns the value of the given argument via method_missing
     def method_missing(sym, *args)
       lookup(sym.to_sym)
     end
 
+    # Returns a Hash of arguments and their values
     def to_hash
       @hash
     end
 
-    def to_s
+    def to_s # :nodoc:
       @hash.inspect
     end
 
-    def inspect
+    def inspect # :nodoc:
       to_s
     end
 
+    # Returns true if +key+ is one of the arguments
+    def has_key?(key)
+      @hash.has_key?(key)
+    end
+
     protected
 
-    def lookup(name)
+    def lookup(name) # :nodoc:
       if @hash.has_key?(name)
         @hash[name]
       elsif @parent
@@ -85,5 +94,5 @@ module Rake
     end
   end
 
-  EMPTY_TASK_ARGS = TaskArguments.new([], [])
+  EMPTY_TASK_ARGS = TaskArguments.new([], []) # :nodoc:
 end

data/lib/rake/task_manager.rb

@@ -4,9 +4,12 @@ module Rake
   module TaskManager
     # Track the last comment made in the Rakefile.
     attr_accessor :last_description
-    alias :last_comment :last_description    # Backwards compatibility
 
-    def initialize
+    # TODO: Remove in Rake 11
+
+    alias :last_comment :last_description # :nodoc: Backwards compatibility
+
+    def initialize # :nodoc:
       super
       @tasks = Hash.new
       @rules = Array.new
@@ -14,14 +17,21 @@ module Rake
       @last_description = nil
     end
 
-    def create_rule(*args, &block)
+    def create_rule(*args, &block) # :nodoc:
       pattern, args, deps = resolve_args(args)
       pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern
       @rules << [pattern, args, deps, block]
     end
 
-    def define_task(task_class, *args, &block)
+    def define_task(task_class, *args, &block) # :nodoc:
       task_name, arg_names, deps = resolve_args(args)
+
+      original_scope = @scope
+      if(task_name.is_a? String)
+        task_name, *definition_scope = *(task_name.split(":").reverse)
+        @scope = Scope.make(*(definition_scope + @scope.to_a))
+      end
+
       task_name = task_class.scope_name(@scope, task_name)
       deps = [deps] unless deps.respond_to?(:to_ary)
       deps = deps.map { |d| d.to_s }
@@ -32,6 +42,8 @@ module Rake
         task.add_description(get_description(task))
       end
       task.enhance(deps, &block)
+    ensure
+      @scope = original_scope
     end
 
     # Lookup a task.  Return an existing task if found, otherwise
@@ -49,7 +61,7 @@ module Rake
         fail "Don't know how to build task '#{task_name}'"
     end
 
-    def synthesize_file_task(task_name)
+    def synthesize_file_task(task_name) # :nodoc:
       return nil unless File.exist?(task_name)
       define_task(Rake::FileTask, task_name)
     end
@@ -226,7 +238,7 @@ module Rake
       "_anon_#{@seed}"
     end
 
-    def trace_rule(level, message)
+    def trace_rule(level, message) # :nodoc:
       options.trace_output.puts "#{"    " * level}#{message}" if
         Rake.application.options.trace_rules
     end
@@ -265,7 +277,7 @@ module Rake
           task_name.ext(ext)
         when String
           ext
-        when Proc
+        when Proc, Method
           if ext.arity == 1
             ext.call(task_name)
           else
@@ -289,7 +301,7 @@ module Rake
     end
 
     class << self
-      attr_accessor :record_task_metadata
+      attr_accessor :record_task_metadata # :nodoc:
       TaskManager.record_task_metadata = false
     end
   end

data/lib/rake/tasklib.rb

@@ -14,6 +14,8 @@ module Rake
     # libraries depend on this so I can't remove it without breaking
     # other people's code. So for now it stays for backwards
     # compatibility. BUT DON'T USE IT.
+    #--
+    # TODO: Remove in Rake 11
     def paste(a, b)             # :nodoc:
       (a.to_s + b.to_s).intern
     end

data/lib/rake/testtask.rb

@@ -1,5 +1,3 @@
-# Define a task library for running unit tests.
-
 require 'rake'
 require 'rake/tasklib'
 
@@ -67,6 +65,9 @@ module Rake
     # Array of commandline options to pass to ruby when running test loader.
     attr_accessor :ruby_opts
 
+    # Description of the test task. (default is 'Run tests')
+    attr_accessor :description
+
     # Explicitly define the list of test files to be included in a
     # test.  +list+ is expected to be an array of file names (a
     # FileList is acceptable).  If both +pattern+ and +test_files+ are
@@ -86,6 +87,7 @@ module Rake
       @warning = false
       @loader = :rake
       @ruby_opts = []
+      @description = "Run tests" + (@name == :test ? "" : " for #{@name}")
       yield self if block_given?
       @pattern = 'test/test*.rb' if @pattern.nil? && @test_files.nil?
       define
@@ -93,7 +95,7 @@ module Rake
 
     # Create the tasks defined by this task lib.
     def define
-      desc "Run tests" + (@name == :test ? "" : " for #{@name}")
+      desc @description
       task @name do
         FileUtilsExt.verbose(@verbose) do
           args =
@@ -121,18 +123,18 @@ module Rake
         "")
     end
 
-    def ruby_opts_string
+    def ruby_opts_string # :nodoc:
       opts = @ruby_opts.dup
       opts.unshift("-I\"#{lib_path}\"") unless @libs.empty?
       opts.unshift("-w") if @warning
       opts.join(" ")
     end
 
-    def lib_path
+    def lib_path # :nodoc:
       @libs.join(File::PATH_SEPARATOR)
     end
 
-    def file_list_string
+    def file_list_string # :nodoc:
       file_list.map { |fn| "\"#{fn}\"" }.join(' ')
     end
 
@@ -156,18 +158,18 @@ module Rake
       end || ''
     end
 
-    def ruby_version
+    def ruby_version # :nodoc:
       RUBY_VERSION
     end
 
-    def run_code
+    def run_code # :nodoc:
       case @loader
       when :direct
         "-e \"ARGV.each{|f| require f}\""
       when :testrb
         "-S testrb #{fix}"
       when :rake
-        "-I\"#{rake_lib_dir}\" \"#{rake_loader}\""
+        "#{rake_include_arg} \"#{rake_loader}\""
       end
     end
 
@@ -184,6 +186,15 @@ module Rake
       nil
     end
 
+    def rake_include_arg # :nodoc:
+      spec = Gem.loaded_specs['rake']
+      if spec.respond_to?(:default_gem?) && spec.default_gem?
+        ""
+      else
+        "-I\"#{rake_lib_dir}\""
+      end
+    end
+
     def rake_lib_dir # :nodoc:
       find_dir('rake') or
         fail "unable to find rake lib"

data/lib/rake/thread_pool.rb

@@ -5,10 +5,10 @@ require 'rake/promise'
 
 module Rake
 
-  class ThreadPool              # :nodoc: all
+  class ThreadPool # :nodoc: all
 
-    # Creates a ThreadPool object.
-    # The parameter is the size of the pool.
+    # Creates a ThreadPool object.  The +thread_count+ parameter is the size
+    # of the pool.
     def initialize(thread_count)
       @max_active_threads = [thread_count, 0].max
       @threads = Set.new
@@ -25,9 +25,9 @@ module Rake
     # Creates a future executed by the +ThreadPool+.
     #
     # The args are passed to the block when executing (similarly to
-    # <tt>Thread#new</tt>) The return value is an object representing
+    # Thread#new) The return value is an object representing
     # a future which has been created and added to the queue in the
-    # pool. Sending <tt>#value</tt> to the object will sleep the
+    # pool. Sending #value to the object will sleep the
     # current thread until the future is finished and will return the
     # result (or raise an exception thrown from the future)
     def future(*args, &block)
@@ -109,13 +109,19 @@ module Rake
       false
     end
 
+    def safe_thread_count
+      @threads_mon.synchronize do
+        @threads.count
+      end
+    end
+
     def start_thread # :nodoc:
       @threads_mon.synchronize do
         next unless @threads.count < @max_active_threads
 
         t = Thread.new do
           begin
-            while @threads.count <= @max_active_threads
+            while safe_thread_count <= @max_active_threads
               break unless process_queue_item
             end
           ensure
@@ -126,6 +132,7 @@ module Rake
             end
           end
         end
+
         @threads << t
         stat(
           :spawned,
@@ -152,10 +159,6 @@ module Rake
     def __queue__ # :nodoc:
       @queue
     end
-
-    def __threads__ # :nodoc:
-      @threads.dup
-    end
   end
 
 end

data/lib/rake/trace_output.rb

@@ -1,5 +1,5 @@
 module Rake
-  module TraceOutput
+  module TraceOutput # :nodoc: all
 
     # Write trace output to output stream +out+.
     #

data/lib/rake/version.rb

@@ -1,6 +1,4 @@
 module Rake
-  VERSION = '10.1.1'
-
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD, *OTHER = Rake::VERSION.split '.'
 

data/lib/rake/win32.rb

@@ -4,7 +4,7 @@ module Rake
 
   # Win 32 interface methods for Rake. Windows specific functionality
   # will be placed here to collect that knowledge in one spot.
-  module Win32
+  module Win32 # :nodoc: all
 
     # Error indicating a problem in locating the home directory on a
     # Win32 system.

data/rakelib/publish.rake

@@ -0,0 +1,20 @@
+# Optional publish task for Rake
+
+begin
+  require 'rake/contrib/sshpublisher'
+  require 'rake/contrib/rubyforgepublisher'
+
+  publisher = Rake::SshDirPublisher.new(
+    'linode',
+    'htdocs/software/rake',
+    'html')
+
+  desc "Publish the Documentation to RubyForge."
+  task :publish => [:rdoc] do
+    publisher.upload
+  end
+
+rescue LoadError => ex
+  puts "#{ex.message} (#{ex.class})"
+  puts "No Publisher Task Available"
+end

data/rakelib/test_times.rake

@@ -0,0 +1,25 @@
+module TestTimes
+  def self.run(test_results, limit=0)
+    limit = limit.nonzero? || 10
+    tests = []
+    test_results.split(/\n/).each do |line|
+      if line =~ /^(.+?#[^:]+): ([0-9.]+) s: \.$/
+        tests << [$1, $2.to_f, line]
+      end
+    end
+
+    puts "#{limit} Slowest tests"
+    puts tests.sort_by { |item|
+      item[1]
+    }.reverse[0...limit].map { |item|
+      "%6.3f: %-s\n" % [item[1], item[0]]
+    }
+  end
+end
+
+namespace :test do
+  desc "Find the slowest unit tests"
+  task :times, [:limit] do |t, args|
+    TestTimes.run `rake test:units TESTOPTS='--verbose'`, args.limit.to_i
+  end
+end

data/test/helper.rb

@@ -1,23 +1,22 @@
 require 'rubygems'
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-begin
-  gem 'minitest'
-rescue Gem::LoadError
-end
+gem 'minitest', '~> 4'
 
 require 'minitest/autorun'
 require 'rake'
 require 'tmpdir'
 require File.expand_path('../file_creation', __FILE__)
 
-require 'test/support/ruby_runner'
-require 'test/support/rakefile_definitions'
 
 begin
   require_relative '../ruby/envutil'
+  require_relative 'support/ruby_runner'
+  require_relative 'support/rakefile_definitions'
 rescue NoMethodError, LoadError
-  # for ruby trunk
+  # ruby 1.8
+  require 'test/support/ruby_runner'
+  require 'test/support/rakefile_definitions'
 end
 
 class Rake::TestCase < MiniTest::Unit::TestCase

data/test/support/rakefile_definitions.rb

@@ -41,6 +41,16 @@ end
     ACCESS
   end
 
+  def rakefile_test_task
+    rakefile <<-RAKEFILE
+    require "rake/testtask"
+
+    Rake::TestTask.new(:unit) do |t|
+      t.description = "custom test task description"
+    end
+    RAKEFILE
+  end
+
   def rakefile_chains
     rakefile <<-DEFAULT
 task :default => "play.app"
@@ -217,6 +227,30 @@ default: other
     end
   end
 
+  def rakefile_regenerate_imports
+    rakefile <<-REGENERATE_IMPORTS
+task :default
+
+task :regenerate do
+  open("deps", "w") do |f|
+    f << <<-CONTENT
+file "deps" => :regenerate
+puts "REGENERATED"
+    CONTENT
+  end
+end
+
+import "deps"
+    REGENERATE_IMPORTS
+
+    open "deps", "w" do |f|
+      f << <<-CONTENT
+file "deps" => :regenerate
+puts "INITIAL"
+      CONTENT
+    end
+  end
+
   def rakefile_multidesc
     rakefile <<-MULTIDESC
 task :b