rake 11.3.0 → 12.0.0.beta1

data/lib/rake/promise.rb

@@ -27,11 +27,11 @@ module Rake
     # synchronously. We will wait.
     def value
       unless complete?
-        stat :sleeping_on, :item_id => object_id
+        stat :sleeping_on, item_id: object_id
         @mutex.synchronize do
-          stat :has_lock_on, :item_id => object_id
+          stat :has_lock_on, item_id: object_id
           chore
-          stat :releasing_lock_on, :item_id => object_id
+          stat :releasing_lock_on, item_id: object_id
         end
       end
       error? ? raise(@error) : @result
@@ -39,14 +39,14 @@ module Rake
 
     # If no one else is working this promise, go ahead and do the chore.
     def work
-      stat :attempting_lock_on, :item_id => object_id
+      stat :attempting_lock_on, item_id: object_id
       if @mutex.try_lock
-        stat :has_lock_on, :item_id => object_id
+        stat :has_lock_on, item_id: object_id
         chore
-        stat :releasing_lock_on, :item_id => object_id
+        stat :releasing_lock_on, item_id: object_id
         @mutex.unlock
       else
-        stat :bailed_on, :item_id => object_id
+        stat :bailed_on, item_id: object_id
       end
     end
 
@@ -55,16 +55,16 @@ module Rake
     # Perform the chore promised
     def chore
       if complete?
-        stat :found_completed, :item_id => object_id
+        stat :found_completed, item_id: object_id
         return
       end
-      stat :will_execute, :item_id => object_id
+      stat :will_execute, item_id: object_id
       begin
         @result = @block.call(*@args)
       rescue Exception => e
         @error = e
       end
-      stat :did_execute, :item_id => object_id
+      stat :did_execute, item_id: object_id
       discard
     end
 

data/lib/rake/rake_module.rb

@@ -1,4 +1,4 @@
-require 'rake/application'
+require "rake/application"
 
 module Rake
 

data/lib/rake/rake_test_loader.rb

@@ -1,4 +1,4 @@
-require 'rake'
+require "rake"
 
 # Load the test files from the command line.
 argv = ARGV.select do |argument|

data/lib/rake/rule_recursion_overflow_error.rb

@@ -12,7 +12,7 @@ module Rake
     end
 
     def message
-      super + ": [" + @targets.reverse.join(' => ') + "]"
+      super + ": [" + @targets.reverse.join(" => ") + "]"
     end
   end
 

data/lib/rake/scope.rb

@@ -3,7 +3,7 @@ module Rake
 
     # Path for the scope.
     def path
-      map { |item| item.to_s }.reverse.join(":")
+      map(&:to_s).reverse.join(":")
     end
 
     # Path for the scope + the named path.

data/lib/rake/task.rb

@@ -1,4 +1,4 @@
-require 'rake/invocation_exception_mixin'
+require "rake/invocation_exception_mixin"
 
 module Rake
 
@@ -141,11 +141,12 @@ module Rake
       @already_invoked = false
     end
 
-    # Clear the existing prerequisites and actions of a rake task.
+    # Clear the existing prerequisites, actions, comments, and arguments of a rake task.
     def clear
       clear_prerequisites
       clear_actions
       clear_comments
+      clear_args
       self
     end
 
@@ -167,6 +168,12 @@ module Rake
       self
     end
 
+    # Clear the existing arguments on a rake task.
+    def clear_args
+      @arg_names = nil
+      self
+    end
+
     # Invoke the task if it is needed.  Prerequisites are invoked first.
     def invoke(*args)
       task_args = TaskArguments.new(arg_names, args)
@@ -219,7 +226,7 @@ module Rake
           r.invoke_with_call_chain(prereq_args, invocation_chain)
         end
       end
-      futures.each { |f| f.value }
+      futures.each(&:value)
     end
 
     # Format the trace flags for display.
@@ -240,14 +247,7 @@ module Rake
       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
-        when 1
-          act.call(self)
-        else
-          act.call(self, args)
-        end
-      end
+      @actions.each { |act| act.call(self, args) }
     end
 
     # Is this task needed?
@@ -314,7 +314,7 @@ module Rake
     # Set the names of the arguments for this task. +args+ should be
     # an array of symbols, one for each argument name.
     def set_arg_names(args)
-      @arg_names = args.map { |a| a.to_sym }
+      @arg_names = args.map(&:to_sym)
     end
 
     # Return a string describing the internal state of a task.  Useful for
@@ -331,7 +331,7 @@ module Rake
       prereqs.each do |p|
         result << "--#{p.name} (#{p.timestamp})\n"
       end
-      latest_prereq = prerequisite_tasks.map { |pre| pre.timestamp }.max
+      latest_prereq = prerequisite_tasks.map(&:timestamp).max
       result <<  "latest-prerequisite time: #{latest_prereq}\n"
       result << "................................\n\n"
       return result
