rake 10.3.2 → 10.4.0

data/lib/rake/ext/module.rb

@@ -1 +1,2 @@
+
 # TODO: remove in Rake 11

data/lib/rake/ext/pathname.rb

@@ -0,0 +1,25 @@
+require 'rake/ext/core'
+require 'pathname'
+
+class Pathname
+
+  rake_extension("ext") do
+    # Return a new Pathname with <tt>String#ext</tt> applied to it.
+    #
+    # This Pathname extension comes from Rake
+    def ext(newext='')
+      Pathname.new(Rake.from_pathname(self).ext(newext))
+    end
+  end
+
+  rake_extension("pathmap") do
+    # Apply the pathmap spec to the Pathname, returning a
+    # new Pathname with the modified paths.  (See String#pathmap for
+    # details.)
+    #
+    # This Pathname extension comes from Rake
+    def pathmap(spec=nil, &block)
+      Pathname.new(Rake.from_pathname(self).pathmap(spec, &block))
+    end
+  end
+end

data/lib/rake/ext/string.rb

@@ -49,7 +49,7 @@ class String
     end
     protected :pathmap_partial
 
-    # Preform the pathmap replacement operations on the given path. The
+    # Perform the pathmap replacement operations on the given path. The
     # patterns take the form 'pat1,rep1;pat2,rep2...'.
     #
     # This String extension comes from Rake

data/lib/rake/ext/time.rb

@@ -1,12 +1,13 @@
 #--
-# Extensions to time to allow comparisons with an early time class.
+# Extensions to time to allow comparisons with early and late time classes.
 
 require 'rake/early_time'
+require 'rake/late_time'
 
 class Time # :nodoc: all
   alias rake_original_time_compare :<=>
   def <=>(other)
-    if Rake::EarlyTime === other
+    if Rake::EarlyTime === other || Rake::LateTime === other
       - other.<=>(self)
     else
       rake_original_time_compare(other)

data/lib/rake/file_list.rb

@@ -49,7 +49,7 @@ module Rake
 
     # List of methods that should not be delegated here (we define special
     # versions of them explicitly below).
-    MUST_NOT_DEFINE = %w[to_a to_ary partition *]
+    MUST_NOT_DEFINE = %w[to_a to_ary partition * <<]
 
     # List of delegated methods that return new array values which need
     # wrapping.
@@ -119,7 +119,7 @@ module Rake
         if fn.respond_to? :to_ary
           include(*fn.to_ary)
         else
-          @pending_add << fn
+          @pending_add << Rake.from_pathname(fn)
         end
       end
       @pending = true
@@ -149,7 +149,7 @@ module Rake
     #
     def exclude(*patterns, &block)
       patterns.each do |pat|
-        @exclude_patterns << pat
+        @exclude_patterns << Rake.from_pathname(pat)
       end
       @exclude_procs << block if block_given?
       resolve_exclude unless @pending
@@ -196,6 +196,12 @@ module Rake
       end
     end
 
+    def <<(obj)
+      resolve
+      @items << Rake.from_pathname(obj)
+      self
+    end
+
     # Resolve all the pending adds now.
     def resolve
       if @pending
@@ -346,7 +352,7 @@ module Rake
 
     # Should the given file name be excluded from the list?
     #
-    # NOTE: This method was formally named "exclude?", but Rails
+    # NOTE: This method was formerly named "exclude?", but Rails
     # introduced an exclude? method as an array method and setup a
     # conflict with file list. We renamed the method to avoid
     # confusion. If you were using "FileList#exclude?" in your user
@@ -410,5 +416,13 @@ module Rake
         dir = File.dirname(dir)
       end
     end
+
+    # Convert Pathname and Pathname-like objects to strings;
+    # leave everything else alone
+    def from_pathname(path)    # :nodoc:
+      path = path.to_path if path.respond_to?(:to_path)
+      path = path.to_str if path.respond_to?(:to_str)
+      path
+    end
   end
 end # module Rake

data/lib/rake/file_task.rb

