rake 10.0.4 → 10.1.0

data/lib/rake/clean.rb

@@ -14,19 +14,42 @@
 require 'rake'
 
 # :stopdoc:
-CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
+
+module Rake
+  module Cleaner
+    extend FileUtils
+
+    module_function
+
+    def cleanup_files(file_names)
+      file_names.each do |file_name|
+        cleanup(file_name)
+      end
+    end
+
+    def cleanup(file_name, opts={})
+      begin
+        rm_r file_name, opts
+      rescue StandardError => ex
+        puts "Failed to remove #{file_name}: #{ex}"
+      end
+    end
+  end
+end
+
+CLEAN = ::Rake::FileList["**/*~", "**/*.bak", "**/core"]
 CLEAN.clear_exclude.exclude { |fn|
   fn.pathmap("%f").downcase == 'core' && File.directory?(fn)
 }
 
 desc "Remove any temporary products."
 task :clean do
-  CLEAN.each { |fn| rm_r fn rescue nil }
+  Rake::Cleaner.cleanup_files(CLEAN)
 end
 
-CLOBBER = Rake::FileList.new
+CLOBBER = ::Rake::FileList.new
 
 desc "Remove any generated file."
 task :clobber => [:clean] do
-  CLOBBER.each { |fn| rm_r fn rescue nil }
+  Rake::Cleaner.cleanup_files(CLOBBER)
 end

data/lib/rake/contrib/ftptools.rb

@@ -50,33 +50,21 @@ module Rake # :nodoc:
     def parse_mode(m)
       result = 0
       (1..9).each do |i|
-        result = 2*result + ((m[i]==?-) ? 0 : 1)
+        result = 2 * result + ((m[i] == ?-) ? 0 : 1)
       end
       result
     end
 
     def determine_time(d1, d2, d3)
       now = self.class.time.now
-      if /:/ =~ d3
-        result = Time.parse("#{d1} #{d2} #{now.year} #{d3}")
-        if result > now
-          result = Time.parse("#{d1} #{d2} #{now.year-1} #{d3}")
-        end
-      else
+      if /:/ !~ d3
         result = Time.parse("#{d1} #{d2} #{d3}")
+      else
+        result = Time.parse("#{d1} #{d2} #{now.year} #{d3}")
+        result = Time.parse("#{d1} #{d2} #{now.year - 1} #{d3}") if
+          result > now
       end
       result
-#       elements = ParseDate.parsedate("#{d1} #{d2} #{d3}")
-#       if elements[0].nil?
-#         today = self.class.date.today
-#         if elements[1] > today.month
-#           elements[0] = today.year - 1
-#         else
-#           elements[0] = today.year
-#         end
-#       end
-#       elements = elements.collect { |el| el.nil? ? 0 : el }
-#       Time.mktime(*elements[0,7])
     end
   end
 

data/lib/rake/contrib/sys.rb

@@ -1 +1,2 @@
-fail "ERROR: 'rake/contrib/sys' is obsolete and no longer supported. Use 'FileUtils' instead."
+fail "ERROR: 'rake/contrib/sys' is obsolete and no longer supported. " +
+  "Use 'FileUtils' instead."

data/lib/rake/dsl_definition.rb

@@ -66,7 +66,7 @@ module Rake
       dir, _ = *Rake.application.resolve_args(args)
       Rake.each_dir_parent(dir) do |d|
         file_create d do |t|
-          mkdir_p t.name if ! File.exist?(t.name)
+          mkdir_p t.name unless File.exist?(t.name)
         end
       end
       result
@@ -116,6 +116,7 @@ module Rake
     end
 
     # Describe the next rake task.
+    # Duplicate descriptions are discarded.
     #
     # Example:
     #   desc "Run the Unit Tests"

data/lib/rake/ext/core.rb

@@ -19,7 +19,8 @@ class Module
   #
   def rake_extension(method)
     if method_defined?(method)
