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

Merge pull request #317 from bhollis/master

Browse source 
Fix watcher to be more selective about what it ignores
This commit is contained in:
Thomas Reynolds 2012-03-19 08:36:51 -07:00
commit 40380aaeeb
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
middleman-core/features/builder.feature
View file

@ -14,6 +14,7 @@ Feature: Builder
| images/Read me (example).txt | | images/Read me (example).txt |
| images/Child folder/regular_file(example).txt | | images/Child folder/regular_file(example).txt |
| .htaccess | | .htaccess |
| feed.xml |
Then the following files should not exist: Then the following files should not exist:
| _partial | | _partial |
| layout | | layout |

4
middleman-core/fixtures/large-build-app/source/feed.xml.builder Normal file
View file

@ -0,0 +1,4 @@
xml.instruct!
xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
xml.title "Not a feed, really"
end

13
middleman-core/lib/middleman-core/watcher.rb
View file

@ -17,12 +17,13 @@ module Middleman
def ignore_list def ignore_list
[ [
/\.sass-cache/, /\.sass-cache\//,
/\.git/, /\.git/,
/\.DS_Store/, /\.DS_Store$/,
/build/, /build\//,
/\.rbenv-version/, /\.rbenv-version$/,
/Gemfile/, /Gemfile$/,
/Gemfile\.lock$/,
/\.mm-pid/ /\.mm-pid/
] ]
end end
@ -179,4 +180,4 @@ module Middleman
Net::HTTP.post_form(uri, {}.merge(params)) Net::HTTP.post_form(uri, {}.merge(params))
end end
end end
end end