clutil 2011.009.1 → 2011.010.0

data/cl/util/file.rb

@@ -117,12 +117,24 @@ class << File
     else
       set_ro = false
     end
-    new_atime = Time.now
-    File.utime(new_atime, File.stat(src).mtime, dst)
+    match_mtime(src, dst)
     File.chmod(0444, dst) if set_ro
     return installed
   end
 
+  # XP's utime appears to still have a bug when the file's time is within Daylight Saving Time, but
+  # the current system time is outside Daylight Saving Time. This method will ensure any difference
+  # is compensated for.
+  def match_mtime(src, dst)
+    new_atime = Time.now
+    File.utime(new_atime, File.mtime(src), dst)
+    if File.mtime(src) != File.mtime(dst)
+      new_mtime = File.mtime(src)
+      new_mtime += (File.mtime(src) - File.mtime(dst))
+      File.utime(new_atime, new_mtime, dst)
+    end
+  end
+
   # human readable size
   def h_size(filename)
     size = File.size(filename)

data/cl/util/test/filetest.rb

@@ -201,20 +201,6 @@ class TestBackup < TempDirTest
     dst = File.join(@b_dir, File.basename(src))
     assert_equal(true, File.backup(src, dst))
 
-    File.utime(0, 0, dst)
-    assert_equal(true, File.backup(src, dst))
-    assert_equal(true, File.backup(src, dst))
-  end
-
-  def test_backed_up_because_exists_different_mtime_but_install_returns_false
-    # a complicated case: the dst file exists, has the exact same content,
-    # but has a different timestamp (perhaps due to time zone glitchery).
-    # the file should come back as backed up, but have its mtime updated to match
-    # the src so it won't trigger the next time a compare is done
-    src = make_sample_text_file('a')
-    dst = File.join(@b_dir, File.basename(src))
-    assert_equal(true, File.backup(src, dst))
-
     File.utime(0, 0, dst)
     assert_equal(true, File.backup(src, dst))
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2011
-  - 9
-  - 1
-  version: 2011.009.1
+  - 10
+  - 0
+  version: 2011.010.0
 platform: ruby
 authors: 
 - chrismo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 -06:00
+date: 2011-01-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency