rake 11.3.0 → 12.0.0.beta1

data/lib/rake/backtrace.rb

@@ -5,12 +5,12 @@ module Rake
       [ File.join(File.dirname(__FILE__), "..") ]
 
     SUPPRESSED_PATHS = SYS_PATHS.
-      map { |s| s.gsub("\\", "/") }.
+      map { |s| s.tr("\\", "/") }.
       map { |f| File.expand_path(f) }.
       reject { |s| s.nil? || s =~ /^ *$/ }
     SUPPRESSED_PATHS_RE = SUPPRESSED_PATHS.map { |f| Regexp.quote(f) }.join("|")
     SUPPRESSED_PATHS_RE << "|^org\\/jruby\\/\\w+\\.java" if
-      Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+      Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == "jruby"
 
     SUPPRESS_PATTERN = %r!(\A(#{SUPPRESSED_PATHS_RE})|bin/rake:\d+)!i
 

data/lib/rake/clean.rb

@@ -11,7 +11,7 @@
 #            The intent of this task is to return a project to its
 #            pristine, just unpacked state.
 
-require 'rake'
+require "rake"
 
 # :stopdoc:
 
@@ -29,6 +29,7 @@ module Rake
 
     def cleanup(file_name, opts={})
       begin
+        opts = {:verbose => Rake.application.options.trace}.merge(opts)
         rm_r file_name, opts
       rescue StandardError => ex
         puts "Failed to remove #{file_name}: #{ex}" unless file_already_gone?(file_name)
@@ -60,7 +61,7 @@ end
 
 CLEAN = ::Rake::FileList["**/*~", "**/*.bak", "**/core"]
 CLEAN.clear_exclude.exclude { |fn|
-  fn.pathmap("%f").downcase == 'core' && File.directory?(fn)
+  fn.pathmap("%f").downcase == "core" && File.directory?(fn)
 }
 
 desc "Remove any temporary products."
@@ -71,6 +72,6 @@ end
 CLOBBER = ::Rake::FileList.new
 
 desc "Remove any generated files."
-task :clobber => [:clean] do
+task clobber: [:clean] do
   Rake::Cleaner.cleanup_files(CLOBBER)
 end

data/lib/rake/cpu_counter.rb

@@ -14,7 +14,7 @@ module Rake
     end
 
     begin
-      require 'etc'
+      require "etc"
     rescue LoadError
     else
       if Etc.respond_to?(:nprocessors)

data/lib/rake/dsl_definition.rb

@@ -1,5 +1,5 @@
 # Rake DSL functions.
-require 'rake/file_utils_ext'
+require "rake/file_utils_ext"
 
 module Rake
 

data/lib/rake/ext/string.rb

@@ -1,4 +1,4 @@
-require 'rake/ext/core'
+require "rake/ext/core"
 
 class String
 
@@ -10,9 +10,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 +26,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 +57,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 +136,32 @@ class String
     # This String extension comes from Rake
     def pathmap(spec=nil, &block)
       return self if spec.nil?
-      result = ''
+      result = ""
       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,5 @@
-require 'rake/file_task'
-require 'rake/early_time'
+require "rake/file_task"
+require "rake/early_time"
 
 module Rake
 

data/lib/rake/file_list.rb

@@ -1,6 +1,6 @@
-require 'rake/cloneable'
-require 'rake/file_utils_ext'
-require 'rake/ext/string'
+require "rake/cloneable"
+require "rake/file_utils_ext"
+require "rake/ext/string"
 
 module Rake
 
@@ -40,8 +40,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 <=>]
@@ -58,8 +57,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|
@@ -282,7 +280,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
 
@@ -344,7 +342,7 @@ module Rake
     # 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.
@@ -418,7 +416,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,5 @@
-require 'rake/task.rb'
-require 'rake/early_time'
+require "rake/task.rb"
+require "rake/early_time"
 
 module Rake
 

data/lib/rake/file_utils.rb

@@ -1,19 +1,16 @@
-require 'rbconfig'
-require 'fileutils'
+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).
@@ -132,8 +129,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,4 @@
-require 'rake/file_utils'
+require "rake/file_utils"
 
 module Rake
   #
@@ -22,10 +22,10 @@ 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?

data/lib/rake/late_time.rb

@@ -9,7 +9,7 @@ module Rake
     end
 
     def to_s
-      '<LATE TIME>'
+      "<LATE TIME>"
     end
   end
 

data/lib/rake/loaders/makefile.rb

@@ -24,7 +24,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 +34,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 +44,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

@@ -4,6 +4,42 @@ module Rake
   # 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)

data/lib/rake/name_space.rb

@@ -35,4 +35,3 @@ class Rake::NameSpace
   end
 
 end
-

data/lib/rake/packagetask.rb

@@ -1,8 +1,8 @@
 # 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
 
@@ -93,14 +93,14 @@ 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"
     end
 
     # Create the tasks defined by this task library.
@@ -112,23 +112,23 @@ 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"],
         [need_tar_xz, tar_xz_file, "J"]
-      ].each do |(need, file, flag)|
+      ].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
@@ -139,7 +139,7 @@ module Rake
       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

data/lib/rake/phony.rb

@@ -4,7 +4,7 @@
 #
 # See FileTask#out_of_date? and Task#timestamp for more info.
 
-require 'rake'
+require "rake"
 
 task :phony