Move sorted glob to FileList

lib/rake/application.rb

@@ -204,7 +204,7 @@ def has_chain?(exception)
     def have_rakefile
       @rakefiles.each do |fn|
         if File.exist?(fn)
-          others = Rake.glob(fn, File::FNM_CASEFOLD)
+          others = FileList.glob(fn, File::FNM_CASEFOLD)
           return others.size == 1 ? others.first : fn
         elsif fn == ''
           return fn
@@ -609,7 +609,7 @@ def raw_load_rakefile # :nodoc:
     end
 
     def glob(path, &block)
-      Rake.glob(path.gsub("\\", '/')).each(&block)
+      FileList.glob(path.gsub("\\", '/')).each(&block)
     end
     private :glob
 

lib/rake/contrib/ftptools.rb

@@ -127,8 +127,7 @@ def makedirs(path)
     # Upload all files matching +wildcard+ to the uploader's root
     # path.
     def upload_files(wildcard)
-      fail "OUCH"
-      Rake.glob(wildcard).each do |fn|
+      FileList.glob(wildcard).each do |fn|
         upload(fn)
       end
     end

lib/rake/contrib/sys.rb

@@ -27,7 +27,7 @@ module Sys
   # Install all the files matching +wildcard+ into the +dest_dir+
   # directory.  The permission mode is set to +mode+.
   def install(wildcard, dest_dir, mode)
-    Rake.glob(wildcard).each do |fn|
+    FileList.glob(wildcard).each do |fn|
       File.install(fn, dest_dir, mode, $verbose)
     end
   end
@@ -81,7 +81,7 @@ def symlink_files(wildcard, dest_dir)
   # recursively delete directories.
   def delete(*wildcards)
     wildcards.each do |wildcard|
-      Rake.glob(wildcard).each do |fn|
+      FileList.glob(wildcard).each do |fn|
         if File.directory?(fn)
           log "Deleting directory #{fn}"
           Dir.delete(fn)
@@ -96,10 +96,10 @@ def delete(*wildcards)
   # Recursively delete all files and directories matching +wildcard+.
   def delete_all(*wildcards)
     wildcards.each do |wildcard|
-      Rake.glob(wildcard).each do |fn|
+      FileList.glob(wildcard).each do |fn|
         next if ! File.exist?(fn)
         if File.directory?(fn)
-          Rake.glob("#{fn}/*").each do |subfn|
+          FileList.glob("#{fn}/*").each do |subfn|
             next if subfn=='.' || subfn=='..'
             delete_all(subfn)
           end
@@ -161,7 +161,7 @@ def verbose(&block)
   # Perform a block with each file matching a set of wildcards.
   def for_files(*wildcards)
     wildcards.each do |wildcard|
-      Rake.glob(wildcard).each do |fn|
+      FileList.glob(wildcard).each do |fn|
         yield(fn)
       end
     end
@@ -172,7 +172,7 @@ def for_files(*wildcards)
   private # ----------------------------------------------------------
 
   def for_matching_files(wildcard, dest_dir)
-    Rake.glob(wildcard).each do |fn|
+    FileList.glob(wildcard).each do |fn|
       dest_file = File.join(dest_dir, fn)
       parent = File.dirname(dest_file)
       makedirs(parent) if ! File.directory?(parent)

lib/rake/rake_module.rb

@@ -32,13 +32,6 @@ def add_rakelib(*files)
         application.options.rakelib << file
       end
     end
-
-    # Get a sorted list of files matching the pattern. This method
-    # should be prefered to Dir[pattern] and Dir.glob[pattern] because
-    # the files returned are guaranteed to be sorted.
-    def glob(pattern, *args)
-      Dir.glob(pattern, *args).sort
-    end
   end
 
 end

lib/rake/runtest.rb

@@ -5,7 +5,7 @@ module Rake
   include Test::Unit::Assertions
 
   def run_tests(pattern='test/test*.rb', log_enabled=false)
-    Rake.glob(pattern).each { |fn|
+    FileList.glob(pattern).each { |fn|
       $stderr.puts fn if log_enabled
       begin
         require fn