-      $stderr.puts "WARNING: Possible conflict with Rake extension: #{self}##{method} already exists"
+      $stderr.puts "WARNING: Possible conflict with Rake extension: " +
+        "#{self}##{method} already exists"
     else
       yield
     end

data/lib/rake/ext/string.rb

@@ -13,9 +13,7 @@ class String
     # +ext+ is a user added method for the String class.
     def ext(newext='')
       return self.dup if ['.', '..'].include? self
-      if newext != ''
-        newext = (newext =~ /^\./) ? newext : ("." + newext)
-      end
+      newext = (newext =~ /^\./) ? newext : ("." + newext) if newext != ''
       self.chomp(File.extname(self)) << newext
     end
   end

data/lib/rake/file_list.rb

@@ -41,10 +41,11 @@ module Rake
 
     # List of array methods (that are not in +Object+) that need to be
     # delegated.
-    ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).map { |n| n.to_s }
+    ARRAY_METHODS = (Array.instance_methods - Object.instance_methods).
+      map { |n| n.to_s }
 
     # List of additional methods that must be delegated.
-    MUST_DEFINE = %w[to_a inspect <=>]
+    MUST_DEFINE = %w[inspect <=>]
 
     # List of methods that should not be delegated here (we define special
     # versions of them explicitly below).
@@ -58,12 +59,13 @@ module Rake
       + - & |
     ]
 
-    DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).collect{ |s| s.to_s }.sort.uniq
+    DELEGATING_METHODS = (ARRAY_METHODS + MUST_DEFINE - MUST_NOT_DEFINE).
+      map { |s| s.to_s }.sort.uniq
 
     # Now do the delegation.
-    DELEGATING_METHODS.each_with_index do |sym, i|
+    DELEGATING_METHODS.each do |sym|
       if SPECIAL_RETURN.include?(sym)
-        ln = __LINE__+1
+        ln = __LINE__ + 1
         class_eval %{
           def #{sym}(*args, &block)
             resolve
@@ -72,7 +74,7 @@ module Rake
           end
         }, __FILE__, ln
       else
