rake 10.5.0 → 13.2.1

data/lib/rake/cpu_counter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # Based on a script at:
@@ -14,7 +15,7 @@ module Rake
     end
 
     begin
-      require 'etc'
+      require "etc"
     rescue LoadError
     else
       if Etc.respond_to?(:nprocessors)
@@ -30,31 +31,22 @@ unless Rake::CpuCounter.method_defined?(:count)
   Rake::CpuCounter.class_eval <<-'end;', __FILE__, __LINE__+1
     require 'rbconfig'
 
-    # TODO: replace with IO.popen using array-style arguments in Rake 11
-    require 'open3'
-
     def count
-      if defined?(Java::Java)
+      if RUBY_PLATFORM == 'java'
         count_via_java_runtime
       else
         case RbConfig::CONFIG['host_os']
-        when /darwin9/
-          count_via_hwprefs_cpu_count
-        when /darwin/
-          count_via_hwprefs_thread_count || count_via_sysctl
         when /linux/
           count_via_cpuinfo
-        when /bsd/
+        when /darwin|bsd/
           count_via_sysctl
         when /mswin|mingw/
           count_via_win32
         else
           # Try everything
           count_via_win32 ||
-            count_via_sysctl ||
-            count_via_hwprefs_thread_count ||
-            count_via_hwprefs_cpu_count ||
-            count_via_cpuinfo
+          count_via_sysctl ||
+          count_via_cpuinfo
         end
       end
     end
@@ -80,14 +72,6 @@ unless Rake::CpuCounter.method_defined?(:count)
       nil
     end
 
-    def count_via_hwprefs_thread_count
-      run 'hwprefs', 'thread_count'
-    end
-
-    def count_via_hwprefs_cpu_count
-      run 'hwprefs', 'cpu_count'
-    end
-
     def count_via_sysctl
       run 'sysctl', '-n', 'hw.ncpu'
     end
@@ -95,10 +79,8 @@ unless Rake::CpuCounter.method_defined?(:count)
     def run(command, *args)
       cmd = resolve_command(command)
       if cmd
-        Open3.popen3 cmd, *args do |inn, out, err,|
-          inn.close
-          err.read
-          out.read.to_i
+        IO.popen [cmd, *args] do |io|
+          io.read.to_i
         end
       else
         nil
@@ -117,8 +99,8 @@ unless Rake::CpuCounter.method_defined?(:count)
     end
 
     def in_path_command(command)
-      Open3.popen3 'which', command do |_, out,|
-        out.eof? ? nil : command
+      IO.popen ['which', command] do |io|
+        io.eof? ? nil : command
       end
     end
   end;

data/lib/rake/default_loader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # Default Rakefile loader used by +import+.

data/lib/rake/dsl_definition.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 # Rake DSL functions.
-require 'rake/file_utils_ext'
+require "rake/file_utils_ext"
 
 module Rake
 
@@ -25,10 +26,9 @@ module Rake
     private
 
     # :call-seq:
-    #   task task_name
-    #   task task_name: dependencies
-    #   task task_name, arguments => dependencies
-    #   task task_name, argument[, argument ...], :needs: dependencies
+    #   task(task_name)
+    #   task(task_name: dependencies)
+    #   task(task_name, arguments => dependencies)
     #
     # Declare a basic task.  The +task_name+ is always the first argument.  If
     # the task name contains a ":" it is defined in that namespace.
@@ -56,12 +56,6 @@ module Rake
     #
     #   $ rake package[1.2.3]
     #
-    # Alternate definition:
-    #
-    #   task :package, :version, needs: :test do |t, args|
-    #     # ...
-    #   end
-    #
     def task(*args, &block) # :doc:
       Rake::Task.define_task(*args, &block)
     end
@@ -96,6 +90,7 @@ module Rake
     #   directory "testdata/doc"
     #
     def directory(*args, &block) # :doc:
