rake 10.5.0 → 11.0.1

data/lib/rake/linked_list.rb

@@ -4,14 +4,8 @@ module Rake
   # 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 +13,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 +23,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 +33,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 +56,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 +78,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 +108,4 @@ module Rake
 
     EMPTY = EmptyLinkedList.new
   end
-
 end

data/lib/rake/task.rb

@@ -29,6 +29,10 @@ module Rake
     # location option set).
     attr_reader :locations
 
+    # Has this task already been invoked?  Already invoked tasks
+    # will be skipped unless you reenable them.
+    attr_reader :already_invoked
+
     # Return task name
     def to_s
       name
@@ -54,7 +58,11 @@ module Rake
     end
 
     def lookup_prerequisite(prerequisite_name) # :nodoc:
-      application[prerequisite_name, @scope]
+      scoped_prerequisite_task = application[prerequisite_name, @scope]
+      if scoped_prerequisite_task == self
+        unscoped_prerequisite_task = application[prerequisite_name]
+      end
+      unscoped_prerequisite_task || scoped_prerequisite_task
     end
     private :lookup_prerequisite
 

data/lib/rake/task_arguments.rb

@@ -83,6 +83,10 @@ module Rake
       @hash.has_key?(key)
     end
 
+    def fetch(*args, &block)
+      @hash.fetch(*args, &block)
+    end
+
     protected
 
     def lookup(name) # :nodoc:

data/lib/rake/task_manager.rb

@@ -5,10 +5,6 @@ module Rake
     # Track the last comment made in the Rakefile.
     attr_accessor :last_description
 
-    # TODO: Remove in Rake 11
-
-    alias :last_comment :last_description # :nodoc: Backwards compatibility
-
     def initialize # :nodoc:
       super
       @tasks = Hash.new

data/lib/rake/tasklib.rb

@@ -6,19 +6,6 @@ module Rake
   class TaskLib
     include Cloneable
     include Rake::DSL
-
-    # Make a symbol by pasting two strings together.
-    #
-    # NOTE: DEPRECATED! This method is kinda stupid. I don't know why
-    # I didn't just use string interpolation. But now other task
-    # libraries depend on this so I can't remove it without breaking
-    # other people's code. So for now it stays for backwards
-    # compatibility. BUT DON'T USE IT.
-    #--
-    # TODO: Remove in Rake 11
-    def paste(a, b)             # :nodoc:
-      (a.to_s + b.to_s).intern
-    end
   end
 
 end

data/lib/rake/testtask.rb

@@ -85,7 +85,7 @@ module Rake
       @options = nil
       @test_files = nil
       @verbose = false
-      @warning = false
+      @warning = true
       @loader = :rake
       @ruby_opts = []
       @description = "Run tests" + (@name == :test ? "" : " for #{@name}")
@@ -128,6 +128,7 @@ module Rake
       opts = @ruby_opts.dup
       opts.unshift("-I\"#{lib_path}\"") unless @libs.empty?
       opts.unshift("-w") if @warning
+      opts.unshift('--verbose') if @verbose
       opts.join(" ")
     end
 
@@ -150,15 +151,6 @@ module Rake
       end
     end
 
-    def fix # :nodoc:
-      case ruby_version
-      when '1.8.2'
-        "\"#{find_file 'rake/ruby182_test_unit_fix'}\""
-      else
-        nil
-      end || ''
-    end
-
     def ruby_version # :nodoc:
       RUBY_VERSION
     end
@@ -168,7 +160,7 @@ module Rake
       when :direct
         "-e \"ARGV.each{|f| require f}\""
       when :testrb
-        "-S testrb #{fix}"
+        "-S testrb"
       when :rake
         "#{rake_include_arg} \"#{rake_loader}\""
       end

data/lib/rake/thread_pool.rb

@@ -57,8 +57,7 @@ module Rake
           $stderr.puts e.backtrace.join("\n")
           @threads.each do |t|
             $stderr.print "Thread #{t} status = #{t.status}\n"
-            # 1.8 doesn't support Thread#backtrace
-            $stderr.puts t.backtrace.join("\n") if t.respond_to? :backtrace
+            $stderr.puts t.backtrace.join("\n")
           end
           raise e
         end

data/lib/rake/trace_output.rb

@@ -13,7 +13,7 @@ module Rake
       else
         output = strings.map { |s|
           next if s.nil?
-          s =~ /#{sep}$/ ? s : s + sep
+          s.end_with?(sep) ? s : s + sep
         }.join
       end
       out.print(output)

data/lib/rake/win32.rb

