deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1540 from middleman/extended-globs

Browse source 
Allow extended globs with ignore
This commit is contained in:
Eliott Appleford 2015-06-14 13:26:30 +01:00
parent 6562716aa5 70d4671d2c
commit 3cbe2acaf7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-core/sitemap/extensions/ignores.rb
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
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) } @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)