rake 12.3.0 → 12.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2b718e4a254e7cf9aa20eafd30a425fa232d4b7949279198ce96585dfb0d276
-  data.tar.gz: 8470eefb329a55718ab467caddac13baa467fee4f1ec98c89d5465cf769c98f9
+  metadata.gz: 4b9ff07e1f0f9a98e322529b863347c78cbcf73dcf5f37d2fc99e46c467c0b1a
+  data.tar.gz: 944f537241285a1e4ab625ad32b0011c4b333645db6d250b0eb28f509a276967
 SHA512:
-  metadata.gz: c76eafa2e92c5ddcc9ee9e47136e1e265c14b482361e256715aefd454c79223eedeacf2886560996769e0050501bd9780c85b699192f0f6fb074eeb01a1d5641
-  data.tar.gz: 72562540e4ef42e556ede99ea8ecc8f0488da248b58bd1432e6834b6297f823af3518e0d358fd18054c0347e863aabe7a30ce4f7c9eff7850ddeb233c609af1c
+  metadata.gz: a7da79be40b88106ef9c4b839ddb00cc0306ab82620c6f126a79067af134ba9efe3adac6fcc5f170116ca373a425a0bcb3f767b604c1d1fd89a05f88953c0a3b
+  data.tar.gz: 8ded8d08547574dd077d4286e4f506765efa911c49a3f0e4d0551a243d73d156228222844499146458771a55fd83c65fa0c6ff3788065258aa7de7b224d6aec4

data/History.rdoc

@@ -1,11 +1,29 @@
+=== 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_verion` to Ruby 2.0.0. Rake was already
-  removed to support for Ruby 1.9.x.
+* Bump `required_ruby_version` to Ruby 2.0.0. Rake has already
+  removed support for Ruby 1.9.x.
 
-=== Enhancements:
+==== Enhancements:
 
 * Support `test-bundled-gems` task on ruby core.
 

data/README.rdoc

@@ -25,8 +25,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.
 
@@ -130,7 +130,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/Rakefile

@@ -9,16 +9,19 @@
 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"
+begin
+  require "bundler/gem_tasks"
+rescue LoadError
+end
 
+require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.verbose = true
   t.test_files = FileList["test/**/test_*.rb"]
 end
 
+require "rdoc/task"
 RDoc::Task.new do |doc|
   doc.main   = "README.rdoc"
   doc.title  = "Rake -- Ruby Make"
@@ -27,7 +30,7 @@ RDoc::Task.new do |doc|
 end
 
 task ghpages: :rdoc do
-  `git checkout gh-pages`
+  %x[git checkout gh-pages]
   require "fileutils"
   FileUtils.rm_rf "/tmp/html"
   FileUtils.mv "html", "/tmp"

data/lib/rake/application.rb

@@ -172,7 +172,7 @@ module Rake
       args = []
 
       begin
-        /((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
+        /\s*((?:[^\\,]|\\.)*?)\s*(?:,\s*(.*))?$/ =~ remaining_args
 
         remaining_args = $2
         args << $1.gsub(/\\(.)/, '\1')

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

@@ -19,6 +19,7 @@ argv = ARGV.select do |argument|
       false
     end
   rescue LoadError => e
+    raise unless e.path
     abort "\nFile does not exist: #{e.path}\n\n"
   end
 end

data/lib/rake/task.rb

@@ -103,6 +103,7 @@ module Rake
       @scope           = app.current_scope
       @arg_names       = nil
       @locations       = []
+      @invocation_exception = nil
     end
 
     # Enhance a task with prerequisites or actions.  Returns self.
@@ -183,20 +184,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
 

data/lib/rake/task_manager.rb

@@ -61,16 +61,20 @@ module Rake
 
     def generate_message_for_undefined_task(task_name)
       message = "Don't know how to build task '#{task_name}' (see --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:

data/lib/rake/version.rb

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

data/rake.gemspec

@@ -5,7 +5,6 @@ require '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,7 +23,7 @@ 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 .travis.yml appveyor.yml]
   s.bindir = "exe"
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 12.3.0
+  version: 12.3.1
 platform: ruby
 authors:
 - Hiroshi SHIBATA
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.2
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rake is a Make-like program implemented in Ruby