rake 12.2.0 → 13.0.6

data/lib/rake/task.rb

@@ -15,6 +15,10 @@ module Rake
   class Task
     # List of prerequisites for a task.
     attr_reader :prerequisites
+    alias prereqs prerequisites
+
+    # List of order only prerequisites for a task.
+    attr_reader :order_only_prerequisites
 
     # List of actions attached to a task.
     attr_reader :actions
@@ -55,7 +59,7 @@ module Rake
 
     # List of prerequisite tasks
     def prerequisite_tasks
-      prerequisites.map { |pre| lookup_prerequisite(pre) }
+      (prerequisites + order_only_prerequisites).map { |pre| lookup_prerequisite(pre) }
     end
 
     def lookup_prerequisite(prerequisite_name) # :nodoc:
@@ -103,6 +107,8 @@ module Rake
       @scope           = app.current_scope
       @arg_names       = nil
       @locations       = []
+      @invocation_exception = nil
+      @order_only_prerequisites = []
     end
 
     # Enhance a task with prerequisites or actions.  Returns self.
@@ -140,6 +146,7 @@ module Rake
     # is invoked again.
     def reenable
       @already_invoked = false
+      @invocation_exception = nil
     end
 
     # Clear the existing prerequisites, actions, comments, and arguments of a rake task.
@@ -183,20 +190,39 @@ module Rake
 
     # Same as invoke, but explicitly pass a call chain to detect
     # circular dependencies.
-    def invoke_with_call_chain(task_args, invocation_chain) # :nodoc:
-      new_chain = InvocationChain.append(self, invocation_chain)
+    #
+    # 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
-        if application.options.trace
-          application.trace "** Invoke #{name} #{format_trace_flags}"
+        begin
+          if application.options.trace
+            application.trace "** Invoke #{name} #{format_trace_flags}"
+          end
+
+          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
+
+          @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 ex
         end
-        return if @already_invoked
-        @already_invoked = true
-        invoke_prerequisites(task_args, new_chain)
-        execute(task_args) if needed?
       end
-    rescue Exception => ex
-      add_chain_to(ex, new_chain)
-      raise ex
     end
     protected :invoke_with_call_chain
 
@@ -227,7 +253,8 @@ module Rake
           r.invoke_with_call_chain(prereq_args, invocation_chain)
         end
       end
-      futures.each(&:value)
+      # Iterate in reverse to improve performance related to thread waiting and switching
+      futures.reverse_each(&:value)
     end
 
     # Format the trace flags for display.
@@ -248,7 +275,11 @@ module Rake
       end
       application.trace "** Execute #{name}" if application.options.trace
       application.enhance_with_matching_rule(name) if @actions.empty?
-      @actions.each { |act| act.call(self, args) }
+      if opts = Hash.try_convert(args) and !opts.empty?
+        @actions.each { |act| act.call(self, args, **opts)}
+      else
+        @actions.each { |act| act.call(self, args)}
+      end
     end
 
     # Is this task needed?
@@ -267,7 +298,7 @@ module Rake
     def add_description(description)
       return unless description
       comment = description.strip
-      add_comment(comment) if comment && ! comment.empty?
+      add_comment(comment) if comment && !comment.empty?
     end
 
     def comment=(comment) # :nodoc:
@@ -338,6 +369,18 @@ module Rake
       return result
     end
 
+    # Format dependencies parameter to pass to task.
+    def self.format_deps(deps)
+      deps = [deps] unless deps.respond_to?(:to_ary)
+      deps.map { |d| Rake.from_pathname(d).to_s }
+    end
+
+    # Add order only dependencies.
+    def |(deps)
+      @order_only_prerequisites |= Task.format_deps(deps) - @prerequisites
+      self
+    end
+
     # ----------------------------------------------------------------
     # Rake Module Methods
     #

data/lib/rake/task_manager.rb

