Merge pull request #74 from tscholz/file_list_special_returns

Fix special_return method's result wrapping to be more dynamic

lib/rake/file_list.rb

@@ -70,7 +70,7 @@ class FileList
           def #{sym}(*args, &block)
             resolve
             result = @items.send(:#{sym}, *args, &block)
-            FileList.new.import(result)
+            self.class.new.import(result)
           end
         }, __FILE__, ln
       else

test/test_rake_file_list.rb

@@ -642,6 +642,21 @@ def test_other_array_returning_methods
     assert_equal FileList, r.class
   end
 
+  def test_special_return_delegating_methods_object_type
+    custom_file_list = Class.new(FileList)
+    f = custom_file_list.new
+
+    FileList::SPECIAL_RETURN.each do |m|
+      r = if [].method(m).arity == 1
+            f.send(m, [])
+          else
+            f.send(m)
+          end
+
+      assert_equal custom_file_list, r.class
+    end
+  end
+
   def test_file_utils_can_use_filelists
     cfiles = FileList['*.c']