Merge branch 'master' of github.com:guard/guard

This commit is contained in:
Thibaud Guillaume-Gentil 2011-07-02 10:01:54 +02:00
commit e7cc14152d
2 changed files with 4 additions and 1 deletions

View File

@ -7,6 +7,7 @@
## Improvements ## Improvements
- Issue [#98](https://github.com/guard/guard/issues/98): Multiple calls per watch event on linux with rb-inotify. ([@jeffutter][] & [@netzpirat][])
- Pull request [#94](https://github.com/guard/guard/pull/94): Show backtrace in terminal when a problem with a watch action occurs. ([@capotej][]) - Pull request [#94](https://github.com/guard/guard/pull/94): Show backtrace in terminal when a problem with a watch action occurs. ([@capotej][])
- Pull request [#88](https://github.com/guard/guard/pull/88): Write exception trace in the terminal when a supervised task fail. ([@mcmire][]) - Pull request [#88](https://github.com/guard/guard/pull/88): Write exception trace in the terminal when a supervised task fail. ([@mcmire][])
- Color in red the "ERROR:" flag when using `UI.error`. ([@rymai][]) - Color in red the "ERROR:" flag when using `UI.error`. ([@rymai][])
@ -171,6 +172,7 @@
[@gix]: https://github.com/gix [@gix]: https://github.com/gix
[@hashrocketeer]: https://github.com/hashrocketeer [@hashrocketeer]: https://github.com/hashrocketeer
[@indirect]: https://github.com/indirect [@indirect]: https://github.com/indirect
[@jeffutter]: https://github.com/jeffutter
[@johnbintz]: https://github.com/johnbintz [@johnbintz]: https://github.com/johnbintz
[@jrsacks]: https://github.com/jrsacks [@jrsacks]: https://github.com/jrsacks
[@koshigoe]: https://github.com/koshigoe [@koshigoe]: https://github.com/koshigoe

View File

@ -47,7 +47,8 @@ module Guard
end end
def watch(directory) def watch(directory)
worker.watch(directory, :recursive, :modify, :create, :close_write) do |event| # The event selection is based on https://github.com/guard/guard/wiki/Analysis-of-inotify-events-for-different-editors
worker.watch(directory, :recursive, :create, :move_self, :close_write) do |event|
unless event.name == "" # Event on root directory unless event.name == "" # Event on root directory
@files << event.absolute_name @files << event.absolute_name
end end