@@ -15,13 +15,13 @@ module Rake
     end
 
     def create_rule(*args, &block) # :nodoc:
-      pattern, args, deps = resolve_args(args)
+      pattern, args, deps, order_only = resolve_args(args)
       pattern = Regexp.new(Regexp.quote(pattern) + "$") if String === pattern
-      @rules << [pattern, args, deps, block]
+      @rules << [pattern, args, deps, order_only, block]
     end
 
     def define_task(task_class, *args, &block) # :nodoc:
-      task_name, arg_names, deps = resolve_args(args)
+      task_name, arg_names, deps, order_only = resolve_args(args)
 
       original_scope = @scope
       if String === task_name and
@@ -31,15 +31,15 @@ module Rake
       end
 
       task_name = task_class.scope_name(@scope, task_name)
-      deps = [deps] unless deps.respond_to?(:to_ary)
-      deps = deps.map { |d| Rake.from_pathname(d).to_s }
       task = intern(task_class, task_name)
       task.set_arg_names(arg_names) unless arg_names.empty?
       if Rake::TaskManager.record_task_metadata
         add_location(task)
         task.add_description(get_description(task))
       end
-      task.enhance(deps, &block)
+      task.enhance(Task.format_deps(deps), &block)
+      task | order_only unless order_only.nil?
+      task
     ensure
       @scope = original_scope
     end
@@ -60,17 +60,22 @@ module Rake
     end
 
     def generate_message_for_undefined_task(task_name)
-      message = "Don't know how to build task '#{task_name}' (see --tasks)"
+      message = "Don't know how to build task '#{task_name}' "\
+                "(See the list of available tasks with `#{Rake.application.name} --tasks`)"
+      message + generate_did_you_mean_suggestions(task_name)
+    end
 
-      suggestion_message = \
-        if defined?(::DidYouMean::SpellChecker) && defined?(::DidYouMean::Formatter)
-          suggestions = ::DidYouMean::SpellChecker.new(dictionary: @tasks.keys).correct(task_name.to_s)
-          ::DidYouMean::Formatter.new(suggestions).to_s
-        else
-          ""
-        end
+    def generate_did_you_mean_suggestions(task_name)
+      return "" unless defined?(::DidYouMean::SpellChecker)
 
-      message + suggestion_message
+      suggestions = ::DidYouMean::SpellChecker.new(dictionary: @tasks.keys).correct(task_name.to_s)
+      if ::DidYouMean.respond_to?(:formatter)# did_you_mean v1.2.0 or later
+        ::DidYouMean.formatter.message_for(suggestions)
+      elsif defined?(::DidYouMean::Formatter) # before did_you_mean v1.2.0
+        ::DidYouMean::Formatter.new(suggestions).to_s
+      else
+        ""
+      end
     end
 
     def synthesize_file_task(task_name) # :nodoc:
@@ -78,8 +83,8 @@ module Rake
       define_task(Rake::FileTask, task_name)
     end
 
-    # Resolve the arguments for a task/rule.  Returns a triplet of
-    # [task_name, arg_name_list, prerequisites].
+    # Resolve the arguments for a task/rule.  Returns a tuple of
+    # [task_name, arg_name_list, prerequisites, order_only_prerequisites].
     def resolve_args(args)
       if args.last.is_a?(Hash)
         deps = args.pop
@@ -104,7 +109,7 @@ module Rake
       else
         arg_names = args
       end
-      [task_name, arg_names, []]
+      [task_name, arg_names, [], nil]
     end
     private :resolve_args_without_dependencies
 
@@ -113,11 +118,17 @@ module Rake
     #
     # The patterns recognized by this argument resolving function are:
     #
+    #   task :t, order_only: [:e]
     #   task :t => [:d]
+    #   task :t => [:d], order_only: [:e]
     #   task :t, [a] => [:d]
+    #   task :t, [a] => [:d], order_only: [:e]
     #
     def resolve_args_with_dependencies(args, hash) # :nodoc:
