rake 10.0.4 → 10.1.0

data/lib/rake/task.rb

@@ -21,13 +21,6 @@ module Rake
     # Application owning this task.
     attr_accessor :application
 
-    # Comment for this task.  Restricted to a single line of no more than 50
-    # characters.
-    attr_reader :comment
-
-    # Full text of the (possibly multi-line) comment.
-    attr_reader :full_comment
-
     # Array of nested namespaces names used for task lookup by this task.
     attr_reader :scope
 
@@ -53,7 +46,7 @@ module Rake
 
     # List of prerequisite tasks
     def prerequisite_tasks
-      prerequisites.collect { |pre| lookup_prerequisite(pre) }
+      prerequisites.map { |pre| lookup_prerequisite(pre) }
     end
 
     def lookup_prerequisite(prerequisite_name)
@@ -91,8 +84,7 @@ module Rake
       @prerequisites   = []
       @actions         = []
       @already_invoked = false
-      @full_comment    = nil
-      @comment         = nil
+      @comments        = []
       @lock            = Monitor.new
       @application     = app
       @scope           = app.current_scope
@@ -159,8 +151,7 @@ module Rake
 
     # Clear the existing comments on a rake task.
     def clear_comments
-      @full_comment = nil
-      @comment = nil
+      @comments = []
       self
     end
 
@@ -190,7 +181,8 @@ module Rake
     protected :invoke_with_call_chain
 
     def add_chain_to(exception, new_chain)
-      exception.extend(InvocationExceptionMixin) unless exception.respond_to?(:chain)
+      exception.extend(InvocationExceptionMixin) unless
+        exception.respond_to?(:chain)
       exception.chain = new_chain if exception.chain.nil?
     end
     private :add_chain_to
@@ -208,8 +200,8 @@ module Rake
     end
 
     # Invoke all the prerequisites of a task in parallel.
-    def invoke_prerequisites_concurrently(task_args, invocation_chain) # :nodoc:
-      futures = prerequisite_tasks.collect do |p|
+    def invoke_prerequisites_concurrently(task_args, invocation_chain)# :nodoc:
+      futures = prerequisite_tasks.map do |p|
         prereq_args = task_args.new_scope(p.arg_names)
         application.thread_pool.future(p) do |r|
           r.invoke_with_call_chain(prereq_args, invocation_chain)
@@ -234,9 +226,7 @@ module Rake
         application.trace "** Execute (dry run) #{name}"
         return
       end
-      if application.options.trace
-        application.trace "** Execute #{name}"
-      end
+      application.trace "** Execute #{name}" if application.options.trace
       application.enhance_with_matching_rule(name) if @actions.empty?
       @actions.each do |act|
         case act.arity
@@ -262,32 +252,51 @@ module Rake
     # Add a description to the task.  The description can consist of an option
     # argument list (enclosed brackets) and an optional comment.
     def add_description(description)
-      return if ! description
+      return unless description
       comment = description.strip
       add_comment(comment) if comment && ! comment.empty?
     end
 
-    # Writing to the comment attribute is the same as adding a description.
-    def comment=(description)
-      add_description(description)
+    def comment=(comment)
+      add_comment(comment)
     end
 
-    # Add a comment to the task.  If a comment already exists, separate
-    # the new comment with " / ".
     def add_comment(comment)
-      if @full_comment
-        @full_comment << " / "
-      else
-        @full_comment = ''
-      end
-      @full_comment << comment
-      if @full_comment =~ /\A([^.]+?\.)( |$)/
-        @comment = $1
+      @comments << comment unless @comments.include?(comment)
+    end
+    private :add_comment
+
+    # Full collection of comments. Multiple comments are separated by
+    # newlines.
+    def full_comment
+      transform_comments("\n")
+    end
+
+    # First line (or sentence) of all comments. Multiple comments are
+    # separated by a "/".
+    def comment
+      transform_comments(" / ") { |c| first_sentence(c) }
+    end
+
+    # Transform the list of comments as specified by the block and
+    # join with the separator.
+    def transform_comments(separator, &block)
+      if @comments.empty?
+        nil
       else
-        @comment = @full_comment
+        block ||= lambda { |c| c }
+        @comments.map(&block).join(separator)
       end
     end
