rake 10.5.0 → 13.0.3

data/lib/rake/file_task.rb

@@ -1,5 +1,6 @@
-require 'rake/task.rb'
-require 'rake/early_time'
+# frozen_string_literal: true
+require "rake/task"
+require "rake/early_time"
 
 module Rake
 
@@ -13,7 +14,7 @@ module Rake
     # Is this file task needed?  Yes if it doesn't exist, or if its time stamp
     # is out of date.
     def needed?
-      ! File.exist?(name) || out_of_date?(timestamp) || @application.options.build_all
+      !File.exist?(name) || out_of_date?(timestamp) || @application.options.build_all
     end
 
     # Time stamp for file task.
@@ -29,7 +30,14 @@ module Rake
 
     # Are there any prerequisites with a later time than the given time stamp?
     def out_of_date?(stamp)
-      @prerequisites.any? { |n| application[n, @scope].timestamp > stamp }
+      all_prerequisite_tasks.any? { |prereq|
+        prereq_task = application[prereq, @scope]
+        if prereq_task.instance_of?(Rake::FileTask)
+          prereq_task.timestamp > stamp || @application.options.build_all
+        else
+          prereq_task.timestamp > stamp
+        end
+      }
     end
 
     # ----------------------------------------------------------------

data/lib/rake/file_utils.rb

@@ -1,19 +1,17 @@
-require 'rbconfig'
-require 'fileutils'
+# frozen_string_literal: true
+require "rbconfig"
+require "fileutils"
 
 #--
 # This a FileUtils extension that defines several additional commands to be
 # added to the FileUtils utility functions.
 module FileUtils
   # Path to the currently running Ruby program
-  RUBY = ENV['RUBY'] || File.join(
-    RbConfig::CONFIG['bindir'],
-    RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']).
+  RUBY = ENV["RUBY"] || File.join(
+    RbConfig::CONFIG["bindir"],
+    RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]).
     sub(/.*\s.*/m, '"\&"')
 
-  OPT_TABLE['sh']  = %w(noop verbose)
-  OPT_TABLE['ruby'] = %w(noop verbose)
-
   # Run the system command +cmd+.  If multiple arguments are given the command
   # is run directly (without the shell, same semantics as Kernel::exec and
   # Kernel::system).
@@ -37,7 +35,7 @@ module FileUtils
   #
   #   # check exit status after command runs
   #   sh %{grep pattern file} do |ok, res|
-  #     if ! ok
+  #     if !ok
   #       puts "pattern not found (status = #{res.exitstatus})"
   #     end
   #   end
@@ -45,13 +43,15 @@ module FileUtils
   def sh(*cmd, &block)
     options = (Hash === cmd.last) ? cmd.pop : {}
     shell_runner = block_given? ? block : create_shell_runner(cmd)
+
     set_verbose_option(options)
-    options[:noop] ||= Rake::FileUtilsExt.nowrite_flag
-    Rake.rake_check_options options, :noop, :verbose
-    Rake.rake_output_message cmd.join(" ") if options[:verbose]
+    verbose = options.delete :verbose
+    noop    = options.delete(:noop) || Rake::FileUtilsExt.nowrite_flag
+
+    Rake.rake_output_message sh_show_command cmd if verbose
 
-    unless options[:noop]
-      res = rake_system(*cmd)
+    unless noop
+      res = (Hash === cmd.last) ? system(*cmd) : system(*cmd, options)
       status = $?
       status = Rake::PseudoStatus.new(1) if !res && status.nil?
       shell_runner.call(res, status)
@@ -59,8 +59,9 @@ module FileUtils
   end
 
   def create_shell_runner(cmd) # :nodoc:
-    show_command = cmd.join(" ")
+    show_command = sh_show_command cmd
     show_command = show_command[0, 42] + "..." unless $trace
+
     lambda do |ok, status|
       ok or
         fail "Command failed with status (#{status.exitstatus}): " +
@@ -69,6 +70,19 @@ module FileUtils
   end
   private :create_shell_runner
 
+  def sh_show_command(cmd) # :nodoc:
+    cmd = cmd.dup
+
+    if Hash === cmd.first
+      env = cmd.first
+      env = env.map { |name, value| "#{name}=#{value}" }.join " "
+      cmd[0] = env
+    end
+
+    cmd.join " "
+  end
+  private :sh_show_command
+
   def set_verbose_option(options) # :nodoc:
     unless options.key? :verbose
       options[:verbose] =