@@ -1,7 +1,6 @@
+require 'rbconfig'
 
 module Rake
-  require 'rake/alt_system'
-
   # Win 32 interface methods for Rake. Windows specific functionality
   # will be placed here to collect that knowledge in one spot.
   module Win32 # :nodoc: all
@@ -14,12 +13,7 @@ module Rake
     class << self
       # True if running on a windows system.
       def windows?
-        AltSystem::WINDOWS
-      end
-
-      # Run a command line on windows.
-      def rake_system(*cmd)
-        AltSystem.system(*cmd)
+        RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
       end
 
       # The standard directory containing system wide rake files on

data/test/helper.rb

@@ -11,15 +11,8 @@ require 'rake'
 require 'tmpdir'
 require File.expand_path('../file_creation', __FILE__)
 
-
-begin
-  require_relative 'support/ruby_runner'
-  require_relative 'support/rakefile_definitions'
-rescue NoMethodError, LoadError
-  # ruby 1.8
-  require 'test/support/ruby_runner'
-  require 'test/support/rakefile_definitions'
-end
+require_relative 'support/ruby_runner'
+require_relative 'support/rakefile_definitions'
 
 class Rake::TestCase < Minitest::Test
   include FileCreation
@@ -30,7 +23,7 @@ class Rake::TestCase < Minitest::Test
     include Rake::TaskManager
   end
 
-  RUBY = defined?(EnvUtil) ? EnvUtil.rubybin : Gem.ruby
+  RUBY = Gem.ruby
 
   def setup
     ARGV.clear
@@ -125,5 +118,17 @@ end
     end
   end
 
+  def jruby?
+    defined?(JRUBY_VERSION)
+  end
+
+  def jruby17?
+    jruby? && (JRUBY_VERSION < '9.0.0.0')
+  end
+
+  def jruby9?
+    jruby? && (JRUBY_VERSION >= '9.0.0.0')
+  end
+
   include RakefileDefinitions
 end

data/test/support/rakefile_definitions.rb

@@ -19,9 +19,7 @@ task :work do
   end
 end
 
-# TODO: remove `disabled_' when DeprecatedObjectDSL removed
-task :obj
-task :disabled_obj do
+task :obj do
   begin
     Object.new.instance_eval { task :xyzzy }
     puts "BAD:D  Rake DSL are polluting objects"

data/test/test_rake_application.rb

@@ -1,3 +1,4 @@
+#encoding: UTF-8
 require File.expand_path('../helper', __FILE__)
 
 class TestRakeApplication < Rake::TestCase
@@ -34,6 +35,20 @@ class TestRakeApplication < Rake::TestCase
     assert_match __method__.to_s, err
   end
 
+  def test_display_exception_details_bad_encoding
+    begin
+      raise 'El Niño is coming!'.force_encoding('US-ASCII')
+    rescue => ex
+    end
+
+    out, err = capture_io do
+      @app.display_error_message ex
+    end
+
+    assert_empty out
+    assert_match 'El Niño is coming!', err.force_encoding('UTF-8')
+  end
+
   def test_display_exception_details_cause
     skip 'Exception#cause not implemented' unless
       Exception.method_defined? :cause
@@ -60,6 +75,7 @@ class TestRakeApplication < Rake::TestCase
   def test_display_exception_details_cause_loop
     skip 'Exception#cause not implemented' unless
       Exception.method_defined? :cause
+    skip if jruby9? # https://github.com/jruby/jruby/issues/3654
 
     begin
       begin

data/test/test_rake_application_options.rb

@@ -381,7 +381,7 @@ class TestRakeApplicationOptions < Rake::TestCase
     end
 
     assert_match(/\bversion\b/, out)