+      args = args.flat_map { |arg| arg.is_a?(FileList) ? arg.to_a.flatten : arg }
       result = file_create(*args, &block)
       dir, _ = *Rake.application.resolve_args(args)
       dir = Rake.from_pathname(dir)
@@ -151,7 +146,7 @@ module Rake
     #
     # Example:
     #  rule '.o' => '.c' do |t|
-    #    sh 'cc', '-o', t.name, t.source
+    #    sh 'cc', '-c', '-o', t.name, t.source
     #  end
     #
     def rule(*args, &block) # :doc:
@@ -164,7 +159,7 @@ module Rake
     #
     # Example:
     #   desc "Run the Unit Tests"
-    #   task test: [:build]
+    #   task test: [:build] do
     #     # ... run tests
     #   end
     #

data/lib/rake/early_time.rb

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

data/lib/rake/ext/core.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Module
   # Check for an existing method in the current class before extending.  If
   # the method already exists, then a warning is printed and the extension is

data/lib/rake/ext/string.rb

@@ -1,4 +1,5 @@
-require 'rake/ext/core'
+# frozen_string_literal: true
+require "rake/ext/core"
 
 class String
 
@@ -10,9 +11,9 @@ class String
     # +ext+ is a user added method for the String class.
     #
     # This String extension comes from Rake
-    def ext(newext='')
-      return self.dup if ['.', '..'].include? self
-      if newext != ''
+    def ext(newext="")
+      return self.dup if [".", ".."].include? self
+      if newext != ""
         newext = "." + newext unless newext =~ /^\./
       end
       self.chomp(File.extname(self)) << newext
@@ -26,8 +27,8 @@ class String
     def pathmap_explode
       head, tail = File.split(self)
       return [self] if head == self
-      return [tail] if head == '.' || tail == '/'
-      return [head, tail] if head == '/'
+      return [tail] if head == "." || tail == "/"
+      return [head, tail] if head == "/"
       return head.pathmap_explode + [tail]
     end
     protected :pathmap_explode
@@ -57,15 +58,15 @@ class String
     # This String extension comes from Rake
     def pathmap_replace(patterns, &block)
       result = self
-      patterns.split(';').each do |pair|
-        pattern, replacement = pair.split(',')
+      patterns.split(";").each do |pair|
+        pattern, replacement = pair.split(",")
         pattern = Regexp.new(pattern)
-        if replacement == '*' && block_given?
+        if replacement == "*" && block_given?
           result = result.sub(pattern, &block)
         elsif replacement
           result = result.sub(pattern, replacement)
         else
-          result = result.sub(pattern, '')
+          result = result.sub(pattern, "")
         end
       end
       result
@@ -136,32 +137,32 @@ class String
     # This String extension comes from Rake
     def pathmap(spec=nil, &block)
       return self if spec.nil?
-      result = ''
+      result = "".dup
       spec.scan(/%\{[^}]*\}-?\d*[sdpfnxX%]|%-?\d+d|%.|[^%]+/) do |frag|
         case frag
-        when '%f'
+        when "%f"
           result << File.basename(self)
-        when '%n'
+        when "%n"
           result << File.basename(self).ext
-        when '%d'
+        when "%d"
           result << File.dirname(self)
-        when '%x'
+        when "%x"
           result << File.extname(self)
-        when '%X'
+        when "%X"
           result << self.ext
-        when '%p'
+        when "%p"
           result << self
-        when '%s'
+        when "%s"
           result << (File::ALT_SEPARATOR || File::SEPARATOR)
-        when '%-'
+        when "%-"
           # do nothing
-        when '%%'
+        when "%%"
           result << "%"
         when /%(-?\d+)d/
           result << pathmap_partial($1.to_i)
         when /^%\{([^}]*)\}(\d*[dpfnxX])/
           patterns, operator = $1, $2
-          result << pathmap('%' + operator).pathmap_replace(patterns, &block)
+          result << pathmap("%" + operator).pathmap_replace(patterns, &block)
         when /^%/
           fail ArgumentError, "Unknown pathmap specifier #{frag} in '#{spec}'"
         else