-    private :add_comment
+    private :transform_comments
+
+    # Get the first sentence in a string. The sentence is terminated
+    # by the first period or the end of the line. Decimal points do
+    # not count as periods.
+    def first_sentence(string)
+      string.split(/\.[ \t]|\.$|\n/).first
+    end
+    private :first_sentence
 
     # Set the names of the arguments for this task. +args+ should be
     # an array of symbols, one for each argument name.
@@ -305,11 +314,11 @@ module Rake
       result <<  "timestamp: #{timestamp}\n"
       result << "pre-requisites: \n"
       prereqs = prerequisite_tasks
-      prereqs.sort! {|a,b| a.timestamp <=> b.timestamp}
+      prereqs.sort! { |a, b| a.timestamp <=> b.timestamp }
       prereqs.each do |p|
         result << "--#{p.name} (#{p.timestamp})\n"
       end
-      latest_prereq = prerequisite_tasks.collect { |pre| pre.timestamp }.max
+      latest_prereq = prerequisite_tasks.map { |pre| pre.timestamp }.max
       result <<  "latest-prerequisite time: #{latest_prereq}\n"
       result << "................................\n\n"
       return result
@@ -360,7 +369,8 @@ module Rake
       # this kind of task.  Generic tasks will accept the scope as
       # part of the name.
       def scope_name(scope, task_name)
-        (scope + [task_name]).join(':')
+#        (scope + [task_name]).join(':')
+        scope.path_with_task_name(task_name)
       end
 
     end # class << Rake::Task

data/lib/rake/task_arguments.rb

@@ -15,16 +15,27 @@ module Rake
       @names = names
       @parent = parent
       @hash = {}
+      @values = values
       names.each_with_index { |name, i|
         @hash[name.to_sym] = values[i] unless values[i].nil?
       }
     end
 
+    # Retrive the complete array of sequential values
+    def to_a
+      @values.dup
+    end
+
+    # Retrive the list of values not associated with named arguments
+    def extras
+      @values[@names.length..-1] || []
+    end
+
     # Create a new argument scope using the prerequisite argument
     # names.
     def new_scope(names)
-      values = names.collect { |n| self[n] }
-      self.class.new(names, values, self)
+      values = names.map { |n| self[n] }
+      self.class.new(names, values + extras, self)
     end
 
     # Find an argument value by name or index.

data/lib/rake/task_manager.rb

@@ -10,21 +10,21 @@ module Rake
       super
       @tasks = Hash.new
       @rules = Array.new
-      @scope = Array.new
+      @scope = Scope.make
       @last_description = nil
     end
 
     def create_rule(*args, &block)
-      pattern, _, deps = resolve_args(args)
+      pattern, args, deps = resolve_args(args)
       pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern
-      @rules << [pattern, deps, block]
+      @rules << [pattern, args, deps, block]
     end
 
     def define_task(task_class, *args, &block)
       task_name, arg_names, deps = resolve_args(args)
       task_name = task_class.scope_name(@scope, task_name)
       deps = [deps] unless deps.respond_to?(:to_ary)
-      deps = deps.collect {|d| d.to_s }
+      deps = deps.map { |d| d.to_s }
       task = intern(task_class, task_name)
       task.set_arg_names(arg_names) unless arg_names.empty?
       if Rake::TaskManager.record_task_metadata
@@ -94,7 +94,7 @@ module Rake
     #
     def resolve_args_with_dependencies(args, hash) # :nodoc:
       fail "Task Argument Error" if hash.size != 1
-      key, value = hash.map { |k, v| [k,v] }.first
+      key, value = hash.map { |k, v| [k, v] }.first
       if args.empty?
         task_name = key
         arg_names = []
@@ -116,9 +116,9 @@ module Rake
     def enhance_with_matching_rule(task_name, level=0)
       fail Rake::RuleRecursionOverflowError,
         "Rule Recursion Too Deep" if level >= 16
-      @rules.each do |pattern, extensions, block|
+      @rules.each do |pattern, args, extensions, block|
         if pattern.match(task_name)
-          task = attempt_rule(task_name, extensions, block, level)
+          task = attempt_rule(task_name, args, extensions, block, level)
           return task if task
         end
       end
@@ -136,7 +136,7 @@ module Rake
     # List of all the tasks defined in the given scope (and its
     # sub-scopes).
     def tasks_in_scope(scope)
-      prefix = scope.join(":")
+      prefix = scope.path
       tasks.select { |t|
         /^#{prefix}:/ =~ t.name
       }