-        ln = __LINE__+1
+        ln = __LINE__ + 1
         class_eval %{
           def #{sym}(*args, &block)
             resolve
@@ -149,10 +151,8 @@ module Rake
       patterns.each do |pat|
         @exclude_patterns << pat
       end
-      if block_given?
-        @exclude_procs << block
-      end
-      resolve_exclude if ! @pending
+      @exclude_procs << block if block_given?
+      resolve_exclude unless @pending
       self
     end
 
@@ -219,7 +219,7 @@ module Rake
     private :resolve_add
 
     def resolve_exclude
-      reject! { |fn| exclude?(fn) }
+      reject! { |fn| excluded_from_list?(fn) }
       self
     end
     private :resolve_exclude
@@ -231,7 +231,7 @@ module Rake
     #   FileList['a.c', 'b.c'].sub(/\.c$/, '.o')  => ['a.o', 'b.o']
     #
     def sub(pat, rep)
-      inject(FileList.new) { |res, fn| res << fn.sub(pat,rep) }
+      inject(FileList.new) { |res, fn| res << fn.sub(pat, rep) }
     end
 
     # Return a new FileList with the results of running +gsub+ against each
@@ -242,18 +242,18 @@ module Rake
     #      => ['lib\\test\\file', 'x\\y']
     #
     def gsub(pat, rep)
-      inject(FileList.new) { |res, fn| res << fn.gsub(pat,rep) }
+      inject(FileList.new) { |res, fn| res << fn.gsub(pat, rep) }
     end
 
     # Same as +sub+ except that the original file list is modified.
     def sub!(pat, rep)
-      each_with_index { |fn, i| self[i] = fn.sub(pat,rep) }
+      each_with_index { |fn, i| self[i] = fn.sub(pat, rep) }
       self
     end
 
     # Same as +gsub+ except that the original file list is modified.
     def gsub!(pat, rep)
-      each_with_index { |fn, i| self[i] = fn.gsub(pat,rep) }
+      each_with_index { |fn, i| self[i] = fn.gsub(pat, rep) }
       self
     end
 
@@ -341,13 +341,19 @@ module Rake
     # Add matching glob patterns.
     def add_matching(pattern)
       FileList.glob(pattern).each do |fn|
-        self << fn unless exclude?(fn)
+        self << fn unless excluded_from_list?(fn)
       end
     end
     private :add_matching
 
-    # Should the given file name be excluded?
-    def exclude?(fn)
+    # Should the given file name be excluded from the list?
+    #
+    # NOTE: This method was formally 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
+    # code, you will need to update.
+    def excluded_from_list?(fn)
       return true if @exclude_patterns.any? do |pat|
         case pat
         when Regexp

data/lib/rake/file_task.rb

@@ -29,7 +29,7 @@ module Rake
 
     # Are there any prerequisites with a later time than the given time stamp?
     def out_of_date?(stamp)
-      @prerequisites.any? { |n| application[n, @scope].timestamp > stamp}
+      @prerequisites.any? { |n| application[n, @scope].timestamp > stamp }
     end
 
     # ----------------------------------------------------------------
@@ -44,4 +44,3 @@ module Rake
     end
   end
 end
-

data/lib/rake/file_utils.rb

@@ -48,10 +48,12 @@ module FileUtils
 
   def create_shell_runner(cmd) # :nodoc:
     show_command = cmd.join(" ")
-    show_command = show_command[0,42] + "..." unless $trace
-    lambda { |ok, status|
-      ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
-    }
+    show_command = show_command[0, 42] + "..." unless $trace
+    lambda do |ok, status|
+      ok or
+        fail "Command failed with status (#{status.exitstatus}): " +
+        "[#{show_command}]"
+    end
   end
   private :create_shell_runner
 
@@ -74,9 +76,9 @@ module FileUtils
   # Example:
   #   ruby %{-pe '$_.upcase!' <README}
   #
-  def ruby(*args,&block)
+  def ruby(*args, &block)
     options = (Hash === args.last) ? args.pop : {}
-    if args.length > 1 then
+    if args.length > 1
       sh(*([RUBY] + args + [options]), &block)
     else
       sh("#{RUBY} #{args.first}", options, &block)
@@ -88,7 +90,7 @@ module FileUtils
   #  Attempt to do a normal file link, but fall back to a copy if the link
   #  fails.
   def safe_ln(*args)
-    unless LN_SUPPORTED[0]
+    if ! LN_SUPPORTED[0]
       cp(*args)
     else
       begin

data/lib/rake/file_utils_ext.rb

@@ -135,7 +135,8 @@ module Rake
       optdecl.each do |name|
         h.delete name
       end
-      raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless h.empty?
+      raise ArgumentError, "no such option: #{h.keys.join(' ')}" unless
+        h.empty?
     end
 
     extend self

data/lib/rake/gempackagetask.rb

@@ -1 +1,2 @@
-fail "ERROR: 'rake/gempackagetask' is obsolete and no longer supported. Use 'rubygems/package_task' instead."
+fail "ERROR: 'rake/gempackagetask' is obsolete and no longer supported. " +
+  "Use 'rubygems/packagetask' instead."

data/lib/rake/invocation_chain.rb

@@ -3,44 +3,50 @@ module Rake
   ####################################################################
   # InvocationChain tracks the chain of task invocations to detect
   # circular dependencies.
-  class InvocationChain
-    def initialize(value, tail)
-      @value = value
-      @tail = tail
-    end
+  class InvocationChain < LinkedList
 
-    def member?(obj)
-      @value == obj || @tail.member?(obj)
+    # Is the invocation already in the chain?
+    def member?(invocation)
+      head == invocation || tail.member?(invocation)
     end
 
-    def append(value)
-      if member?(value)
-        fail RuntimeError, "Circular dependency detected: #{to_s} => #{value}"
+    # Append an invocation to the chain of invocations. It is an error
+    # if the invocation already listed.
+    def append(invocation)
+      if member?(invocation)
+        fail RuntimeError, "Circular dependency detected: #{to_s} => #{invocation}"
       end
-      self.class.new(value, self)
+      conj(invocation)
     end
 
+    # Convert to string, ie: TOP => invocation => invocation
     def to_s
-      "#{prefix}#{@value}"
+      "#{prefix}#{head}"
     end
 
-    def self.append(value, chain)
-      chain.append(value)
+    # Class level append.
+    def self.append(invocation, chain)
+      chain.append(invocation)
     end
 
     private
 
     def prefix
-      "#{@tail.to_s} => "
+      "#{tail.to_s} => "
     end
 
-    class EmptyInvocationChain
+    # Null object for an empty chain.
+    class EmptyInvocationChain < LinkedList::EmptyLinkedList
+      @parent = InvocationChain
+
       def member?(obj)
         false
       end
-      def append(value)
-        InvocationChain.new(value, self)
+
+      def append(invocation)
+        conj(invocation)
       end
+
       def to_s
         "TOP"
       end

data/lib/rake/linked_list.rb

@@ -0,0 +1,103 @@
+module Rake
+
+  # Polylithic linked list structure used to implement several data
+  # 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 has the tail.
+    def conj(item)
+      self.class.cons(item, self)
+    end
+
+    # Is the list empty?
+    def empty?
+      false
+    end
+
+    # Lists are structurally equivalent.
+    def ==(other)
+      current = self
+      while ! current.empty? && ! other.empty?
+        return false if current.head != other.head
+        current = current.tail
+        other = other.tail
+      end
+      current.empty? && other.empty?
+    end
+
+    # Convert to string: LL(item, item...)
+    def to_s
+      items = map { |item| item.to_s }.join(", ")
+      "LL(#{items})"
+    end
+
+    # Same as +to_s+, but with inspected items.
+    def inspect
+      items = map { |item| item.inspect }.join(", ")
+      "LL(#{items})"
+    end
+
+    # For each item in the list.
+    def each
+      current = self
+      while ! current.empty?
+        yield(current.head)
+        current = current.tail
+      end
+      self
+    end
+
+    # 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)
+      end
+      result
+    end
+
+    # Cons a new head onto the tail list.
+    def self.cons(head, tail)
+      new(head, tail)
+    end
+
+    # The standard empty list class for the given LinkedList class.
+    def self.empty
+      self::EMPTY
+    end
+
+    # Represent an empty list, using the Null Object Pattern.
+    #
+    # When inheriting from the LinkedList class, you should implement
+    # a type specific Empty class as well. Make sure you set the class
+    # instance variable @parent to the assocated list class (this
+    # allows conj, cons and make to work polymorphically).
+    class EmptyLinkedList < LinkedList
+      @parent = LinkedList
+
+      def initialize
+      end
+
+      def empty?
+        true
+      end
+
+      def self.cons(head, tail)
+        @parent.cons(head, tail)
+      end
+    end
+
+    EMPTY = EmptyLinkedList.new
+  end
+
+end

data/lib/rake/packagetask.rb

@@ -51,13 +51,16 @@ module Rake
     # Directory used to store the package files (default is 'pkg').
     attr_accessor :package_dir
 
-    # True if a gzipped tar file (tgz) should be produced (default is false).
+    # True if a gzipped tar file (tgz) should be produced (default is
+    # false).
     attr_accessor :need_tar
 
-    # True if a gzipped tar file (tar.gz) should be produced (default is false).
+    # True if a gzipped tar file (tar.gz) should be produced (default
+    # is false).
     attr_accessor :need_tar_gz
 
-    # True if a bzip2'd tar file (tar.bz2) should be produced (default is false).
+    # True if a bzip2'd tar file (tar.bz2) should be produced (default
+    # is false).
     attr_accessor :need_tar_bz2
 
     # True if a zip file should be produced (default is false)
@@ -121,7 +124,8 @@ module Rake
       ].each do |(need, file, flag)|
         if need
           task :package => ["#{package_dir}/#{file}"]