-      fail "Task Argument Error" if hash.size != 1
+      fail "Task Argument Error" if
+        hash.size != 1 &&
+        (hash.size != 2 || !hash.key?(:order_only))
+      order_only = hash.delete(:order_only)
       key, value = hash.map { |k, v| [k, v] }.first
       if args.empty?
         task_name = key
@@ -125,11 +136,11 @@ module Rake
         deps = value || []
       else
         task_name = args.shift
-        arg_names = key
-        deps = value
+        arg_names = key || args.shift|| []
+        deps = value || []
       end
       deps = [deps] unless deps.respond_to?(:to_ary)
-      [task_name, arg_names, deps]
+      [task_name, arg_names, deps, order_only]
     end
     private :resolve_args_with_dependencies
 
@@ -140,9 +151,10 @@ module Rake
     def enhance_with_matching_rule(task_name, level=0)
       fail Rake::RuleRecursionOverflowError,
         "Rule Recursion Too Deep" if level >= 16
-      @rules.each do |pattern, args, extensions, block|
+      @rules.each do |pattern, args, extensions, order_only, block|
         if pattern && pattern.match(task_name)
           task = attempt_rule(task_name, pattern, args, extensions, block, level)
+          task | order_only unless order_only.nil?
           return task if task
         end
       end
@@ -288,8 +300,8 @@ module Rake
         when /^\./
           source = task_name.sub(task_pattern, ext)
           source == ext ? task_name.ext(ext) : source
-        when String
-          ext
+        when String, Symbol
+          ext.to_s
         when Proc, Method
           if ext.arity == 1
             ext.call(task_name)

data/lib/rake/testtask.rb

@@ -181,44 +181,9 @@ module Rake
       when :testrb
         "-S testrb"
       when :rake
-        "#{rake_include_arg} \"#{rake_loader}\""
+        "#{__dir__}/rake_test_loader.rb"
       end
     end
 
-    def rake_loader # :nodoc:
-      find_file("rake/rake_test_loader") or
-        fail "unable to find rake test loader"
-    end
-
-    def find_file(fn) # :nodoc:
-      $LOAD_PATH.each do |path|
-        file_path = File.join(path, "#{fn}.rb")
-        return file_path if File.exist? file_path
-      end
-      nil
-    end
-
-    def rake_include_arg # :nodoc:
-      spec = Gem.loaded_specs["rake"]
-      if spec.respond_to?(:default_gem?) && spec.default_gem?
-        ""
-      else
-        "-I\"#{rake_lib_dir}\""
-      end
-    end
-
-    def rake_lib_dir # :nodoc:
-      find_dir("rake") or
-        fail "unable to find rake lib"
-    end
-
-    def find_dir(fn) # :nodoc:
-      $LOAD_PATH.each do |path|
-        file_path = File.join(path, "#{fn}.rb")
-        return path if File.exist? file_path
-      end
-      nil
-    end
-
   end
 end

data/lib/rake/thread_pool.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require "set"
 
 require "rake/promise"
 
@@ -10,6 +9,7 @@ module Rake
     # Creates a ThreadPool object.  The +thread_count+ parameter is the size
     # of the pool.
     def initialize(thread_count)
+      require "set"
       @max_active_threads = [thread_count, 0].max
       @threads = Set.new
       @threads_mon = Monitor.new

data/lib/rake/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rake
-  VERSION = "12.2.0"
+  VERSION = "13.0.6"
 
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD, *OTHER = Rake::VERSION.split "."

data/rake.gemspec

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-require 'rake/version'
+require_relative 'lib/rake/version'
 
 Gem::Specification.new do |s|
   s.name = "rake".freeze
   s.version = Rake::VERSION
-  s.date = "2017-10-25"
   s.authors = ["Hiroshi SHIBATA".freeze, "Eric Hodel".freeze, "Jim Weirich".freeze]
   s.email = ["hsbt@ruby-lang.org".freeze, "drbrain@segment7.net".freeze, "".freeze]
 