-    assert_match(/\b#{RAKEVERSION}\b/, out)
+    assert_match(/\b#{Rake::VERSION}\b/, out)
     assert_equal :exit, @exit
   end
 

data/test/test_rake_file_list.rb

@@ -210,6 +210,23 @@ class TestRakeFileList < Rake::TestCase
     assert_equal FileList, fl.class
   end
 
+  def test_exclude_curly_bracket_pattern
+    skip 'brace pattern matches not supported' unless defined? File::FNM_EXTGLOB
+    fl = FileList['*'].exclude('{abc,xyz}.c')
+    assert_equal %w[abc.h abc.x cfiles existing x.c xyzzy.txt], fl
+  end
+
+  def test_exclude_an_array
+    fl = FileList['*'].exclude(['existing', '*.c'])
+    assert_equal %w[abc.h abc.x cfiles xyzzy.txt], fl
+  end
+
+  def test_exclude_a_filelist
+    excluded = FileList['existing', '*.c']
+    fl = FileList['*'].exclude(excluded)
+    assert_equal %w[abc.h abc.x cfiles xyzzy.txt], fl
+  end
+
   def test_default_exclude
     fl = FileList.new
     fl.clear_exclude

data/test/test_rake_file_list_path_map.rb

@@ -4,5 +4,12 @@ class TestRakeFileListPathMap < Rake::TestCase
   def test_file_list_supports_pathmap
     assert_equal ['a', 'b'], FileList['dir/a.rb', 'dir/b.rb'].pathmap("%n")
   end
+
+  def test_file_list_supports_pathmap_with_a_block
+    mapped = FileList['dir/a.rb', 'dir/b.rb'].pathmap("%{.*,*}n") do |name|
+      name.upcase
+    end
+    assert_equal ['A', 'B'], mapped
+  end
 end
 

data/test/test_rake_file_utils.rb

@@ -142,6 +142,8 @@ class TestRakeFileUtils < Rake::TestCase
   end
 
   def test_sh_with_multiple_arguments
+    skip if jruby9? # https://github.com/jruby/jruby/issues/3653
+
     check_no_expansion
     ENV['RAKE_TEST_SH'] = 'someval'
 
@@ -240,6 +242,8 @@ class TestRakeFileUtils < Rake::TestCase
   end
 
   def test_ruby_with_multiple_arguments
+    skip if jruby9? # https://github.com/jruby/jruby/issues/3653
+
     check_no_expansion
 
     ENV['RAKE_TEST_SH'] = 'someval'

data/test/test_rake_functional.rb

@@ -425,6 +425,8 @@ class TestRakeFunctional < Rake::TestCase
   end
 
   def test_file_list_is_requirable_separately
+    skip if jruby9? # https://github.com/jruby/jruby/issues/3655
+
     ruby '-rrake/file_list', '-e', 'puts Rake::FileList["a"].size'
     assert_equal "1\n", @out
   end
@@ -443,7 +445,7 @@ class TestRakeFunctional < Rake::TestCase
   end
 
   def test_signal_propagation_in_tests
-    if can_detect_signals?
+    if !jruby? && can_detect_signals?
       rakefile_test_signal
       rake
       assert_match(/ATEST/, @out)
@@ -476,7 +478,7 @@ class TestRakeFunctional < Rake::TestCase
   # predicate function can be used to skip tests or assertions as
   # needed.
   def uncertain_exit_status?
-    RUBY_VERSION < "1.9" || defined?(JRUBY_VERSION)
+    defined?(JRUBY_VERSION)
   end
 
 end

data/test/test_rake_task.rb

@@ -94,6 +94,13 @@ class TestRakeTask < Rake::TestCase
     assert_equal ["t3", "t2", "t1"], runlist
   end
 
+  def test_already_invoked
+    t1 = task(:t1) {}
+    assert_equal false, t1.already_invoked
+    t1.invoke
+    assert_equal true, t1.already_invoked
+  end
+
   def test_can_double_invoke_with_reenable
     runlist = []
     t1 = task(:t1) { |t| runlist << t.name }
@@ -211,6 +218,7 @@ class TestRakeTask < Rake::TestCase
   end
 
   def test_prerequisite_tasks_honors_namespaces
+    task :b
     a = b = nil
     namespace "X" do
       a = task :a => ["b", "c"]
@@ -221,6 +229,35 @@ class TestRakeTask < Rake::TestCase
     assert_equal [b, c], a.prerequisite_tasks
   end
 
+  def test_prerequisite_tasks_finds_tasks_with_same_name_outside_namespace
+    b1 = nil
+    namespace "a" do
+      b1 = task :b => "b"
+    end
+    b2 = task :b
+
+    assert_equal [b2], b1.prerequisite_tasks
+  end
+
+  def test_prerequisite_tasks_in_nested_namespaces
+    m = task :m
+    a_c_m = a_b_m = a_m = nil
+    namespace "a" do
+      a_m = task :m
+
+      namespace "b" do
+        a_b_m = task :m => "m"
+      end
+
+      namespace "c" do
+        a_c_m = task :m => "a:m"
+      end
+    end
+
+    assert_equal [m], a_b_m.prerequisite_tasks
+    assert_equal [a_m], a_c_m.prerequisite_tasks
+  end
+
   def test_all_prerequisite_tasks_includes_all_prerequisites
     a = task :a => "b"
     b = task :b => ["c", "d"]