Merge pull request #13 from martinandert/close-file-handle

Close opened file handle in #from_filename
highb · Aug 29, 2017 · 98880f5 · 98880f5
2 parents 60a4c02 + 77b136c
commit 98880f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/pathspec.rb b/lib/pathspec.rb
@@ -75,7 +75,7 @@ def drive_letter_to_path(path)
 
   # Generate specs from a filename, such as a .gitignore
   def self.from_filename(filename, type=:git)
-    self.from_lines(File.open(filename, 'r'), type)
+    File.open(filename, 'r') { |io| self.from_lines(io, type) }
   end
 
   def self.from_lines(lines, type=:git)

diff --git a/spec/unit/pathspec_spec.rb b/spec/unit/pathspec_spec.rb
@@ -310,8 +310,10 @@
 
     context "#from_filename" do
       it "forwards the type argument" do
-        expect(File).to receive(:open).and_return(anything)
-        expect(PathSpec).to receive(:from_lines).with(anything, :regex)
+        io = double
+
+        expect(File).to receive(:open).and_yield(io)
+        expect(PathSpec).to receive(:from_lines).with(io, :regex)
 
         PathSpec.from_filename "/some/file", :regex
       end