@@ -78,22 +92,16 @@ module FileUtils
   end
   private :set_verbose_option
 
-  def rake_system(*cmd) # :nodoc:
-    Rake::AltSystem.system(*cmd)
-  end
-  private :rake_system
-
   # Run a Ruby interpreter with the given arguments.
   #
   # Example:
   #   ruby %{-pe '$_.upcase!' <README}
   #
-  def ruby(*args, &block)
-    options = (Hash === args.last) ? args.pop : {}
+  def ruby(*args, **options, &block)
     if args.length > 1
-      sh(*([RUBY] + args + [options]), &block)
+      sh(RUBY, *args, **options, &block)
     else
-      sh("#{RUBY} #{args.first}", options, &block)
+      sh("#{RUBY} #{args.first}", **options, &block)
     end
   end
 
@@ -101,17 +109,15 @@ module FileUtils
 
   #  Attempt to do a normal file link, but fall back to a copy if the link
   #  fails.
-  def safe_ln(*args)
-    if ! LN_SUPPORTED[0]
-      cp(*args)
-    else
+  def safe_ln(*args, **options)
+    if LN_SUPPORTED[0]
       begin
-        ln(*args)
+        return options.empty? ? ln(*args) : ln(*args, **options)
       rescue StandardError, NotImplementedError
         LN_SUPPORTED[0] = false
-        cp(*args)
       end
     end
+    options.empty? ? cp(*args) : cp(*args, **options)
   end
 
   # Split a file path into individual directory names.
@@ -121,8 +127,8 @@ module FileUtils
   #
   def split_all(path)
     head, tail = File.split(path)
-    return [tail] if head == '.' || tail == '/'
-    return [head, tail] if head == '/'
+    return [tail] if head == "." || tail == "/"
+    return [head, tail] if head == "/"
     return split_all(head) + [tail]
   end
 end

data/lib/rake/file_utils_ext.rb

@@ -1,4 +1,5 @@
-require 'rake/file_utils'
+# 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
@@ -9,7 +10,7 @@ module Rake
     end
 
     def to_s
-      '<LATE TIME>'
+      "<LATE TIME>"
     end
   end
 

data/lib/rake/linked_list.rb

@@ -1,17 +1,12 @@
+# frozen_string_literal: true
 module Rake
 
   # Polylithic linked list structure used to implement several data
   # structures in Rake.
   class LinkedList
     include Enumerable
-
     attr_reader :head, :tail
 
-    def initialize(head, tail=EMPTY)
-      @head = head
-      @tail = tail
-    end
-
     # Polymorphically add a new element to the head of a list. The
     # type of head node will be the same list type as the tail.
     def conj(item)
@@ -19,6 +14,9 @@ module Rake
     end
 
     # Is the list empty?
+    # .make guards against a list being empty making any instantiated LinkedList
+    # object not empty by default
+    # You should consider overriding this method if you implement your own .make method
     def empty?
       false
     end
@@ -26,7 +24,7 @@ module Rake
     # Lists are structurally equivalent.
     def ==(other)
       current = self
-      while ! current.empty? && ! other.empty?
+      while !current.empty? && !other.empty?
         return false if current.head != other.head
         current = current.tail
         other = other.tail
@@ -36,20 +34,20 @@ module Rake
 
     # Convert to string: LL(item, item...)
     def to_s
-      items = map { |item| item.to_s }.join(", ")
+      items = map(&:to_s).join(", ")
       "LL(#{items})"
     end
 
     # Same as +to_s+, but with inspected items.
     def inspect
-      items = map { |item| item.inspect }.join(", ")
+      items = map(&:inspect).join(", ")
       "LL(#{items})"
     end
 
     # For each item in the list.
     def each
       current = self
-      while ! current.empty?
+      while !current.empty?
         yield(current.head)
         current = current.tail
       end
@@ -59,11 +57,16 @@ module Rake
     # Make a list out of the given arguments. This method is
     # polymorphic
     def self.make(*args)
-      result = empty
-      args.reverse_each do |item|
-        result = cons(item, result)
+      # return an EmptyLinkedList if there are no arguments
+      return empty if !args || args.empty?
+
+      # build a LinkedList by starting at the tail and iterating
+      # through each argument
+      # inject takes an EmptyLinkedList to start
+      args.reverse.inject(empty) do |list, item|
+        list = cons(item, list)
+        list # return the newly created list for each item in the block
       end