@@ -21,7 +21,7 @@ module Rake
       if File.exist?(name)
         File.mtime(name.to_s)
       else
-        Rake::EARLY
+        Rake::LATE
       end
     end
 
@@ -39,7 +39,7 @@ module Rake
       # Apply the scope to the task name according to the rules for this kind
       # of task.  File based tasks ignore the scope when creating the name.
       def scope_name(scope, task_name)
-        task_name
+        Rake.from_pathname(task_name)
       end
     end
   end

data/lib/rake/file_utils.rb

@@ -14,12 +14,24 @@ module FileUtils
   OPT_TABLE['sh']  = %w(noop verbose)
   OPT_TABLE['ruby'] = %w(noop verbose)
 
-  # Run the system command +cmd+. If multiple arguments are given the command
-  # is not run with the shell (same semantics as Kernel::exec and
+  # Run the system command +cmd+.  If multiple arguments are given the command
+  # is run directly (without the shell, same semantics as Kernel::exec and
   # Kernel::system).
   #
-  # Example:
-  #   sh %{ls -ltr}
+  # It is recommended you use the multiple argument form over interpolating
+  # user input for both usability and security reasons.  With the multiple
+  # argument form you can easily process files with spaces or other shell
+  # reserved characters in them.  With the multiple argument form your rake
+  # tasks are not vulnerable to users providing an argument like
+  # <code>; rm # -rf /</code>.
+  #
+  # If a block is given, upon command completion the block is called with an
+  # OK flag (true on a zero exit status) and a Process::Status object.
+  # Without a block a RuntimeError is raised when the command exits non-zero.
+  #
+  # Examples:
+  #
+  #   sh 'ls -ltr'
   #
   #   sh 'ls', 'file with spaces'
   #

data/lib/rake/invocation_chain.rb

@@ -31,7 +31,7 @@ module Rake
     private
 
     def prefix
-      "#{tail.to_s} => "
+      "#{tail} => "
     end
 
     # Null object for an empty chain.

data/lib/rake/late_time.rb

@@ -0,0 +1,17 @@
+module Rake
+  # LateTime is a fake timestamp that occurs _after_ any other time value.
+  class LateTime
+    include Comparable
+    include Singleton
+
+    def <=>(other)
+      1
+    end
+
+    def to_s
+      '<LATE TIME>'
+    end
+  end
+
+  LATE = LateTime.instance
+end

data/lib/rake/packagetask.rb

@@ -127,7 +127,7 @@ module Rake
           file "#{package_dir}/#{file}" =>
             [package_dir_path] + package_files do
             chdir(package_dir) do
