Merge branch 'master' into interactor/cleanup

Conflicts:
	lib/guard.rb

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.5.1 - 28 October, 2012
+
+### Bug fix
+
+- [#351][] Fix turning off the interactor from the Guardfile. ([@netzpirat][])
+
 ## 1.5.0 - 22 October, 2012
 
 ### New features
@@ -616,10 +622,14 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [#316]: https://github.com/guard/guard/issues/316
 [#317]: https://github.com/guard/guard/issues/317
 [#324]: https://github.com/guard/guard/issues/324
+[#327]: https://github.com/guard/guard/issues/327
 [#331]: https://github.com/guard/guard/issues/331
 [#334]: https://github.com/guard/guard/issues/334
 [#342]: https://github.com/guard/guard/issues/342
 [#343]: https://github.com/guard/guard/issues/343
+[#345]: https://github.com/guard/guard/issues/345
+[#348]: https://github.com/guard/guard/issues/348
+[#351]: https://github.com/guard/guard/issues/351
 [@Gazer]: https://github.com/Gazer
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@alandipert]: https://github.com/alandipert
@@ -698,4 +708,4 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [@waldo]: https://github.com/waldo
 [@wereHamster]: https://github.com/wereHamster
 [@yannlugrin]: https://github.com/yannlugrin
-[@zonque]: https://github.com/zonque
+[@zonque]: https://github.com/zonque

lib/guard.rb

@@ -40,7 +40,8 @@ class << self
     # @deprecated @option options [Boolean] no_vendor ignore vendored dependencies
     #
     def setup(options = {})
-      @options    = options
+      @lock       = Mutex.new
+      @options    = options.dup
       @watchdir   = (options[:watchdir] && File.expand_path(options[:watchdir])) || Dir.pwd
       @runner     = ::Guard::Runner.new
       @allow_stop = Listen::Turnstile.new

lib/guard/version.rb

@@ -1,4 +1,4 @@
 module Guard
   # The current gem version of Guard
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

spec/support/guard_helper.rb

@@ -1,12 +1,12 @@
 shared_examples_for 'interactor enabled' do
-  it 'enables the notifier' do
+  it 'enables the interactor' do
     described_class::Interactor.should_receive(:new)
     described_class.setup_interactor
   end
 end
 
 shared_examples_for 'interactor disabled' do
-  it 'enables the notifier' do
+  it 'disables the interactor' do
     described_class::Interactor.should_not_receive(:new)
     described_class.setup_interactor
   end