rake 10.5.0 → 13.2.1

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 omitted (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

data/lib/rake/phony.rb

@@ -1,10 +1,11 @@
+# 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.
 #
 # See FileTask#out_of_date? and Task#timestamp for more info.
 
-require 'rake'
+require "rake"
 
 task :phony
 

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
@@ -27,11 +28,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 +40,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,27 +56,27 @@ 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
 
     # 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,4 +1,5 @@
-require 'rake/application'
+# 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,4 +1,6 @@
-require 'rake'
+# frozen_string_literal: true
+
+require "rake/file_list"
 
 # Load the test files from the command line.
 argv = ARGV.select do |argument|
@@ -6,17 +8,20 @@ argv = ARGV.select do |argument|
   when /^-/ then
     argument
   when /\*/ then
-    FileList[argument].to_a.each do |file|
+    Rake::FileList[argument].to_a.each do |file|
       require File.expand_path file
     end
 
     false
   else
-    require File.expand_path argument
+    path = File.expand_path argument
+
+    abort "\nFile does not exist: #{path}\n\n" unless File.exist?(path)
+
+    require path
 
     false
   end
 end
 
 ARGV.replace argv
-

data/lib/rake/rule_recursion_overflow_error.rb

@@ -1,4 +1,4 @@
-
+# frozen_string_literal: true
 module Rake
 
   # Error indicating a recursion overflow error in task selection.
@@ -13,7 +13,7 @@ module Rake
     end
 
     def message
-      super + ": [" + @targets.reverse.join(' => ') + "]"
+      super + ": [" + @targets.reverse.join(" => ") + "]"
     end
   end
 

data/lib/rake/scope.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 module Rake
   class Scope < LinkedList # :nodoc: all
 
     # 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.
@@ -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