rake 12.2.0 → 13.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11b276b752a4c2dd03e84880c1702e0ed103b589bae72f6172ddadb502311bac
-  data.tar.gz: a2bfe2510937c8f503c84a4c1c534d961cf9a06901dd439b65df9a31e0502690
+  metadata.gz: d15ff579792b6bca336893adc15bc3de3d8c8580fcdb2b2201926df30752284d
+  data.tar.gz: 499353c3ebbcd6492fb8d9fdd96078bf7954c1b3ec21f1d80bac8bf1ea592ea0
 SHA512:
-  metadata.gz: e4525784f4fb2aa4c3cfa345eed357f94e130495eed80c7bca57cb5d429d7ea5e25b3c8c066ac3df950596c7c5faa1ebfd7311589dc11c1485fc08f6189cbd6b
-  data.tar.gz: 5a10b6f9247bd9bf5d9aacc173cc516e6ca9248000ac22fd2a0bb28e5c08f49c0e5581a4dbfae67e9e14eb0befe74521528f01e81d07645387b858c3de6f12d4
+  metadata.gz: 664fa6daddc629e8bb6fd1863a765e8a7d7f2eda234ab423800dc810fe9bded3d4622e19f633e4307d322cd14adfb0c197de04394df1a0a6fa0b86fc702a7d93
+  data.tar.gz: 7f0f7208745a41dacf9959b2a4ee063deeee549d0d2e90904c47d3e84feb976e65fcc4e33f943eefdfa0ec0334e83b63ad280be0ff3926aff471a9c0b25acef9

data/History.rdoc

@@ -1,3 +1,124 @@
+=== 13.0.6
+
+* Additional fix for #389
+  Pull request #390 by hsbt
+
+=== 13.0.5
+
+* Fixed the regression of #388
+  Pull request #389 by hsbt
+
+=== 13.0.4
+
+* Fix rake test loader swallowing useful error information.
+  Pull request #367 by deivid-rodriguez
+* Add -C/--directory option the same as GNU make.
+  Pull request #376 by nobu
+
+=== 13.0.3
+
+* Fix breaking change of execution order on TestTask.
+  Pull request #368 by ysakasin
+
+=== 13.0.2
+
+==== Enhancements
+
+* Fix tests to work with current FileUtils
+  Pull Request #358 by jeremyevans
+* Simplify default rake test loader
+  Pull Request #357 by deivid-rodriguez
+* Update rdoc
+  Pull Request #366 by bahasalien
+* Update broken links to rake articles from Avdi in README
+  Pull Request #360 by svl7
+
+=== 13.0.1
+
+==== Bug fixes
+
+* Fixed bug: Reenabled task raises previous exception on second invokation 
+  Pull Request #271 by thorsteneckel
+* Fix an incorrectly resolved arg pattern
+  Pull Request #327 by mjbellantoni
+
+=== 13.0.0
+
+==== Enhancements
+
+* Follows recent changes on keyword arguments in ruby 2.7.
+  Pull Request #326 by nobu
+* Make `PackageTask` be able to omit parent directory while packing files 
+  Pull Request #310 by tonytonyjan
+* Add order only dependency
+  Pull Request #269 by take-cheeze
+
+==== Compatibility changes
+
+* Drop old ruby versions(< 2.2)
+
+=== 12.3.3
+
+==== Bug fixes
+
+* Use the application's name in error message if a task is not found.
+  Pull Request #303 by tmatilai
+
+==== Enhancements:
+
+* Use File.open explicitly.
+
+=== 12.3.2
+
+==== Bug fixes
+
+* Fixed test fails caused by 2.6 warnings.
+  Pull Request #297 by hsbt
+
+==== Enhancements:
+
+* Rdoc improvements.
+  Pull Request #293 by colby-swandale
+* Improve multitask performance.
+  Pull Request #273 by jsm
+* Add alias `prereqs`.
+  Pull Request #268 by take-cheeze
+
+=== 12.3.1
+
+==== Bug fixes
+
+* Support did_you_mean >= v1.2.0 which has a breaking change on formatters.
+  Pull request #262 by FUJI Goro.
+
+==== Enhancements:
+
+* Don't run task if it depends on already invoked but failed task.
+  Pull request #252 by Gonzalo Rodriguez.
+* Make space trimming consistent for all task arguments.
+  Pull request #259 by Gonzalo Rodriguez.
+* Removes duplicated inclusion of Rake::DSL in tests.
+  Pull request #254 by Gonzalo Rodriguez.
+* Re-raise a LoadError that didn't come from require in the test loader.
+  Pull request #250 by Dylan Thacker-Smith.
+
+=== 12.3.0
+
+==== Compatibility Changes
+
+* Bump `required_ruby_version` to Ruby 2.0.0. Rake has already
+  removed support for Ruby 1.9.x.
+
+==== Enhancements:
+
+* Support `test-bundled-gems` task on ruby core.
+
+=== 12.2.1
+
+==== Bug fixes
+
+* Fixed to break Capistrano::Application on capistrano3.
+
 === 12.2.0
 
 ==== Enhancements:

data/README.rdoc

@@ -3,7 +3,6 @@
 home :: https://github.com/ruby/rake
 bugs :: https://github.com/ruby/rake/issues
 docs :: https://ruby.github.io/rake
-build status :: {<img src="https://travis-ci.org/ruby/rake.svg?branch=master" alt="travis-ci">}[https://travis-ci.org/ruby/rake] {<img src="https://ci.appveyor.com/api/projects/status/github/ruby/rake?branch=master&svg=true" alt="appveyor">}[https://ci.appveyor.com/project/ruby/rake]
 
 == Description
 
@@ -25,8 +24,8 @@ Rake has the following features:
 
 * A library of prepackaged tasks to make building rakefiles easier. For example,
   tasks for building tarballs. (Formerly
-  tasks for building RDoc, Gems and publishing to FTP were included in rake but they're now
-  available in RDoc, RubyGems and  respectively.)
+  tasks for building RDoc, Gems, and publishing to FTP were included in rake but they're now
+  available in RDoc, RubyGems, and rake-contrib respectively.)
 
 * Supports parallel execution of tasks.
 
@@ -75,35 +74,35 @@ Type "rake --help" for all available options.
 
 === Rake Information
 
-* {Rake command-line}[rdoc-ref:doc/command_line_usage.rdoc]
-* {Writing Rakefiles}[rdoc-ref:doc/rakefile.rdoc]
-* The original {Rake announcement}[rdoc-ref:doc/rational.rdoc]
-* Rake {glossary}[rdoc-ref:doc/glossary.rdoc]
+* {Rake command-line}[link:doc/command_line_usage.rdoc]
+* {Writing Rakefiles}[link:doc/rakefile.rdoc]
+* The original {Rake announcement}[link:doc/rational.rdoc]
+* Rake {glossary}[link:doc/glossary.rdoc]
 
 === Presentations and Articles about Rake
 
 * Avdi Grimm's rake series:
