rake 12.0.0.beta1 → 13.0.0.pre.1

data/lib/rake/file_utils_ext.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rake/file_utils"
 
 module Rake
@@ -22,19 +23,18 @@ module Rake
       opts = FileUtils.options_of name
       default_options = []
       if opts.include?("verbose")
-        default_options << ":verbose => FileUtilsExt.verbose_flag"
+        default_options << "verbose: FileUtilsExt.verbose_flag"
       end
       if opts.include?("noop")
-        default_options << ":noop => FileUtilsExt.nowrite_flag"
+        default_options << "noop: FileUtilsExt.nowrite_flag"
       end
 
       next if default_options.empty?
       module_eval(<<-EOS, __FILE__, __LINE__ + 1)
-      def #{name}( *args, &block )
-        super(
-          *rake_merge_option(args,
-            #{default_options.join(', ')}
-            ), &block)
+      def #{name}(*args, **options, &block)
+        super(*args,
+            #{default_options.join(', ')},
+            **options, &block)
       end
       EOS
     end
@@ -112,16 +112,6 @@ module Rake
       end
     end
 
-    # Merge the given options with the default values.
-    def rake_merge_option(args, defaults)
-      if Hash === args.last
-        defaults.update(args.last)
-        args.pop
-      end
-      args.push defaults
-      args
-    end
-
     # Send the message to the default rake output (which is $stderr).
     def rake_output_message(message)
       $stderr.puts(message)

data/lib/rake/invocation_chain.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # InvocationChain tracks the chain of task invocations to detect

data/lib/rake/invocation_exception_mixin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
   module InvocationExceptionMixin
     # Return the invocation chain (list of Rake tasks) that were in

data/lib/rake/late_time.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
   # LateTime is a fake timestamp that occurs _after_ any other time value.
   class LateTime

data/lib/rake/linked_list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # Polylithic linked list structure used to implement several data

data/lib/rake/loaders/makefile.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # Makefile loader to be used with the import file loader.  Use this to

data/lib/rake/multi_task.rb

@@ -1,49 +1,14 @@
+# frozen_string_literal: true
 module Rake
 
   # Same as a regular task, but the immediate prerequisites are done in
   # parallel using Ruby threads.
   #
   class MultiTask < Task
-
-    # Same as invoke, but explicitly pass a call chain to detect
-    # circular dependencies. This is largely copied from Rake::Task
-    # but has been updated such that if multiple tasks depend on this
-    # one in parallel, they will all fail if the first execution of
-    # this task fails.
-    def invoke_with_call_chain(task_args, invocation_chain)
-      new_chain = Rake::InvocationChain.append(self, invocation_chain)
-      @lock.synchronize do
-        begin
-          if @already_invoked
-            if @invocation_exception
-              if application.options.trace
-                application.trace "** Previous invocation of #{name} failed #{format_trace_flags}"
-              end
-              raise @invocation_exception
-            else
-              return
-            end
-          end
-
-          if application.options.trace
-            application.trace "** Invoke #{name} #{format_trace_flags}"
-          end
-          @already_invoked = true
-
-          invoke_prerequisites(task_args, new_chain)
-          execute(task_args) if needed?
-        rescue Exception => ex
-          add_chain_to(ex, new_chain)
-          @invocation_exception = ex
-          raise
-        end
-      end
-    end
-
     private
+
     def invoke_prerequisites(task_args, invocation_chain) # :nodoc:
       invoke_prerequisites_concurrently(task_args, invocation_chain)
     end
   end
-
 end

data/lib/rake/name_space.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # The NameSpace class will lookup task names in the scope defined by a
 # +namespace+ command.

data/lib/rake/packagetask.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Define a package task library to aid in the definition of
 # redistributable package files.
 
@@ -78,6 +79,9 @@ module Rake
     # Zip command for zipped archives.  The default is 'zip'.
     attr_accessor :zip_command
 
+    # True if parent directory should be omited (default is false)
+    attr_accessor :without_parent_dir
+
     # Create a Package Task with the given name and version.  Use +:noversion+
     # as the version to build a package without a version or to provide a
     # fully-versioned package name.
@@ -101,6 +105,7 @@ module Rake
       @need_zip = false
       @tar_command = "tar"
       @zip_command = "zip"
+      @without_parent_dir = false
     end
 
     # Create the tasks defined by this task library.
@@ -131,9 +136,8 @@ module Rake
           task package: ["#{package_dir}/#{file}"]
           file "#{package_dir}/#{file}" =>
             [package_dir_path] + package_files do
