Allow extended globs with ignore

This makes it match the default behaviour of Dir#glob
This commit is contained in:
Eliott Appleford 2015-06-14 11:55:10 +01:00 committed by Eliott Appleford
parent 6562716aa5
commit 70d4671d2c

View file

@ -59,7 +59,11 @@ module Middleman
elsif path.is_a? String elsif path.is_a? String
path_clean = ::Middleman::Util.normalize_path(path) path_clean = ::Middleman::Util.normalize_path(path)
if path_clean.include?('*') # It's a glob if path_clean.include?('*') # It's a glob
@ignored_callbacks << proc { |p| File.fnmatch(path_clean, p) } if defined? File::FNM_EXTGLOB
@ignored_callbacks << proc { |p| File.fnmatch(path_clean, p, File::FNM_EXTGLOB) }
else
@ignored_callbacks << proc { |p| File.fnmatch(path_clean, p) }
end
else else
# Add a specific-path ignore unless that path is already covered # Add a specific-path ignore unless that path is already covered
return if ignored?(path_clean) return if ignored?(path_clean)