Merge 61c5668 into ada7658

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Master
 
 - [#443][] Escape `notify-send` arguments.  ([@netzpirat][])
+- [][] Allow multiple watch directories.  ([@timmfin][])
 
 ## 1.8.0 - 20 April, 2013
 
@@ -860,4 +861,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

README.md

@@ -218,10 +218,11 @@ $ guard -d # shortcut
 
 #### `-w`/`--watchdir` option
 
-Guard can watch any directory instead of the current directory:
+Guard can watch any number of directories instead of only the current directory:
 
 ```bash
 $ guard --watchdir ~/your/fancy/project
+$ guard -w ~/your/fancy/project ~/your/fancier/project2 #multiple directories
 $ guard -w ~/your/fancy/project # shortcut
 ```
 

lib/guard.rb

@@ -38,20 +38,27 @@ class << self
     # @option options [Boolean] notify if system notifications should be shown
     # @option options [Boolean] debug if debug output should be shown
     # @option options [Array<String>] group the list of groups to start
-    # @option options [String] watchdir the director to watch
+    # @option options [Array<String>] watchdir the directories to watch
     # @option options [String] guardfile the path to the Guardfile
     # @deprecated @option options [Boolean] watch_all_modifications watches all file modifications if true
     # @deprecated @option options [Boolean] no_vendor ignore vendored dependencies
     #
     def setup(options = {})
-      @running  = true
-      @lock     = Mutex.new
-      @options  = options.dup
-      @watchdir = (options[:watchdir] && File.expand_path(options[:watchdir])) || Dir.pwd
-      @runner   = ::Guard::Runner.new
-      @scope    = { :plugins => [], :groups => [] }
-
-      Dir.chdir(@watchdir)
+      @running   = true
+      @lock      = Mutex.new
+      @options   = options.dup
+      @runner    = ::Guard::Runner.new
+      @scope     = { :plugins => [], :groups => [] }
+
+      @watchdirs = [ Dir.pwd ]
+
+      if options[:watchdir]
+        # Ensure we have an array
+        options[:watchdir] = [ options[:watchdir] ] unless options[:watchdir].is_a? Enumerable
+
+        @watchdirs = options[:watchdir].map { |dir| File.expand_path dir }
+      end
+
       ::Guard::UI.clear(:force => true)
       setup_debug
       deprecated_options_warning
@@ -99,19 +106,32 @@ def setup_guards
     #
     def setup_listener
       listener_callback = lambda do |modified, added, removed|
+
+        # Convert to relative paths (respective to the watchdir it came from)
+        @watchdirs.each do |watchdir|
+          [modified, added, removed].each do |paths|
+            paths.map! do |path|
+              if path.start_with? watchdir
+                path.sub "#{watchdir}#{File::SEPARATOR}", ''
+              else
+                path
+              end
+            end
+          end
+        end
         ::Guard::Dsl.reevaluate_guardfile if ::Guard::Watcher.match_guardfile?(modified)
 
         ::Guard.within_preserved_state do
           runner.run_on_changes(modified, added, removed)
         end
       end
 
-      listener_options = { :relative_paths => true }
+      listener_options = {}
       %w[latency force_polling].each do |option|
         listener_options[option.to_sym] = options[option] if options.key?(option)
       end
 
-      @listener = Listen.to(@watchdir, listener_options).change(&listener_callback)
+      @listener = Listen.to(*@watchdirs, listener_options).change(&listener_callback)
     end
 
     # Sets up traps to catch signals used to control Guard.
@@ -190,7 +210,7 @@ def start(options = {})
       within_preserved_state do
         ::Guard::UI.debug 'Guard starts all plugins'
         runner.run(:start)
-        ::Guard::UI.info "Guard is now watching at '#{ @watchdir }'"
+        ::Guard::UI.info "Guard is now watching at '#{ @watchdirs.join "', '" }'"
         listener.start
       end
     end

lib/guard/cli.rb

@@ -48,9 +48,9 @@ class CLI < Thor
                   :banner  => 'Run only the passed plugins'
 
     method_option :watchdir,
-                  :type    => :string,
+                  :type    => :array,
                   :aliases => '-w',
-                  :banner  => 'Specify the directory to watch'
+                  :banner  => 'Specify the directories to watch'
 
     method_option :guardfile,
                   :type    => :string,

spec/guard_spec.rb

@@ -37,9 +37,10 @@
       ::Guard.listener.directories.should eq ['/usr']
     end
 
-    it "changes the current work dir to the watchdir" do
-      Dir.should_receive(:chdir).with('/tmp')
-      ::Guard.setup(:watchdir => '/tmp')
+    it "respect the watchdir option with multiple directories" do
+      ::Guard.setup(:watchdir => ['/usr', '/bin'])
+
+      ::Guard.listener.directories.should eq ['/usr', '/bin']
     end
 
     it "call setup_signal_traps" do
@@ -273,7 +274,7 @@
       before { ::Guard.stub(:options).and_return("latency" => 1.5) }
 
       it "pass option to listener" do
-        Listen.should_receive(:to).with(anything, { :relative_paths => true, :latency => 1.5 }) { listener }
+        Listen.should_receive(:to).with(anything, { :latency => 1.5 }) { listener }
         ::Guard.setup_listener
       end
     end
@@ -282,7 +283,7 @@
       before { ::Guard.stub(:options).and_return("force_polling" => true) }
 
       it "pass option to listener" do
-        Listen.should_receive(:to).with(anything, { :relative_paths => true, :force_polling => true }) { listener }
+        Listen.should_receive(:to).with(anything, { :force_polling => true }) { listener }
         ::Guard.setup_listener
       end
     end
@@ -616,7 +617,7 @@ class Guard::FooBar < Guard::Guard;
     end
 
     it "displays an info message" do
-      ::Guard.instance_variable_set('@watchdir', '/foo/bar')
+      ::Guard.instance_variable_set('@watchdirs', ['/foo/bar'])
       ::Guard::UI.should_receive(:info).with("Guard is now watching at '/foo/bar'")
 
       ::Guard.start