Merge pull request #231 from styd/unique-file-list

Account for a file that match 2 or more patterns.
ruby · Oct 17, 2017 · f962d63 · f962d63
2 parents f7b9689 + bfab5f8
commit f962d63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/rake/file_list.rb b/lib/rake/file_list.rb
@@ -318,14 +318,14 @@ def egrep(pattern, *options)
     # Return a new file list that only contains file names from the current
     # file list that exist on the file system.
     def existing
-      select { |fn| File.exist?(fn) }
+      select { |fn| File.exist?(fn) }.uniq
     end
 
     # Modify the current file list so that it contains only file name that
     # exist on the file system.
     def existing!
       resolve
-      @items = @items.select { |fn| File.exist?(fn) }
+      @items = @items.select { |fn| File.exist?(fn) }.uniq
       self
     end
 

diff --git a/test/test_rake_file_list.rb b/test/test_rake_file_list.rb
@@ -415,13 +415,13 @@ def test_egrep_with_error
   end
 
   def test_existing
-    fl = FileList["abc.c", "notthere.c"]
+    fl = FileList["*c.c", "notthere.c", "a*.c"]
     assert_equal ["abc.c"], fl.existing
     assert fl.existing.is_a?(FileList)
   end
 
   def test_existing!
-    fl = FileList["abc.c", "notthere.c"]
+    fl = FileList["*c.c", "notthere.c", "a*.c"]
     result = fl.existing!
     assert_equal ["abc.c"], fl
     assert_equal fl.object_id, result.object_id