-      result
     end
 
     # Cons a new head onto the tail list.
@@ -76,6 +79,13 @@ module Rake
       self::EMPTY
     end
 
+    protected
+
+    def initialize(head, tail=EMPTY)
+      @head = head
+      @tail = tail
+    end
+
     # Represent an empty list, using the Null Object Pattern.
     #
     # When inheriting from the LinkedList class, you should implement
@@ -99,5 +109,4 @@ module Rake
 
     EMPTY = EmptyLinkedList.new
   end
-
 end

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
@@ -24,7 +25,7 @@ module Rake
       lines = File.read fn
       lines.gsub!(/\\ /, SPACE_MARK)
       lines.gsub!(/#[^\n]*\n/m, "")
-      lines.gsub!(/\\\n/, ' ')
+      lines.gsub!(/\\\n/, " ")
       lines.each_line do |line|
         process_line(line)
       end
@@ -34,7 +35,7 @@ module Rake
 
     # Process one logical line of makefile data.
     def process_line(line) # :nodoc:
-      file_tasks, args = line.split(':', 2)
+      file_tasks, args = line.split(":", 2)
       return if args.nil?
       dependents = args.split.map { |d| respace(d) }
       file_tasks.scan(/\S+/) do |file_task|
@@ -44,10 +45,10 @@ module Rake
     end
 
     def respace(str) # :nodoc:
-      str.tr SPACE_MARK, ' '
+      str.tr SPACE_MARK, " "
     end
   end
 
   # Install the handler
-  Rake.application.add_loader('mf', MakefileLoader.new)
+  Rake.application.add_loader("mf", MakefileLoader.new)
 end

data/lib/rake/multi_task.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # Same as a regular task, but the immediate prerequisites are done in
@@ -5,9 +6,9 @@ module Rake
   #
   class MultiTask < Task
     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.
@@ -35,4 +36,3 @@ class Rake::NameSpace
   end
 
 end
-

data/lib/rake/packagetask.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 # Define a package task library to aid in the definition of
 # redistributable package files.
 
-require 'rake'
-require 'rake/tasklib'
+require "rake"
+require "rake/tasklib"
 
 module Rake
 
@@ -63,6 +64,9 @@ module Rake
     # is false).
     attr_accessor :need_tar_bz2
 
+    # True if a xz'd tar file (tar.xz) should be produced (default is false)
+    attr_accessor :need_tar_xz
+
     # True if a zip file should be produced (default is false)
     attr_accessor :need_zip
 
@@ -75,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.
@@ -90,13 +97,15 @@ module Rake
       @name = name
       @version = version
       @package_files = Rake::FileList.new
-      @package_dir = 'pkg'
+      @package_dir = "pkg"
       @need_tar = false
       @need_tar_gz = false
       @need_tar_bz2 = false
+      @need_tar_xz = false
       @need_zip = false
-      @tar_command = 'tar'
-      @zip_command = 'zip'
+      @tar_command = "tar"
+      @zip_command = "zip"
+      @without_parent_dir = false
     end
 
     # Create the tasks defined by this task library.
@@ -108,38 +117,37 @@ module Rake
       task :package
 
       desc "Force a rebuild of the package files"
-      task :repackage => [:clobber_package, :package]
+      task repackage: [:clobber_package, :package]
 
       desc "Remove package products"
       task :clobber_package do
         rm_r package_dir rescue nil
       end
 
-      task :clobber => [:clobber_package]
+      task clobber: [:clobber_package]
 
       [
         [need_tar, tgz_file, "z"],
         [need_tar_gz, tar_gz_file, "z"],
-        [need_tar_bz2, tar_bz2_file, "j"]
-      ].each do |(need, file, flag)|
+        [need_tar_bz2, tar_bz2_file, "j"],
+        [need_tar_xz, tar_xz_file, "J"]
+      ].each do |need, file, flag|
         if need
-          task :package => ["#{package_dir}/#{file}"]
+          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
 
       if need_zip
-        task :package => ["#{package_dir}/#{zip_file}"]
+        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
 
@@ -189,11 +197,26 @@ module Rake
       "#{package_name}.tar.bz2"
     end
 
+    # The package name with .tar.xz added
+
+    def tar_xz_file
+      "#{package_name}.tar.xz"
+    end
+
     # The package name with .zip added
 
     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