Improved ext method (need to double check windows code)

jimweirich · Mar 5, 2009 · d751f06 · d751f06
1 parent 180688c
commit d751f06
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/rake.rb b/lib/rake.rb
@@ -84,7 +84,7 @@ def ext(newext='')
       if newext != ''
         newext = (newext =~ /^\./) ? newext : ("." + newext)
       end
-      dup.sub!(%r(([^/\\])\.[^./\\]*$)) { $1 + newext } || self + newext
+      self.chomp(File.extname(self)) << newext
     end
   end
 

diff --git a/test/test_filelist.rb b/test/test_filelist.rb
@@ -285,9 +285,7 @@ def test_string_ext
     assert_equal "one.two.net", "one.two.c".ext(".net")
     assert_equal "one/two.net", "one/two.c".ext(".net")
     assert_equal "one.x/two.net", "one.x/two.c".ext(".net")
-    assert_equal "one.x\\two.net", "one.x\\two.c".ext(".net")
     assert_equal "one.x/two.net", "one.x/two".ext(".net")
-    assert_equal "one.x\\two.net", "one.x\\two".ext(".net")
     assert_equal ".onerc.net", ".onerc.dot".ext("net")
     assert_equal ".onerc.net", ".onerc".ext("net")
     assert_equal ".a/.onerc.net", ".a/.onerc".ext("net")
@@ -297,6 +295,11 @@ def test_string_ext
     assert_equal ".one", ".one".ext
     assert_equal ".", ".".ext("c")
     assert_equal "..", "..".ext("c")
+    # These only need to work in windows
+    if Rake::Win32.windows?
+      assert_equal "one.x\\two.net", "one.x\\two.c".ext(".net")
+      assert_equal "one.x\\two.net", "one.x\\two".ext(".net")
+    end
   end
 
   def test_filelist_ext