don't return directories when requesting files

guard · Jun 20, 2011 · 043d285 · 043d285
1 parent f56db54
commit 043d285
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/guard/listener.rb b/lib/guard/listener.rb
@@ -47,7 +47,7 @@ def update_last_event
     end
 
     def modified_files(dirs, options = {})
-      files = potentially_modified_files(dirs, options).select { |path| File.file?(path) && file_modified?(path) }
+      files = potentially_modified_files(dirs, options).select { |path| file_modified?(path) }
       relativate_paths files
     end
 
@@ -77,12 +77,11 @@ def relativate_paths?
       !!@relativate_paths
     end
 
-
   private
 
     def potentially_modified_files(dirs, options = {})
       match = options[:all] ? "**/*" : "*"
-      Dir.glob(dirs.map { |dir| "#{dir}#{match}" }, File::FNM_DOTMATCH).select { |file| file !~ /\.\.?$/ }
+      Dir.glob(dirs.map { |dir| "#{dir}#{match}" }, File::FNM_DOTMATCH).select { |file| File.file?(file) }
     end
 
     # Depending on the filesystem, mtime is probably only precise to the second, so round

diff --git a/spec/guard/listener_spec.rb b/spec/guard/listener_spec.rb
@@ -42,7 +42,7 @@
     subject { described_class.new(@fixture_path) }
 
     it "should return all files" do
-      subject.all_files.should =~ Dir.glob("#{@fixture_path}/**/*", File::FNM_DOTMATCH).select { |file| file !~ /\.\.?$/ }
+      subject.all_files.should =~ Dir.glob("#{@fixture_path}/**/*", File::FNM_DOTMATCH).select { |file| File.file?(file) }
     end
   end