Merge pull request #287 from DavidEGrayson/pull_request_1

FileTask: Return a late timestamp instead of an early timestamp if file doesn't exist

lib/rake.rb

@@ -63,6 +63,7 @@ module Rake
 require 'rake/file_list'
 require 'rake/default_loader'
 require 'rake/early_time'
+require 'rake/late_time'
 require 'rake/name_space'
 require 'rake/task_manager'
 require 'rake/application'

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)

lib/rake/file_task.rb

@@ -21,7 +21,7 @@ def timestamp
       if File.exist?(name)
         File.mtime(name.to_s)
       else
-        Rake::EARLY
+        Rake::LATE
       end
     end
 

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

test/test_rake_file_task.rb

@@ -24,6 +24,7 @@ def test_file_need
     File.delete(ftask.name) rescue nil
 
     assert ftask.needed?, "file should be needed"
+    assert_equal Rake::LATE, ftask.timestamp
 
     open(ftask.name, "w") { |f| f.puts "HI" }
 
@@ -84,19 +85,14 @@ def test_file_depends_on_task_depend_on_file
   end
 
   def test_existing_file_depends_on_non_existing_file
-    @ran = false
-
     create_file(OLDFILE)
     delete_file(NEWFILE)
-    file NEWFILE do
-      @ran = true
-    end
-
-    file OLDFILE => NEWFILE
+    file NEWFILE            do |t| @runs << t.name end
+    file OLDFILE => NEWFILE do |t| @runs << t.name end
 
     Task[OLDFILE].invoke
 
-    assert @ran
+    assert_equal [NEWFILE, OLDFILE], @runs
   end
 
   def test_needed_eh_build_all

test/test_rake_late_time.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestRakeLateTime < Rake::TestCase
+  def test_late_time_comparisons
+    late = Rake::LATE
+    assert_equal late, late
+    assert late >= Time.now
+    assert late > Time.now
+    assert late != Time.now
+    assert Time.now < late
+    assert Time.now <= late
+    assert Time.now != late
+  end
+
+  def test_to_s
+    assert_equal '<LATE TIME>', Rake::LATE.to_s
+  end
+end