-              sh %{#{@tar_command} #{flag}cvf #{file} #{package_name}}
+              sh @tar_command, "#{flag}cvf", file, package_name
             end
           end
         end
@@ -138,15 +138,12 @@ module Rake
         file "#{package_dir}/#{zip_file}" =>
           [package_dir_path] + package_files do
           chdir(package_dir) do
-            sh %{#{@zip_command} -r #{zip_file} #{package_name}}
+            sh @zip_command, "-r", zip_file, package_name
           end
         end
       end
 
-      directory package_dir
-
-      file package_dir_path => @package_files do
-        mkdir_p package_dir rescue nil
+      directory package_dir_path => @package_files do
         @package_files.each do |fn|
           f = File.join(package_dir_path, fn)
           fdir = File.dirname(f)

data/lib/rake/task_manager.rb

@@ -35,7 +35,7 @@ module Rake
 
       task_name = task_class.scope_name(@scope, task_name)
       deps = [deps] unless deps.respond_to?(:to_ary)
-      deps = deps.map { |d| d.to_s }
+      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
@@ -111,7 +111,7 @@ module Rake
       if args.empty?
         task_name = key
         arg_names = []
-        deps = value
+        deps = value || []
       else
         task_name = args.shift
         arg_names = key

data/test/helper.rb

@@ -1,7 +1,10 @@
 require 'rubygems'
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-gem 'minitest', '~> 4'
+begin
+  gem 'minitest', '~> 5'
+rescue Gem::LoadError
+end
 
 require 'minitest/autorun'
 require 'rake'
@@ -19,7 +22,7 @@ rescue NoMethodError, LoadError
   require 'test/support/rakefile_definitions'
 end
 
-class Rake::TestCase < MiniTest::Unit::TestCase
+class Rake::TestCase < Minitest::Test
   include FileCreation
 
   include Rake::DSL

data/test/support/rakefile_definitions.rb

@@ -460,7 +460,7 @@ end
     TEST_TASK
     open 'a_test.rb', 'w' do |io|
       io << "require 'minitest/autorun'\n"
-      io << "class ExitTaskTest < MiniTest::Unit::TestCase\n"
+      io << "class ExitTaskTest < Minitest::Test\n"
       io << "  def test_exit\n"
       io << "    assert false, 'this should fail'\n"
       io << "  end\n"

data/test/support/ruby_runner.rb

@@ -18,12 +18,13 @@ module RubyRunner
   def run_ruby(option_list)
     puts "COMMAND: [#{RUBY} #{option_list.join ' '}]" if @verbose
 
-    inn, out, err, wait = Open3.popen3(RUBY, *option_list)
-    inn.close
+    Open3.popen3(RUBY, *option_list) {|inn, out, err, wait|
+      inn.close
 
-    @exit = wait ? wait.value : $?
-    @out = out.read
-    @err = err.read
+      @exit = wait ? wait.value : $?
+      @out = out.read
+      @err = err.read
+    }
 
     puts "OUTPUT:  [#{@out}]" if @verbose
     puts "ERROR:   [#{@err}]" if @verbose

data/test/test_rake_application.rb

@@ -10,15 +10,17 @@ class TestRakeApplication < Rake::TestCase
   end
 
   def setup_command_line(*options)
-    ARGV.clear
+    @app.argv.clear
     options.each do |option|
-      ARGV << option
+      @app.argv << option
     end
   end
 
   def test_display_exception_details
+    obj = Object.new
+    obj.instance_eval("def #{__method__}; raise 'test'; end", "ruby")
     begin
-      raise 'test'
+      obj.__send__(__method__)
     rescue => ex
     end
 
@@ -266,7 +268,7 @@ class TestRakeApplication < Rake::TestCase
   end
 
   def test_load_rakefile_not_found
-    ARGV.clear
+    @app.argv.clear
     Dir.chdir @tempdir
     ENV['RAKE_SYSTEM'] = 'not_exist'
 
@@ -376,7 +378,7 @@ class TestRakeApplication < Rake::TestCase
 
     @app.handle_options
 
-    assert !ARGV.include?(valid_option)
+    assert !@app.argv.include?(valid_option)
     assert @app.options.trace
   end
 
@@ -404,14 +406,14 @@ class TestRakeApplication < Rake::TestCase
     setup_command_line("--trace", "sometask")
 
     @app.handle_options
-    assert ARGV.include?("sometask")
+    assert @app.argv.include?("sometask")
     assert @app.options.trace
   end
 
   def test_good_run
     ran = false
 
-    ARGV << '--rakelib=""'
+    @app.argv << '--rakelib=""'
 
     @app.options.silent = true
 
@@ -466,7 +468,7 @@ class TestRakeApplication < Rake::TestCase
     }
     assert_match(/see full trace/i, err)
   ensure
-    ARGV.clear
+    @app.argv.clear
   end
 
   def test_bad_run_with_trace
@@ -477,7 +479,7 @@ class TestRakeApplication < Rake::TestCase
     }
     refute_match(/see full trace/i, err)
   ensure
-    ARGV.clear
+    @app.argv.clear
   end
 
   def test_bad_run_with_backtrace
@@ -490,7 +492,7 @@ class TestRakeApplication < Rake::TestCase
     }
     refute_match(/see full trace/, err)
   ensure
-    ARGV.clear
+    @app.argv.clear
   end
 
   CustomError = Class.new(RuntimeError)
@@ -547,7 +549,7 @@ class TestRakeApplication < Rake::TestCase
     end
     assert_match(/Secondary Error/, err)
   ensure