@@ -24,20 +22,79 @@ Rake has the following features:
   s.homepage = "https://github.com/ruby/rake".freeze
   s.licenses = ["MIT".freeze]
 
-  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } -
-            %w[.rubocop.yml .travis.yml appveyor.yml]
+  s.metadata = {
+    "bug_tracker_uri"   => "https://github.com/ruby/rake/issues",
+    "changelog_uri"     => "https://github.com/ruby/rake/blob/v#{s.version}/History.rdoc",
+    "documentation_uri" => "https://ruby.github.io/rake",
+    "source_code_uri"   => "https://github.com/ruby/rake/tree/v#{s.version}",
+  }
+
+  s.files = [
+    "History.rdoc",
+    "MIT-LICENSE",
+    "README.rdoc",
+    "doc/command_line_usage.rdoc",
+    "doc/example/Rakefile1",
+    "doc/example/Rakefile2",
+    "doc/example/a.c",
+    "doc/example/b.c",
+    "doc/example/main.c",
+    "doc/glossary.rdoc",
+    "doc/jamis.rb",
+    "doc/proto_rake.rdoc",
+    "doc/rake.1",
+    "doc/rakefile.rdoc",
+    "doc/rational.rdoc",
+    "exe/rake",
+    "lib/rake.rb",
+    "lib/rake/application.rb",
+    "lib/rake/backtrace.rb",
+    "lib/rake/clean.rb",
+    "lib/rake/cloneable.rb",
+    "lib/rake/cpu_counter.rb",
+    "lib/rake/default_loader.rb",
+    "lib/rake/dsl_definition.rb",
+    "lib/rake/early_time.rb",
+    "lib/rake/ext/core.rb",
+    "lib/rake/ext/string.rb",
+    "lib/rake/file_creation_task.rb",
+    "lib/rake/file_list.rb",
+    "lib/rake/file_task.rb",
+    "lib/rake/file_utils.rb",
+    "lib/rake/file_utils_ext.rb",
+    "lib/rake/invocation_chain.rb",
+    "lib/rake/invocation_exception_mixin.rb",
+    "lib/rake/late_time.rb",
+    "lib/rake/linked_list.rb",
+    "lib/rake/loaders/makefile.rb",
+    "lib/rake/multi_task.rb",
+    "lib/rake/name_space.rb",
+    "lib/rake/packagetask.rb",
+    "lib/rake/phony.rb",
+    "lib/rake/private_reader.rb",
+    "lib/rake/promise.rb",
+    "lib/rake/pseudo_status.rb",
+    "lib/rake/rake_module.rb",
+    "lib/rake/rake_test_loader.rb",
+    "lib/rake/rule_recursion_overflow_error.rb",
+    "lib/rake/scope.rb",
+    "lib/rake/task.rb",
+    "lib/rake/task_argument_error.rb",
+    "lib/rake/task_arguments.rb",
+    "lib/rake/task_manager.rb",
+    "lib/rake/tasklib.rb",
+    "lib/rake/testtask.rb",
+    "lib/rake/thread_history_display.rb",
+    "lib/rake/thread_pool.rb",
+    "lib/rake/trace_output.rb",
+    "lib/rake/version.rb",
+    "lib/rake/win32.rb",
+    "rake.gemspec"
+  ]
   s.bindir = "exe"
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib".freeze]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "2.6.1".freeze
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.2".freeze)
+  s.required_ruby_version = Gem::Requirement.new(">= 2.2".freeze)
   s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
-
-  s.add_development_dependency(%q<bundler>.freeze)
-  s.add_development_dependency(%q<minitest>.freeze)
-  s.add_development_dependency(%q<rdoc>.freeze)
-  s.add_development_dependency(%q<coveralls>.freeze)
-  s.add_development_dependency(%q<rubocop>.freeze)
 end