data/lib/rake/file_creation_task.rb

@@ -1,5 +1,6 @@
-require 'rake/file_task'
-require 'rake/early_time'
+# frozen_string_literal: true
+require "rake/file_task"
+require "rake/early_time"
 
 module Rake
 
@@ -11,7 +12,7 @@ module Rake
   class FileCreationTask < FileTask
     # Is this file task needed?  Yes if it doesn't exist.
     def needed?
-      ! File.exist?(name)
+      !File.exist?(name)
     end
 
     # Time stamp for file creation task.  This time stamp is earlier

data/lib/rake/file_list.rb

@@ -1,7 +1,7 @@
-require 'rake/cloneable'
-require 'rake/file_utils_ext'
-require 'rake/pathmap'
-
+# frozen_string_literal: true
+require "rake/cloneable"
+require "rake/file_utils_ext"
+require "rake/ext/string"
 
 module Rake
 
@@ -41,8 +41,7 @@ module Rake
 
     # List of array methods (that are not in +Object+) that need to be
     # delegated.
-    ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).
-      map { |n| n.to_s }
+    ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).map(&:to_s)
 
     # List of additional methods that must be delegated.
     MUST_DEFINE = %w[inspect <=>]
@@ -59,8 +58,7 @@ module Rake
       + - & |
     ]
 
-    DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).
-      map { |s| s.to_s }.sort.uniq
+    DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).map(&:to_s).sort.uniq
 
     # Now do the delegation.
     DELEGATING_METHODS.each do |sym|
@@ -85,6 +83,8 @@ module Rake
       end
     end
 