-    ARGV.clear
+    @app.argv.clear
   end
 
   def test_run_with_bad_options
@@ -557,7 +559,7 @@ class TestRakeApplication < Rake::TestCase
       capture_io { @app.run }
     }
   ensure
-    ARGV.clear
+    @app.argv.clear
   end
 
   def test_standard_exception_handling_invalid_option

data/test/test_rake_backtrace.rb

@@ -42,7 +42,7 @@ class TestRakeBacktrace < Rake::TestCase
     super
 
     skip 'tmpdir is suppressed in backtrace' if
-      Dir.pwd =~ Rake::Backtrace::SUPPRESS_PATTERN
+      Rake::Backtrace::SUPPRESS_PATTERN =~ Dir.pwd
   end
 
   def invoke(*args)

data/test/test_rake_clean.rb

@@ -41,7 +41,13 @@ class TestRakeClean < Rake::TestCase
     FileUtils.touch(file_name)
     FileUtils.chmod(0, file_name)
     FileUtils.chmod(0, dir_name)
-    file_name
+    begin
+      FileUtils.chmod(0644, file_name)
+    rescue
+      file_name
+    else
+      skip "Permission to delete files is different on thie system"
+    end
   end
 
   def remove_undeletable_file

data/test/test_rake_cpu_counter.rb

@@ -8,43 +8,61 @@ class TestRakeCpuCounter < Rake::TestCase
     @cpu_counter = Rake::CpuCounter.new
   end
 
-  def test_count_via_win32
-    if Rake::Win32.windows? then
-      assert_kind_of Numeric, @cpu_counter.count_via_win32
-    else
-      assert_nil @cpu_counter.count_via_win32
-    end
+  def test_count
+    num = @cpu_counter.count
+    skip 'cannot count CPU' if num == nil
+    assert_kind_of Numeric, num
+    assert_operator num, :>=, 1
   end
 
-  def test_in_path_command
-    with_ruby_in_path do |ruby|
-      assert_equal ruby, @cpu_counter.in_path_command(ruby)
-    end
-  rescue Errno::ENOENT => e
-    raise unless e.message =~ /\bwhich\b/
+  def test_count_with_default_nil
+    def @cpu_counter.count; nil; end
+    assert_equal(8, @cpu_counter.count_with_default(8))
+    assert_equal(4, @cpu_counter.count_with_default)
+  end
 
-    skip 'cannot find which for this test'
+  def test_count_with_default_raise
+    def @cpu_counter.count; raise; end
+    assert_equal(8, @cpu_counter.count_with_default(8))
+    assert_equal(4, @cpu_counter.count_with_default)
   end
 
-  def test_run
-    with_ruby_in_path do |ruby|
-      assert_equal 7, @cpu_counter.run(ruby, '-e', 'puts 3 + 4')
+  class TestClassMethod < Rake::TestCase
+    def setup
+      super
+
+      @klass = Class.new(Rake::CpuCounter)
     end
-  end
 
-  def with_ruby_in_path
-    ruby     = File.basename Gem.ruby
-    ruby_dir = File.dirname  Gem.ruby
+    def test_count
+      @klass.class_eval do
+        def count; 8; end
+      end
+      assert_equal(8, @klass.count)
+    end
 
-    begin
-      orig_path, ENV['PATH'] =
-        ENV['PATH'], [ruby_dir, *ENV['PATH']].join(File::PATH_SEPARATOR)
+    def test_count_nil
+      counted = false
+      @klass.class_eval do
+        define_method(:count) do
+          counted = true
+          nil
+        end
+      end
+      assert_equal(4, @klass.count)
+      assert_equal(true, counted)
+    end
 
-      yield ruby
-    ensure
-      ENV['PATH'] = orig_path
+    def test_count_raise
+      counted = false
+      @klass.class_eval do
+        define_method(:count) do
+          counted = true
+          raise
+        end
+      end
+      assert_equal(4, @klass.count)
+      assert_equal(true, counted)
     end
   end
-
 end
-