don't return directories when requesting files

This commit is contained in:
Yann Lugrin 2011-06-20 10:08:32 +02:00
parent f56db548e7
commit 043d285894
2 changed files with 3 additions and 4 deletions

View File

@ -47,7 +47,7 @@ module Guard
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 @@ module Guard
!!@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

View File

@ -42,7 +42,7 @@ describe Guard::Listener do
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