-            chdir(package_dir) do
-              sh @tar_command, "#{flag}cvf", file, package_name
-            end
+            chdir(working_dir) { sh @tar_command, "#{flag}cvf", file, target_dir }
+            mv "#{package_dir_path}/#{target_dir}", package_dir if without_parent_dir
           end
         end
       end
@@ -142,9 +146,8 @@ module Rake
         task package: ["#{package_dir}/#{zip_file}"]
         file "#{package_dir}/#{zip_file}" =>
           [package_dir_path] + package_files do
-          chdir(package_dir) do
-            sh @zip_command, "-r", zip_file, package_name
-          end
+          chdir(working_dir) { sh @zip_command, "-r", zip_file, target_dir }
+          mv "#{package_dir_path}/#{zip_file}", package_dir if without_parent_dir
         end
       end
 
@@ -205,6 +208,15 @@ module Rake
     def zip_file
       "#{package_name}.zip"
     end
+
+    def working_dir
+      without_parent_dir ? package_dir_path : package_dir
+    end
+
+    # target directory relative to working_dir
+    def target_dir
+      without_parent_dir ? "." : package_name
+    end
   end
 
 end

data/lib/rake/phony.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Defines a :phony task that you can use as a dependency. This allows
 # file-based tasks to use non-file-based tasks as prerequisites
 # without forcing them to rebuild.

data/lib/rake/private_reader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # Include PrivateReader to use +private_reader+.

data/lib/rake/promise.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # A Promise object represents a promise to do work (a chore) in the
@@ -70,12 +71,12 @@ module Rake
 
     # Do we have a result for the promise
     def result?
-      ! @result.equal?(NOT_SET)
+      !@result.equal?(NOT_SET)
     end
 
     # Did the promise throw an error
     def error?
-      ! @error.equal?(NOT_SET)
+      !@error.equal?(NOT_SET)
     end
 
     # Are we done with the promise

data/lib/rake/pseudo_status.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   ##

data/lib/rake/rake_module.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rake/application"
 
 module Rake
@@ -33,6 +34,34 @@ module Rake
       application.options.rakelib ||= []
       application.options.rakelib.concat(files)
     end
+
+    # Make +block_application+ the default rake application inside a block so
+    # you can load rakefiles into a different application.
+    #
+    # This is useful when you want to run rake tasks inside a library without
+    # running rake in a sub-shell.
+    #
+    # Example:
+    #
+    #   Dir.chdir 'other/directory'
+    #
+    #   other_rake = Rake.with_application do |rake|
+    #     rake.load_rakefile
+    #   end
+    #
+    #   puts other_rake.tasks
+
+    def with_application(block_application = Rake::Application.new)
+      orig_application = Rake.application
+
+      Rake.application = block_application
+
+      yield block_application
+
+      block_application
+    ensure
+      Rake.application = orig_application
+    end
   end
 
 end

data/lib/rake/rake_test_loader.rb

@@ -1,20 +1,26 @@
+# frozen_string_literal: true
 require "rake"
 
 # Load the test files from the command line.
 argv = ARGV.select do |argument|
-  case argument
-  when /^-/ then
-    argument
-  when /\*/ then
-    FileList[argument].to_a.each do |file|
-      require File.expand_path file
-    end
+  begin
+    case argument
+    when /^-/ then
+      argument
+    when /\*/ then
+      FileList[argument].to_a.each do |file|
+        require File.expand_path file
+      end
 
-    false
-  else
-    require File.expand_path argument
+      false
+    else
+      require File.expand_path argument
 
-    false
+      false
+    end
+  rescue LoadError => e
+    raise unless e.path
+    abort "\nFile does not exist: #{e.path}\n\n"
   end
 end
 

data/lib/rake/rule_recursion_overflow_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # Error indicating a recursion overflow error in task selection.

data/lib/rake/scope.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
   class Scope < LinkedList # :nodoc: all
 
@@ -15,7 +16,7 @@ module Rake
     # this trim beyond the toplevel scope.
     def trim(n)
       result = self
-      while n > 0 && ! result.empty?
+      while n > 0 && !result.empty?
         result = result.tail
         n -= 1
       end

data/lib/rake/task.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rake/invocation_exception_mixin"
 
 module Rake
@@ -14,6 +15,10 @@ module Rake
   class Task
     # List of prerequisites for a task.
     attr_reader :prerequisites