@@ -382,7 +382,6 @@ 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.path_with_task_name(task_name)
       end
 

data/lib/rake/task_arguments.rb

@@ -17,7 +17,7 @@ module Rake
       @hash = {}
       @values = values
       names.each_with_index { |name, i|
-        next if values[i].nil? || values[i] == ''
+        next if values[i].nil? || values[i] == ""
         @hash[name.to_sym] = values[i]
       }
     end
@@ -68,15 +68,19 @@ module Rake
 
     # Returns a Hash of arguments and their values
     def to_hash
-      @hash
+      @hash.dup
     end
 
     def to_s # :nodoc:
-      @hash.inspect
+      inspect
     end
 
     def inspect # :nodoc:
-      to_s
+      inspection = @hash.map do |k,v|
+        "#{k.to_s}: #{v.to_s}"
+      end.join(", ")
+
+      "#<#{self.class} #{inspection}>"
     end
 
     # Returns true if +key+ is one of the arguments

data/lib/rake/task_manager.rb

@@ -5,19 +5,6 @@ module Rake
     # Track the last comment made in the Rakefile.
     attr_accessor :last_description
 
-    # Remove Rake 12
-    def last_comment # :nodoc:
-      warn "[DEPRECATION] `last_comment` is deprecated.  Please use `last_description` instead."
-      @last_description
-    end
-
-    # Remove Rake 12
-    def last_comment=(comment) # :nodoc:
-      warn "[DEPRECATION] `last_comment=` is deprecated.  Please use `last_description=` instead."
-      @last_description = comment
-      @last_description # ignore warning
-    end
-
     def initialize # :nodoc:
       super
       @tasks = Hash.new
@@ -28,7 +15,7 @@ module Rake
 
     def create_rule(*args, &block) # :nodoc:
       pattern, args, deps = resolve_args(args)
-      pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern
+      pattern = Regexp.new(Regexp.quote(pattern) + "$") if String === pattern
       @rules << [pattern, args, deps, block]
     end
 
@@ -37,7 +24,7 @@ module Rake
 
       original_scope = @scope
       if String === task_name and
-         not task_class.ancestors.include? Rake::FileTask then
+         not task_class.ancestors.include? Rake::FileTask
         task_name, *definition_scope = *(task_name.split(":").reverse)
         @scope = Scope.make(*(definition_scope + @scope.to_a))
       end
@@ -180,10 +167,10 @@ module Rake
       task_name = task_name.to_s
       if task_name =~ /^rake:/
         scopes = Scope.make
-        task_name = task_name.sub(/^rake:/, '')
+        task_name = task_name.sub(/^rake:/, "")
       elsif task_name =~ /^(\^+)/
         scopes = initial_scope.trim($1.size)
-        task_name = task_name.sub(/^(\^+)/, '')
+        task_name = task_name.sub(/^(\^+)/, "")
       else
         scopes = initial_scope
       end
@@ -269,7 +256,7 @@ module Rake
           return nil
         end
       }
-      task = FileTask.define_task(task_name, {args => prereqs}, &block)
+      task = FileTask.define_task(task_name, { args => prereqs }, &block)
       task.sources = prereqs
       task
     end

data/lib/rake/tasklib.rb

@@ -1,4 +1,4 @@
-require 'rake'
+require "rake"
 
 module Rake
 

data/lib/rake/testtask.rb

@@ -1,5 +1,5 @@
-require 'rake'
-require 'rake/tasklib'
+require "rake"
+require "rake/tasklib"
 
 module Rake
 
@@ -98,7 +98,7 @@ module Rake
         @name = @name.keys.first
       end
       yield self if block_given?
-      @pattern = 'test/test*.rb' if @pattern.nil? && @test_files.nil?
+      @pattern = "test/test*.rb" if @pattern.nil? && @test_files.nil?
       define
     end
 
@@ -107,6 +107,8 @@ module Rake
       desc @description
       task @name => Array(deps) do
         FileUtilsExt.verbose(@verbose) do
+          puts "Use TESTOPTS=\"--verbose\" to pass --verbose" \
+            ", etc. to runners." if ARGV.include? "--verbose"
           args =
             "#{ruby_opts_string} #{run_code} " +
             "#{file_list_string} #{option_list}"
@@ -114,8 +116,16 @@ module Rake
             if !ok && status.respond_to?(:signaled?) && status.signaled?
               raise SignalException.new(status.termsig)
             elsif !ok
-              fail "Command failed with status (#{status.exitstatus}): " +
-                "[ruby #{args}]"
+              status  = "Command failed with status (#{status.exitstatus})"
+              details = ": [ruby #{args}]"
+              message =
+                if Rake.application.options.trace or @verbose then
+                  status + details
+                else
+                  status
+                end
+
+              fail message
             end
           end
         end
