Merge branch 'hook' of github.com:guard/guard into hook

Conflicts:
	lib/guard.rb
	lib/guard/dsl.rb
	lib/guard/hook.rb
	spec/guard/dsl_spec.rb
	spec/guard/hook_spec.rb
	spec/guard_spec.rb
This commit is contained in:
Rémy Coutable 2011-04-30 00:49:46 +02:00
commit 20b8a9af69

View File

@ -15,7 +15,7 @@ module Guard
# end # end
# Here, when #run_all is called, #hook will notify callbacks # Here, when #run_all is called, #hook will notify callbacks
# registered for the "run_all_foo" event. # registered for the "run_all_foo" event.
# #
# When +event+ is a String, #hook will directly turn the String # When +event+ is a String, #hook will directly turn the String
# into a Symbol. # into a Symbol.
# Example: # Example:
@ -24,7 +24,7 @@ module Guard
# end # end
# Here, when #run_all is called, #hook will notify callbacks # Here, when #run_all is called, #hook will notify callbacks
# registered for the "foo_bar" event. # registered for the "foo_bar" event.
# #
# +args+ parameter is passed as is to the callbacks registered # +args+ parameter is passed as is to the callbacks registered
# for the given event. # for the given event.
def hook(event, *args) def hook(event, *args)