-          file "#{package_dir}/#{file}" => [package_dir_path] + package_files do
+          file "#{package_dir}/#{file}" =>
+            [package_dir_path] + package_files do
             chdir(package_dir) do
               sh %{#{@tar_command} #{flag}cvf #{file} #{package_name}}
             end
@@ -131,7 +135,8 @@ module Rake
 
       if need_zip
         task :package => ["#{package_dir}/#{zip_file}"]
-        file "#{package_dir}/#{zip_file}" => [package_dir_path] + package_files do
+        file "#{package_dir}/#{zip_file}" =>
+          [package_dir_path] + package_files do
           chdir(package_dir) do
             sh %{#{@zip_command} -r #{zip_file} #{package_name}}
           end
@@ -145,7 +150,7 @@ module Rake
         @package_files.each do |fn|
           f = File.join(package_dir_path, fn)
           fdir = File.dirname(f)
-          mkdir_p(fdir) if !File.exist?(fdir)
+          mkdir_p(fdir) unless File.exist?(fdir)
           if File.directory?(fn)
             mkdir_p(f)
           else

data/lib/rake/pseudo_status.rb

@@ -4,18 +4,23 @@ module Rake
   # Exit status class for times the system just gives us a nil.
   class PseudoStatus
     attr_reader :exitstatus
+
     def initialize(code=0)
       @exitstatus = code
     end
+
     def to_i
       @exitstatus << 8
     end
+
     def >>(n)
       to_i >> n
     end
+
     def stopped?
       false
     end
+
     def exited?
       true
     end

data/lib/rake/rdoctask.rb

@@ -1 +1,2 @@
-fail "ERROR: 'rake/rdoctask' is obsolete and no longer supported. Use 'rdoc/task' (available in RDoc 2.4.2+) instead."
+fail "ERROR: 'rake/rdoctask' is obsolete and no longer supported. " +
+  "Use 'rdoc/task' (available in RDoc 2.4.2+) instead."

data/lib/rake/ruby182_test_unit_fix.rb

@@ -10,12 +10,14 @@ module Test                     # :nodoc:
         def collect_file(name, suites, already_gathered) # :nodoc:
           dir = File.dirname(File.expand_path(name))
           $:.unshift(dir) unless $:.first == dir
-          if(@req)
+          if @req
             @req.require(name)
           else
             require(name)
           end
-          find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
+          find_test_cases(already_gathered).each do |t|
+            add_suite(suites, t.suite)
+          end
         ensure
           $:.delete_at $:.rindex(dir)
         end

data/lib/rake/runtest.rb

@@ -6,7 +6,7 @@ module Rake
   include Test::Unit::Assertions
 
   def run_tests(pattern='test/test*.rb', log_enabled=false)
-    FileList.glob(pattern).each { |fn|
+    FileList.glob(pattern).each do |fn|
       $stderr.puts fn if log_enabled
       begin
         require fn
@@ -15,7 +15,7 @@ module Rake
         $stderr.puts ex.backtrace
         assert false
       end
-    }
+    end
   end
 
   extend self

data/lib/rake/scope.rb

@@ -0,0 +1,42 @@
+module Rake
+  class Scope < LinkedList
+
+    # Path for the scope.
+    def path
+      map { |item| item.to_s }.reverse.join(":")
+    end
+
+    # Path for the scope + the named path.
+    def path_with_task_name(task_name)
+      "#{path}:#{task_name}"
+    end
+
+    # Trim +n+ innermost scope levels from the scope. In no case will
+    # this trim beyond the toplevel scope.
+    def trim(n)
+      result = self
+      while n > 0 && ! result.empty?
+        result = result.tail
+        n -= 1
+      end
+      result
+    end
+
+    # Scope lists always end with an EmptyScope object. See Null
+    # Object Pattern)
+    class EmptyScope < EmptyLinkedList
+      @parent = Scope
+
+      def path
+        ""
+      end
+
+      def path_with_task_name(task_name)
+        task_name
+      end
+    end
+
+    # Singleton null object for an empty scope.
+    EMPTY = EmptyScope.new
+  end
+end