don't return directories when requesting files
This commit is contained in:
parent
f56db548e7
commit
043d285894
@ -47,7 +47,7 @@ module Guard
|
|||||||
end
|
end
|
||||||
|
|
||||||
def modified_files(dirs, options = {})
|
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
|
relativate_paths files
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -77,12 +77,11 @@ module Guard
|
|||||||
!!@relativate_paths
|
!!@relativate_paths
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def potentially_modified_files(dirs, options = {})
|
def potentially_modified_files(dirs, options = {})
|
||||||
match = options[:all] ? "**/*" : "*"
|
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
|
end
|
||||||
|
|
||||||
# Depending on the filesystem, mtime is probably only precise to the second, so round
|
# Depending on the filesystem, mtime is probably only precise to the second, so round
|
||||||
|
@ -42,7 +42,7 @@ describe Guard::Listener do
|
|||||||
subject { described_class.new(@fixture_path) }
|
subject { described_class.new(@fixture_path) }
|
||||||
|
|
||||||
it "should return all files" do
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user