metadata

@@ -1,87 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 12.2.0
+  version: 13.0.6
 platform: ruby
 authors:
 - Hiroshi SHIBATA
 - Eric Hodel
 - Jim Weirich
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2021-07-09 00:00:00.000000000 Z
+dependencies: []
 description: |
   Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
   specified in standard Ruby syntax.
@@ -101,15 +31,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- CONTRIBUTING.rdoc
-- Gemfile
 - History.rdoc
 - MIT-LICENSE
 - README.rdoc
-- Rakefile
-- bin/console
-- bin/setup
 - doc/command_line_usage.rdoc
 - doc/example/Rakefile1
 - doc/example/Rakefile2
@@ -170,8 +94,12 @@ files:
 homepage: https://github.com/ruby/rake
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/ruby/rake/issues
+  changelog_uri: https://github.com/ruby/rake/blob/v13.0.6/History.rdoc
+  documentation_uri: https://ruby.github.io/rake
+  source_code_uri: https://github.com/ruby/rake/tree/v13.0.6
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -181,16 +109,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.2
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.3.0.dev
+signing_key:
 specification_version: 4
 summary: Rake is a Make-like program implemented in Ruby
 test_files: []

data/.gitignore

@@ -1,14 +0,0 @@
-*.bak
-*.rbc
-*.swp
-*~
-.#*
-.DS_Store
-.idea
-.rbx
-/.rdoc
-/TAGS
-/coverage
-/html
-/pkg
-Gemfile.lock

data/CONTRIBUTING.rdoc

@@ -1,36 +0,0 @@
-= Source Repository
-
-Rake is currently hosted at github. The github web page is
-https://github.com/ruby/rake . The public git clone URL is
-
-  git://github.com/ruby/rake.git
-
-= Running the Rake Test Suite
-
-If you wish to run the unit and functional tests that come with Rake:
-
-* +cd+ into the top project directory of rake.
-* Install gem dependency using bundler:
-
-    bundle install  # Install bundler, minitest and rdoc
-
-* Type one of the following:
-
-    rake            # If you have run rake's tests
-
-= Issues and Bug Reports
-
-Feel free to submit commits or feature requests.  If you send a patch,
-remember to update the corresponding unit tests.  In fact, I prefer
-new feature to be submitted in the form of new unit tests.
-
-For other information, feel free to ask on the ruby-talk mailing list.
-
-If you have found a bug in rake please try with the latest version of rake
-before filing an issue.  Also check History.rdoc for bug fixes that may have
-addressed your issue.
-
-When submitting pull requests please check the rake Travis-CI page for test
-failures:
-
-  https://travis-ci.org/ruby/rake

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec

data/Rakefile

@@ -1,38 +0,0 @@
-# Rakefile for rake        -*- ruby -*-
-
-# Copyright 2003, 2004, 2005 by Jim Weirich (jim@weirichhouse.org)
-# All rights reserved.
-
-# This file may be distributed under an MIT style license.  See
-# MIT-LICENSE for details.
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "bundler/gem_tasks"
-require "rake/testtask"
-require "rdoc/task"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.verbose = true
-  t.test_files = FileList["test/**/test_*.rb"]
-end
-
-RDoc::Task.new do |doc|
-  doc.main   = "README.rdoc"
-  doc.title  = "Rake -- Ruby Make"
-  doc.rdoc_files = FileList.new %w[lib MIT-LICENSE doc/**/*.rdoc *.rdoc]
-  doc.rdoc_dir = "html"
-end
-
-task ghpages: :rdoc do
-  `git checkout gh-pages`
-  require "fileutils"
-  FileUtils.rm_rf "/tmp/html"
-  FileUtils.mv "html", "/tmp"
-  FileUtils.rm_rf "*"
-  FileUtils.cp_r Dir.glob("/tmp/html/*"), "."
-end
-
-task default: :test