@@ -157,10 +157,10 @@ module Rake
       initial_scope ||= @scope
       task_name = task_name.to_s
       if task_name =~ /^rake:/
-        scopes = []
+        scopes = Scope.make
         task_name = task_name.sub(/^rake:/, '')
       elsif task_name =~ /^(\^+)/
-        scopes = initial_scope[0, initial_scope.size - $1.size]
+        scopes = initial_scope.trim($1.size)
         task_name = task_name.sub(/^(\^+)/, '')
       else
         scopes = initial_scope
@@ -170,12 +170,12 @@ module Rake
 
     # Lookup the task name
     def lookup_in_scope(name, scope)
-      n = scope.size
-      while n >= 0
-        tn = (scope[0,n] + [name]).join(':')
+      loop do
+        tn = scope.path_with_task_name(name)
         task = @tasks[tn]
         return task if task
-        n -= 1
+        break if scope.empty?
+        scope = scope.tail
       end
       nil
     end
@@ -184,19 +184,19 @@ module Rake
     # Return the list of scope names currently active in the task
     # manager.
     def current_scope
-      @scope.dup
+      @scope
     end
 
     # Evaluate the block in a nested namespace named +name+.  Create
     # an anonymous namespace if +name+ is nil.
     def in_namespace(name)
       name ||= generate_name
-      @scope.push(name)
+      @scope = Scope.new(name, @scope)
       ns = NameSpace.new(self, @scope)
       yield(ns)
       ns
     ensure
-      @scope.pop
+      @scope = @scope.tail
     end
 
     private
@@ -213,7 +213,7 @@ module Rake
       locations = caller
       i = 0
       while locations[i]
-        return locations[i+1] if locations[i] =~ /rake\/dsl_definition.rb/
+        return locations[i + 1] if locations[i] =~ /rake\/dsl_definition.rb/
         i += 1
       end
       nil
@@ -227,18 +227,19 @@ module Rake
     end
 
     def trace_rule(level, message)
-      options.trace_output.puts "#{"    "*level}#{message}" if Rake.application.options.trace_rules
+      options.trace_output.puts "#{"    " * level}#{message}" if
+        Rake.application.options.trace_rules
     end
 
     # Attempt to create a rule given the list of prerequisites.
-    def attempt_rule(task_name, extensions, block, level)
+    def attempt_rule(task_name, args, extensions, block, level)
       sources = make_sources(task_name, extensions)