-  1. {Rake Basics}[http://devblog.avdi.org/2014/04/21/rake-part-1-basics/]
-  2. {Rake File Lists}[http://devblog.avdi.org/2014/04/22/rake-part-2-file-lists/]
-  3. {Rake Rules}[http://devblog.avdi.org/2014/04/23/rake-part-3-rules/]
-  4. {Rake Pathmap}[http://devblog.avdi.org/2014/04/24/rake-part-4-pathmap/]
-  5. {File Operations}[http://devblog.avdi.org/2014/04/25/rake-part-5-file-operations/]
-  6. {Clean and Clobber}[http://devblog.avdi.org/2014/04/28/rake-part-6-clean-and-clobber/]
-  7. {MultiTask}[http://devblog.avdi.org/2014/04/29/rake-part-7-multitask/]
-* {Jim Weirich's 2003 RubyConf presentation}[http://web.archive.org/web/20140221123354/http://onestepback.org/articles/buildingwithrake/]
-* Martin Fowler's article on Rake: http://martinfowler.com/articles/rake.html
+  1. {Rake Basics}[https://avdi.codes/rake-part-1-basics/]
+  2. {Rake File Lists}[https://avdi.codes/rake-part-2-file-lists-2/]
+  3. {Rake Rules}[https://avdi.codes/rake-part-3-rules/]
+  4. {Rake Pathmap}[https://avdi.codes/rake-part-4-pathmap/]
+  5. {File Operations}[https://avdi.codes/rake-part-5-file-operations/]
+  6. {Clean and Clobber}[https://avdi.codes/rake-part-6-clean-and-clobber/]
+  7. {MultiTask}[https://avdi.codes/rake-part-7-multitask/]
+* {Jim Weirich's 2003 RubyConf presentation}[https://web.archive.org/web/20140221123354/http://onestepback.org/articles/buildingwithrake/]
+* Martin Fowler's article on Rake: https://martinfowler.com/articles/rake.html
 
 == Other Make Re-envisionings ...
 
 Rake is a late entry in the make replacement field.  Here are links to
 other projects with similar (and not so similar) goals.
 
-* http://directory.fsf.org/wiki/Bras -- Bras, one of earliest
+* https://directory.fsf.org/wiki/Bras -- Bras, one of earliest
   implementations of "make in a scripting language".
 * http://www.a-a-p.org -- Make in Python
-* http://ant.apache.org -- The Ant project
-* http://search.cpan.org/search?query=PerlBuildSystem -- The Perl Build System
-* http://www.rubydoc.info/gems/rant/0.5.7/frames -- Rant, another Ruby make tool.
+* https://ant.apache.org -- The Ant project
+* https://search.cpan.org/search?query=PerlBuildSystem -- The Perl Build System
+* https://www.rubydoc.info/gems/rant/0.5.7/frames -- Rant, another Ruby make tool.
 
 == Credits
 
@@ -130,7 +129,7 @@ Rake is available under an MIT-style license.
 = Other stuff
 
 Author::   Jim Weirich <jim.weirich@gmail.com>
-Requires:: Ruby 1.9.3 or later
+Requires:: Ruby 2.0.0 or later
 License::  Copyright Jim Weirich.
            Released under an MIT-style license.  See the MIT-LICENSE
            file included in the distribution.

data/lib/rake/application.rb

@@ -88,7 +88,12 @@ module Rake
     def init(app_name="rake", argv = ARGV)
       standard_exception_handling do
         @name = app_name
-        args = handle_options argv
+        begin
+          args = handle_options argv
+        rescue ArgumentError
+          # Backward compatibility for capistrano
+          args = handle_options
+        end
         collect_command_line_tasks(args)
       end
     end
@@ -167,7 +172,7 @@ module Rake
       args = []
 
       begin
-        /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
+        /\s*((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
 
         remaining_args = $2
         args << $1.gsub(/\\(.)/, '\1')
@@ -387,7 +392,7 @@ module Rake
 
     def sort_options(options) # :nodoc:
       options.sort_by { |opt|
-        opt.select { |o| o =~ /^-/ }.map(&:downcase).sort.reverse
+        opt.select { |o| o.is_a?(String) && o =~ /^-/ }.map(&:downcase).sort.reverse
       }
     end
     private :sort_options
@@ -428,6 +433,13 @@ module Rake
               select_tasks_to_show(options, :describe, value)
             }
           ],
+          ["--directory", "-C [DIRECTORY]",
+            "Change to DIRECTORY before doing anything.",
+            lambda { |value|
+              Dir.chdir value
+              @original_dir = Dir.pwd
+            }
+          ],
           ["--dry-run", "-n",
             "Do a dry run without executing actions.",
             lambda { |value|
@@ -682,7 +694,7 @@ module Rake
 
     def raw_load_rakefile # :nodoc:
       rakefile, location = find_rakefile_location
-      if (! options.ignore_system) &&
+      if (!options.ignore_system) &&
           (options.load_system || rakefile.nil?) &&
           system_dir && File.directory?(system_dir)
         print_rakefile_directory(location)
@@ -792,7 +804,7 @@ module Rake
       backtrace.find { |str| str =~ re } || ""
     end
 
-    def set_default_options
+    def set_default_options # :nodoc:
       options.always_multitask           = false
       options.backtrace                  = false
       options.build_all                  = false

data/lib/rake/clean.rb

@@ -28,10 +28,10 @@ module Rake
       end
     end
 
-    def cleanup(file_name, opts={})
+    def cleanup(file_name, **opts)
       begin
         opts = { verbose: Rake.application.options.trace }.merge(opts)
-        rm_r file_name, opts
+        rm_r file_name, **opts
       rescue StandardError => ex
         puts "Failed to remove #{file_name}: #{ex}" unless file_already_gone?(file_name)
       end

data/lib/rake/cpu_counter.rb

@@ -32,7 +32,7 @@ unless Rake::CpuCounter.method_defined?(:count)
     require 'rbconfig'
 
     def count
-      if defined?(Java::Java)
+      if RUBY_PLATFORM == 'java'
         count_via_java_runtime
       else
         case RbConfig::CONFIG['host_os']

data/lib/rake/dsl_definition.rb

@@ -26,9 +26,9 @@ module Rake
     private
 
     # :call-seq:
-    #   task task_name
-    #   task task_name: dependencies
-    #   task task_name, arguments => 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.

data/lib/rake/file_creation_task.rb

@@ -12,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

@@ -294,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
@@ -385,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:

data/lib/rake/file_task.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require "rake/task.rb"
+require "rake/task"
 require "rake/early_time"
 
 module Rake
@@ -14,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.

data/lib/rake/file_utils.rb

@@ -35,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
@@ -97,12 +97,11 @@ module FileUtils
   # 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
 
@@ -110,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.

data/lib/rake/file_utils_ext.rb

@@ -23,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
@@ -113,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/multi_task.rb

@@ -5,46 +5,10 @@ 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)
     end
   end
-
 end

data/lib/rake/packagetask.rb

@@ -79,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.
@@ -102,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.
@@ -132,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
@@ -143,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
 
@@ -206,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/promise.rb

@@ -71,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/rake_test_loader.rb

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

data/lib/rake/scope.rb

@@ -16,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