+    GLOB_PATTERN = %r{[*?\[\{]}
+
     # Create a file list from the globbable patterns given.  If you wish to
     # perform multiple includes or excludes at object build time, use the
     # "yield self" pattern.
@@ -149,7 +149,11 @@ module Rake
     #
     def exclude(*patterns, &block)
       patterns.each do |pat|
-        @exclude_patterns << Rake.from_pathname(pat)
+        if pat.respond_to? :to_ary
+          exclude(*pat.to_ary)
+        else
+          @exclude_patterns << Rake.from_pathname(pat)
+        end
       end
       @exclude_procs << block if block_given?
       resolve_exclude unless @pending
@@ -190,7 +194,7 @@ module Rake
       result = @items * other
       case result
       when Array
-        FileList.new.import(result)
+        self.class.new.import(result)
       else
         result
       end
@@ -215,7 +219,7 @@ module Rake
 
     def resolve_add(fn) # :nodoc:
       case fn
-      when %r{[*?\[\{]}
+      when GLOB_PATTERN
         add_matching(fn)
       else
         self << fn
@@ -236,7 +240,7 @@ module Rake
     #   FileList['a.c', 'b.c'].sub(/\.c$/, '.o')  => ['a.o', 'b.o']
     #
     def sub(pat, rep)
-      inject(FileList.new) { |res, fn| res << fn.sub(pat, rep) }
+      inject(self.class.new) { |res, fn| res << fn.sub(pat, rep) }
     end
 
     # Return a new FileList with the results of running +gsub+ against each
@@ -247,7 +251,7 @@ module Rake
     #      => ['lib\\test\\file', 'x\\y']
     #
     def gsub(pat, rep)
-      inject(FileList.new) { |res, fn| res << fn.gsub(pat, rep) }
+      inject(self.class.new) { |res, fn| res << fn.gsub(pat, rep) }
     end
 
     # Same as +sub+ except that the original file list is modified.
@@ -265,8 +269,8 @@ module Rake
     # Apply the pathmap spec to each of the included file names, returning a
     # new file list with the modified paths.  (See String#pathmap for
     # details.)
-    def pathmap(spec=nil)
-      collect { |fn| fn.pathmap(spec) }
+    def pathmap(spec=nil, &block)
+      collect { |fn| fn.pathmap(spec, &block) }
     end
 
     # Return a new FileList with <tt>String#ext</tt> method applied to
@@ -277,7 +281,7 @@ module Rake
     #    array.collect { |item| item.ext(newext) }
     #
     # +ext+ is a user added method for the Array class.
-    def ext(newext='')
+    def ext(newext="")
       collect { |fn| fn.ext(newext) }
     end
 
@@ -290,7 +294,7 @@ module Rake
       matched = 0
       each do |fn|
         begin
-          open(fn, "r", *options) do |inf|
+          File.open(fn, "r", *options) do |inf|
             count = 0
             inf.each do |line|
               count += 1
@@ -314,14 +318,14 @@ module Rake
     # Return a new file list that only contains file names from the current
     # file list that exist on the file system.
     def existing
-      select { |fn| File.exist?(fn) }
+      select { |fn| File.exist?(fn) }.uniq
     end
 
     # Modify the current file list so that it contains only file name that
     # exist on the file system.
     def existing!
       resolve
-      @items = @items.select { |fn| File.exist?(fn) }
+      @items = @items.select { |fn| File.exist?(fn) }.uniq
       self
     end
 
@@ -331,20 +335,20 @@ module Rake
       resolve
       result = @items.partition(&block)
       [
-        FileList.new.import(result[0]),
-        FileList.new.import(result[1]),
+        self.class.new.import(result[0]),
+        self.class.new.import(result[1]),
       ]
     end
 
     # Convert a FileList to a string by joining all elements with a space.
     def to_s
       resolve
-      self.join(' ')
+      self.join(" ")
     end
 
     # Add matching glob patterns.
     def add_matching(pattern)
-      FileList.glob(pattern).each do |fn|
+      self.class.glob(pattern).each do |fn|
         self << fn unless excluded_from_list?(fn)
       end
     end
@@ -362,8 +366,11 @@ module Rake
         case pat
         when Regexp
           fn =~ pat
-        when /[*?]/
-          File.fnmatch?(pat, fn, File::FNM_PATHNAME)
+        when GLOB_PATTERN
+          flags = File::FNM_PATHNAME
+          # Ruby <= 1.9.3 does not support File::FNM_EXTGLOB
+          flags |= File::FNM_EXTGLOB if defined? File::FNM_EXTGLOB
+          File.fnmatch?(pat, fn, flags)
         else
           fn == pat
         end
@@ -378,7 +385,7 @@ module Rake
       /~$/
     ]
     DEFAULT_IGNORE_PROCS = [
-      proc { |fn| fn =~ /(^|[\/\\])core$/ && ! File.directory?(fn) }
+      proc { |fn| fn =~ /(^|[\/\\])core$/ && !File.directory?(fn) }
     ]
 
     def import(array) # :nodoc:
@@ -410,7 +417,7 @@ module Rake
     # Yield each file or directory component.
     def each_dir_parent(dir)    # :nodoc:
       old_length = nil
-      while dir != '.' && dir.length != old_length
+      while dir != "." && dir.length != old_length
         yield(dir)
         old_length = dir.length
         dir = File.dirname(dir)

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,14 +14,18 @@ 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
+      begin
+        out_of_date?(File.mtime(name)) || @application.options.build_all
+      rescue Errno::ENOENT
+        true
+      end
     end
 
     # Time stamp for file task.
     def timestamp
-      if File.exist?(name)
-        File.mtime(name.to_s)
-      else
+      begin
+        File.mtime(name)
+      rescue Errno::ENOENT
         Rake::LATE
       end
     end
@@ -29,7 +34,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,7 @@ module FileUtils
   end
 
   def create_shell_runner(cmd) # :nodoc:
-    show_command = cmd.join(" ")
-    show_command = show_command[0, 42] + "..." unless $trace
+    show_command = sh_show_command cmd
     lambda do |ok, status|
       ok or
         fail "Command failed with status (#{status.exitstatus}): " +
@@ -69,6 +68,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 +90,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 +107,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 +125,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