rake 12.0.0.beta1 → 13.0.0.pre.1

data/lib/rake/task_argument_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # Error indicating an ill-formed task declaration.

data/lib/rake/task_arguments.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   ##
@@ -87,6 +88,7 @@ module Rake
     def has_key?(key)
       @hash.has_key?(key)
     end
+    alias key? has_key?
 
     def fetch(*args, &block)
       @hash.fetch(*args, &block)

data/lib/rake/task_manager.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
 
   # The TaskManager module is a mixin for managing tasks.
@@ -14,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
@@ -30,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
@@ -55,7 +56,26 @@ module Rake
       self.lookup(task_name, scopes) or
         enhance_with_matching_rule(task_name) or
         synthesize_file_task(task_name) or
-        fail "Don't know how to build task '#{task_name}' (see --tasks)"
+        fail generate_message_for_undefined_task(task_name)
+    end
+
+    def generate_message_for_undefined_task(task_name)
+      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
+
+    def generate_did_you_mean_suggestions(task_name)
+      return "" unless defined?(::DidYouMean::SpellChecker)
+
+      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:
@@ -89,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
 
@@ -102,7 +122,10 @@ module Rake
     #   task :t, [a] => [:d]
     #
     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
@@ -114,7 +137,7 @@ module Rake
         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
 
@@ -125,9 +148,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|
-        if pattern.match(task_name)
-          task = attempt_rule(task_name, args, extensions, block, level)
+      @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
@@ -241,8 +265,8 @@ module Rake
     end
 
     # Attempt to create a rule given the list of prerequisites.
-    def attempt_rule(task_name, args, extensions, block, level)
-      sources = make_sources(task_name, extensions)
+    def attempt_rule(task_name, task_pattern, args, extensions, block, level)
+      sources = make_sources(task_name, task_pattern, extensions)
       prereqs = sources.map { |source|
         trace_rule level, "Attempting Rule #{task_name} => #{source}"
         if File.exist?(source) || Rake::Task.task_defined?(source)
@@ -263,7 +287,7 @@ module Rake
 
     # Make a list of sources from the list of file name extensions /
     # translation procs.
-    def make_sources(task_name, extensions)
+    def make_sources(task_name, task_pattern, extensions)
       result = extensions.map { |ext|
         case ext
         when /%/
@@ -271,7 +295,8 @@ module Rake
         when %r{/}
           ext
         when /^\./
-          task_name.ext(ext)
+          source = task_name.sub(task_pattern, ext)
+          source == ext ? task_name.ext(ext) : source
         when String
           ext
         when Proc, Method

data/lib/rake/tasklib.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rake"
 
 module Rake

data/lib/rake/testtask.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rake"
 require "rake/tasklib"
 
@@ -50,6 +51,7 @@ module Rake
 
     # Request that the tests be run with the warning flag set.
     # E.g. warning=true implies "ruby -w" used to run the tests.
+    # (default is true)
     attr_accessor :warning
 
     # Glob pattern to match test files. (default is 'test/test*.rb')
@@ -119,7 +121,7 @@ module Rake
               status  = "Command failed with status (#{status.exitstatus})"
               details = ": [ruby #{args}]"
               message =
-                if Rake.application.options.trace or @verbose then
+                if Rake.application.options.trace or @verbose
                   status + details
                 else
                   status

data/lib/rake/thread_history_display.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rake/private_reader"
 
 module Rake

data/lib/rake/thread_pool.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "set"
 
 require "rake/promise"

data/lib/rake/trace_output.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Rake
   module TraceOutput # :nodoc: all
 

data/lib/rake/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 module Rake
-  VERSION = "12.0.0.beta1"
+  VERSION = "13.0.0.pre.1"
 
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD, *OTHER = Rake::VERSION.split "."

data/lib/rake/win32.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "rbconfig"
 
 module Rake

data/rake.gemspec

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'rake/version'
 
 Gem::Specification.new do |s|
   s.name = "rake".freeze
   s.version = Rake::VERSION
-  s.date = "2016-06-12"
   s.authors = ["Hiroshi SHIBATA".freeze, "Eric Hodel".freeze, "Jim Weirich".freeze]
   s.email = ["hsbt@ruby-lang.org".freeze, "drbrain@segment7.net".freeze, "".freeze]
 
@@ -23,17 +23,14 @@ 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)/}) }
+  s.files = %x[git ls-files -z].split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } -
+            %w[.rubocop.yml .gitignore .travis.yml appveyor.yml]
   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.required_ruby_version = Gem::Requirement.new(">= 2.2".freeze)
   s.rubygems_version = "2.6.1".freeze
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.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, ["~> 5.0.0.beta2"])
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 12.0.0.beta1
+  version: 13.0.0.pre.1
 platform: ruby
 authors:
 - Hiroshi SHIBATA
@@ -10,50 +10,8 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-12 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: 5.0.0.beta2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+date: 2019-09-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.
@@ -73,17 +31,21 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu-rvm.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - CONTRIBUTING.rdoc
 - Gemfile
 - History.rdoc
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- appveyor.yml
+- bin/bundle
 - bin/console
+- bin/rake
+- bin/rdoc
+- bin/rubocop
 - bin/setup
 - doc/command_line_usage.rdoc
 - doc/example/Rakefile1
@@ -156,15 +118,14 @@ 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
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.0.pre1
 signing_key: 
 specification_version: 4
 summary: Rake is a Make-like program implemented in Ruby

data/.gitignore

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

data/.rubocop.yml

@@ -1,57 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.3
-  DisabledByDefault: true
-  Exclude:
-    - doc/**/*.rb
-    - rake.gemspec
-
-Style/LineLength:
-  Enabled: true
-  Max: 120
-
-Style/HashSyntax:
-  Enabled: true
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/IndentationWidth:
-  Enabled: true
-
-Style/Tab:
-  Enabled: true
-
-Style/EmptyLines:
-  Enabled: true
-
-Style/TrailingBlankLines:
-  Enabled: true
-
-Style/TrailingWhitespace:
-  Enabled: true
-
-Style/SpaceBeforeBlockBraces:
-  Enabled: true
-
-Style/SpaceInsideBlockBraces:
-  Enabled: true
-
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: true
-
-Style/CaseIndentation:
-  Enabled: true
-
-Style/MultilineIfThen:
-  Enabled: true
-
-Style/MethodDefParentheses:
-  Enabled: true
-
-Style/BracesAroundHashParameters:
-  Enabled: true
-
-Lint/EndAlignment:
-  Enabled: true
-  AlignWith: variable

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - ruby-head
-  - jruby-1.7.20
-  - jruby-9.1.5.0
-  - jruby-head
-before_install:
-  - gem install bundler --no-document -v '~> 1.13.3'
-before_script:
-  - unset JRUBY_OPTS
-script: ruby -Ilib exe/rake
-notifications:
-  email:
-  - hsbt@ruby-lang.org
-  - drbrain@segment7.net