+    alias prereqs prerequisites
+
+    # List of order only prerequisites for a task.
+    attr_reader :order_only_prerequisites
 
     # List of actions attached to a task.
     attr_reader :actions
@@ -54,7 +59,7 @@ module Rake
 
     # List of prerequisite tasks
     def prerequisite_tasks
-      prerequisites.map { |pre| lookup_prerequisite(pre) }
+      (prerequisites + order_only_prerequisites).map { |pre| lookup_prerequisite(pre) }
     end
 
     def lookup_prerequisite(prerequisite_name) # :nodoc:
@@ -102,6 +107,8 @@ module Rake
       @scope           = app.current_scope
       @arg_names       = nil
       @locations       = []
+      @invocation_exception = nil
+      @order_only_prerequisites = []
     end
 
     # Enhance a task with prerequisites or actions.  Returns self.
@@ -182,20 +189,39 @@ module Rake
 
     # Same as invoke, but explicitly pass a call chain to detect
     # circular dependencies.
-    def invoke_with_call_chain(task_args, invocation_chain) # :nodoc:
-      new_chain = InvocationChain.append(self, invocation_chain)
+    #
+    # If multiple tasks depend on this
+    # one in parallel, they will all fail if the first execution of
+    # this task fails.
+    def invoke_with_call_chain(task_args, invocation_chain)
+      new_chain = Rake::InvocationChain.append(self, invocation_chain)
       @lock.synchronize do
-        if application.options.trace
-          application.trace "** Invoke #{name} #{format_trace_flags}"
+        begin
+          if application.options.trace
+            application.trace "** Invoke #{name} #{format_trace_flags}"
+          end
+
+          if @already_invoked
+            if @invocation_exception
+              if application.options.trace
+                application.trace "** Previous invocation of #{name} failed #{format_trace_flags}"
+              end
+              raise @invocation_exception
+            else
+              return
+            end
+          end
+
+          @already_invoked = true
+
+          invoke_prerequisites(task_args, new_chain)
+          execute(task_args) if needed?
+        rescue Exception => ex
+          add_chain_to(ex, new_chain)
+          @invocation_exception = ex
+          raise ex
         end
-        return if @already_invoked
-        @already_invoked = true
-        invoke_prerequisites(task_args, new_chain)
-        execute(task_args) if needed?
       end
-    rescue Exception => ex
-      add_chain_to(ex, new_chain)
-      raise ex
     end
     protected :invoke_with_call_chain
 
@@ -226,7 +252,8 @@ module Rake
           r.invoke_with_call_chain(prereq_args, invocation_chain)
         end
       end
-      futures.each(&:value)
+      # Iterate in reverse to improve performance related to thread waiting and switching
+      futures.reverse_each(&:value)
     end
 
     # Format the trace flags for display.
@@ -247,7 +274,11 @@ module Rake
       end
       application.trace "** Execute #{name}" if application.options.trace
       application.enhance_with_matching_rule(name) if @actions.empty?
-      @actions.each { |act| act.call(self, args) }
+      if opts = Hash.try_convert(args) and !opts.empty?
+        @actions.each { |act| act.call(self, args, **opts)}
+      else
+        @actions.each { |act| act.call(self, args)}
+      end
     end
 
     # Is this task needed?
@@ -266,7 +297,7 @@ module Rake
     def add_description(description)
       return unless description
       comment = description.strip
-      add_comment(comment) if comment && ! comment.empty?
+      add_comment(comment) if comment && !comment.empty?
     end
 
     def comment=(comment) # :nodoc:
@@ -320,7 +351,7 @@ module Rake
     # Return a string describing the internal state of a task.  Useful for
     # debugging.
     def investigation
-      result = "------------------------------\n"
+      result = "------------------------------\n".dup
       result << "Investigating #{name}\n"
       result << "class: #{self.class}\n"
       result <<  "task needed: #{needed?}\n"
@@ -337,6 +368,18 @@ module Rake
       return result
     end
 
+    # Format dependencies parameter to pass to task.
+    def self.format_deps(deps)
+      deps = [deps] unless deps.respond_to?(:to_ary)
+      deps.map { |d| Rake.from_pathname(d).to_s }
+    end
+
+    # Add order only dependencies.
+    def |(deps)
+      @order_only_prerequisites |= Task.format_deps(deps) - @prerequisites
+      self
+    end
+
     # ----------------------------------------------------------------
     # Rake Module Methods
     #