-      prereqs = sources.collect { |source|
+      prereqs = sources.map { |source|
         trace_rule level, "Attempting Rule #{task_name} => #{source}"
         if File.exist?(source) || Rake::Task.task_defined?(source)
           trace_rule level, "(#{task_name} => #{source} ... EXIST)"
           source
-        elsif parent = enhance_with_matching_rule(source, level+1)
+        elsif parent = enhance_with_matching_rule(source, level + 1)
           trace_rule level, "(#{task_name} => #{source} ... ENHANCE)"
           parent.name
         else
@@ -246,7 +247,7 @@ module Rake
           return nil
         end
       }
-      task = FileTask.define_task({task_name => prereqs}, &block)
+      task = FileTask.define_task(task_name, {args => prereqs}, &block)
       task.sources = prereqs
       task
     end
@@ -254,7 +255,7 @@ module Rake
     # Make a list of sources from the list of file name extensions /
     # translation procs.
     def make_sources(task_name, extensions)
-      result = extensions.collect { |ext|
+      result = extensions.map { |ext|
         case ext
         when /%/
           task_name.pathmap(ext)

data/lib/rake/tasklib.rb

@@ -14,7 +14,7 @@ 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.
-    def paste(a,b)              # :nodoc:
+    def paste(a, b)             # :nodoc:
       (a.to_s + b.to_s).intern
     end
   end

data/lib/rake/testtask.rb

@@ -93,15 +93,18 @@ module Rake
 
     # Create the tasks defined by this task lib.
     def define
-      desc "Run tests" + (@name==:test ? "" : " for #{@name}")
+      desc "Run tests" + (@name == :test ? "" : " for #{@name}")
       task @name do
         FileUtilsExt.verbose(@verbose) do
-          args = "#{ruby_opts_string} #{run_code} #{file_list_string} #{option_list}"
+          args =
+            "#{ruby_opts_string} #{run_code} " +
+            "#{file_list_string} #{option_list}"
           ruby args do |ok, status|
             if !ok && status.respond_to?(:signaled?) && status.signaled?
               raise SignalException.new(status.termsig)
             elsif !ok
-              fail "Command failed with status (#{status.exitstatus}): [ruby #{args}]"
+              fail "Command failed with status (#{status.exitstatus}): " +
+                "[ruby #{args}]"
             end
           end
         end
@@ -120,8 +123,8 @@ module Rake
 
     def ruby_opts_string
       opts = @ruby_opts.dup
-      opts.unshift( "-I\"#{lib_path}\"" ) unless @libs.empty?
-      opts.unshift( "-w" ) if @warning
+      opts.unshift("-I\"#{lib_path}\"") unless @libs.empty?
+      opts.unshift("-w") if @warning
       opts.join(" ")
     end
 
@@ -130,12 +133,12 @@ module Rake
     end
 
     def file_list_string
-      file_list.collect { |fn| "\"#{fn}\"" }.join(' ')
+      file_list.map { |fn| "\"#{fn}\"" }.join(' ')
     end
 
     def file_list # :nodoc:
       if ENV['TEST']
-        FileList[ ENV['TEST'] ]
+        FileList[ENV['TEST']]
       else
         result = []
         result += @test_files.to_a if @test_files

data/lib/rake/thread_history_display.rb

@@ -25,7 +25,7 @@ module Rake
           (stat[:time] * 1_000_000).round,
           stat[:thread],
           stat[:event],
-          stat[:data].map { |k,v| "#{k}:#{v}" }.join(" "))
+          stat[:data].map do |k, v| "#{k}:#{v}" end.join(" "))
       end
     end
 

data/lib/rake/thread_pool.rb

@@ -50,8 +50,10 @@ module Rake
         rescue Exception => e
           stat :joined
           $stderr.puts e
-          $stderr.print "Queue contains #{@queue.size} items. Thread pool contains #{@threads.count} threads\n"
-          $stderr.print "Current Thread #{Thread.current} status = #{Thread.current.status}\n"
+          $stderr.print "Queue contains #{@queue.size} items. " +
+            "Thread pool contains #{@threads.count} threads\n"
+          $stderr.print "Current Thread #{Thread.current} status = " +
+            "#{Thread.current.status}\n"
           $stderr.puts e.backtrace.join("\n")
           @threads.each do |t|
             $stderr.print "Thread #{t} status = #{t.status}\n"
@@ -125,8 +127,12 @@ module Rake
           end
         end
         @threads << t
-        stat :spawned, :new_thread => t.object_id, :thread_count => @threads.count
-        @total_threads_in_play = @threads.count if @threads.count > @total_threads_in_play
+        stat(
+          :spawned,
+          :new_thread   => t.object_id,
+          :thread_count => @threads.count)
+        @total_threads_in_play = @threads.count if
+          @threads.count > @total_threads_in_play
       end
     end
 

data/lib/rake/version.rb

@@ -1,13 +1,9 @@
 module Rake
-  VERSION = '10.0.4'
+  VERSION = '10.1.0'
 
   module Version # :nodoc: all
-    MAJOR, MINOR, BUILD, = Rake::VERSION.split '.'
+    MAJOR, MINOR, BUILD, *OTHER = Rake::VERSION.split '.'
 
-    NUMBERS = [
-      MAJOR,
-      MINOR,
-      BUILD,
-    ]
+    NUMBERS = [MAJOR, MINOR, BUILD, *OTHER]
   end
 end

data/lib/rake/win32.rb

@@ -40,8 +40,9 @@ module Rake
 
         win32_shared_path ||= ENV['APPDATA']
         win32_shared_path ||= ENV['USERPROFILE']
-        raise Win32HomeError, "Unable to determine home path environment variable." if
-          win32_shared_path.nil? or win32_shared_path.empty?
+        raise Win32HomeError,
+          "Unable to determine home path environment variable." if
+            win32_shared_path.nil? or win32_shared_path.empty?
         normalize(File.join(win32_shared_path, 'Rake'))
       end
 

data/lib/rake.rb

@@ -40,6 +40,8 @@ require 'rake/ext/time'
 
 require 'rake/win32'
 
+require 'rake/linked_list'
+require 'rake/scope'
 require 'rake/task_argument_error'
 require 'rake/rule_recursion_overflow_error'
 require 'rake/rake_module'