@@ -124,10 +134,10 @@ module Rake
     end
 
     def option_list # :nodoc:
-      (ENV['TESTOPTS'] ||
-        ENV['TESTOPT'] ||
-        ENV['TEST_OPTS'] ||
-        ENV['TEST_OPT'] ||
+      (ENV["TESTOPTS"] ||
+        ENV["TESTOPT"] ||
+        ENV["TEST_OPTS"] ||
+        ENV["TEST_OPT"] ||
         @options ||
         "")
     end
@@ -144,16 +154,16 @@ module Rake
     end
 
     def file_list_string # :nodoc:
-      file_list.map { |fn| "\"#{fn}\"" }.join(' ')
+      file_list.map { |fn| "\"#{fn}\"" }.join(" ")
     end
 
     def file_list # :nodoc:
-      if ENV['TEST']
-        FileList[ENV['TEST']]
+      if ENV["TEST"]
+        FileList[ENV["TEST"]]
       else
         result = []
         result += @test_files.to_a if @test_files
-        result << @pattern if @pattern
+        result += FileList[@pattern].to_a if @pattern
         result
       end
     end
@@ -174,7 +184,7 @@ module Rake
     end
 
     def rake_loader # :nodoc:
-      find_file('rake/rake_test_loader') or
+      find_file("rake/rake_test_loader") or
         fail "unable to find rake test loader"
     end
 
@@ -187,7 +197,7 @@ module Rake
     end
 
     def rake_include_arg # :nodoc:
-      spec = Gem.loaded_specs['rake']
+      spec = Gem.loaded_specs["rake"]
       if spec.respond_to?(:default_gem?) && spec.default_gem?
         ""
       else
@@ -196,7 +206,7 @@ module Rake
     end
 
     def rake_lib_dir # :nodoc:
-      find_dir('rake') or
+      find_dir("rake") or
         fail "unable to find rake lib"
     end
 

data/lib/rake/thread_history_display.rb

@@ -1,4 +1,4 @@
-require 'rake/private_reader'
+require "rake/private_reader"
 
 module Rake
 
@@ -9,8 +9,8 @@ module Rake
 
     def initialize(stats)
       @stats   = stats
-      @items   = { :_seq_ =>  1  }
-      @threads = { :_seq_ => "A" }
+      @items   = { _seq_: 1  }
+      @threads = { _seq_: "A" }
     end
 
     def show

data/lib/rake/thread_pool.rb

@@ -1,6 +1,6 @@
-require 'set'
+require "set"
 
-require 'rake/promise'
+require "rake/promise"
 
 module Rake
 
@@ -34,7 +34,7 @@ module Rake
       promise.recorder = lambda { |*stats| stat(*stats) }
 
       @queue.enq promise
-      stat :queued, :item_id => promise.object_id
+      stat :queued, item_id: promise.object_id
       start_thread
       promise
     end
@@ -82,8 +82,8 @@ module Rake
     # Return a hash of always collected statistics for the thread pool.
     def statistics              #  :nodoc:
       {
-        :total_threads_in_play => @total_threads_in_play,
-        :max_active_threads => @max_active_threads,
+        total_threads_in_play: @total_threads_in_play,
+        max_active_threads: @max_active_threads,
       }
     end
 
@@ -99,11 +99,11 @@ module Rake
       # is now gone. For this reason we pass true to Queue#deq
       # because we will sleep indefinitely if it is empty.
       promise = @queue.deq(true)
-      stat :dequeued, :item_id => promise.object_id
+      stat :dequeued, item_id: promise.object_id
       promise.work
       return true
 
-      rescue ThreadError # this means the queue is empty
+    rescue ThreadError # this means the queue is empty
       false
     end
 
@@ -125,7 +125,7 @@ module Rake
           ensure
             @threads_mon.synchronize do
               @threads.delete Thread.current
-              stat :ended, :thread_count => @threads.count
+              stat :ended, thread_count: @threads.count
               @join_cond.broadcast if @threads.empty?
             end
           end
@@ -134,8 +134,8 @@ module Rake
         @threads << t
         stat(
           :spawned,
-          :new_thread   => t.object_id,
-          :thread_count => @threads.count)
+          new_thread: t.object_id,
+          thread_count: @threads.count)
         @total_threads_in_play = @threads.count if
           @threads.count > @total_threads_in_play
       end
@@ -144,10 +144,10 @@ module Rake
     def stat(event, data=nil) # :nodoc:
       return if @history_start_time.nil?
       info = {
-        :event  => event,
-        :data   => data,
-        :time   => Time.now,
-        :thread => Thread.current.object_id,
+        event: event,
+        data: data,
+        time: Time.now,
+        thread: Thread.current.object_id,
       }
       @history_mon.synchronize { @history << info }
     end