guard 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba8f46c161c351e6bea4e1e081dbdf03f3fb5d69
-  data.tar.gz: 72f8a3b0ebff20f11ca2965ac0048c60944c0e4b
+  metadata.gz: d8fb762e56c86e00c5fd53652c39889555015b3b
+  data.tar.gz: d812a81ec1891b959909135b2e4f4f62d83139cc
 SHA512:
-  metadata.gz: 20a022bdd9430729254a79114ce133948a683a20b7612784d86b943be1529e6840b0837dfe2a911fd387fb518b9ce1bf064bf6d38bfe5b1f0d6ca72dd9cda7fd
-  data.tar.gz: bbc15b8533dc34a8ddf931699159e4b922c767b28e86b38461e3b57c8f929d6504dcefba2e368a2187e58d0f7cbe8851bf367dff85f558d89511dfe171cf71ba
+  metadata.gz: 7451a09fc44f143356690ede3f094d1a5d6b0d46d0ed74958b21d9422f87ba6950b408f5c98122c0afac8080cfc28e9d7eff5c68c651aa896a1eade79b3a496b
+  data.tar.gz: 3d233757055d728a941375914c2070175490ea6759f23606955bb7b24783f8f5d768ba641cbd73f3aae77080c87961f3faa2c1d75348e739e94929219090ca47

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 ## Master
 
-No changes.
+No changes yet.
+
+## 1.8.2 - 30 July, 2013
+
+### Bug fix
+
+- [#443][] Escape `notify-send` arguments.  ([@netzpirat][])
+
+### Improvements
+
+- [#460][], [#463][] Better Windows support. ([@cablegram][])
+- [#450][] Allow multiple watch directories.  ([@timmfin][])
 
 ## 1.8.1 - 17 June, 2013
 
@@ -776,7 +787,10 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [#414]: https://github.com/guard/guard/issues/414
 [#416]: https://github.com/guard/guard/issues/416
 [#443]: https://github.com/guard/guard/issues/443
+[#450]: https://github.com/guard/guard/issues/450
 [#453]: https://github.com/guard/guard/issues/453
+[#460]: https://github.com/guard/guard/issues/460
+[#463]: https://github.com/guard/guard/issues/463
 [@Gazer]: https://github.com/Gazer
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@Nerian]: https://github.com/Nerian
@@ -860,6 +874,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [@tarsolya]: https://github.com/tarsolya
 [@thibaudgg]: https://github.com/thibaudgg
 [@thierryhenrio]: https://github.com/thierryhenrio
+[@timmfin]: https://github.com/timmfin
 [@tinogomes]: https://github.com/tinogomes
 [@tomas-zemres]: https://github.com/tomas-zemres
 [@tpope]: https://github.com/tpope

data/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
 ```
 

data/lib/guard.rb

@@ -38,20 +38,25 @@ module Guard
     # @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
+        @watchdirs = Array(options[:watchdir]).map { |dir| File.expand_path dir }
+      end
+
       ::Guard::UI.clear(:force => true)
       setup_debug
       deprecated_options_warning
@@ -99,6 +104,19 @@ module Guard
     #
     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
@@ -106,12 +124,13 @@ module Guard
         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)
+      listen_args = @watchdirs + [listener_options]
+      @listener = Listen.to(*listen_args).change(&listener_callback)
     end
 
     # Sets up traps to catch signals used to control Guard.
@@ -190,7 +209,7 @@ module Guard
       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

data/lib/guard/cli.rb

@@ -48,9 +48,9 @@ module Guard
                   :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,

data/lib/guard/interactor.rb

@@ -89,6 +89,7 @@ module Guard
       Pry.config.should_load_local_rc = false
       Pry.config.history.file         = File.expand_path(self.class.options[:history_file] || HISTORY_FILE)
 
+      @stty_exists = nil
       add_hooks
 
       replace_reset_command
@@ -120,7 +121,7 @@ module Guard
 
       if stty_exists?
         Pry.config.hooks.add_hook :after_eval, :restore_visibility do
-          system('stty echo 2>/dev/null')
+          system("stty echo 2>#{ DEV_NULL }")
         end
       end
     end
@@ -240,7 +241,7 @@ module Guard
 
       store_terminal_settings if stty_exists?
 
-      if !@thread || !@thread.alive?
+      if !@thread || !['sleep', 'run'].include?(@thread.status)
         ::Guard::UI.debug 'Start interactor'
 
         @thread = Thread.new do
@@ -270,7 +271,8 @@ module Guard
     # @return [Boolean] the status of stty
     #
     def stty_exists?
-      @stty_exists ||= system('hash', 'stty')
+      @stty_exists ||= system('hash', 'stty') ? true : false if @stty_exists.nil?
+      @stty_exists
     end
 
     # Stores the terminal settings so we can resore them

data/lib/guard/notifier.rb

@@ -104,7 +104,7 @@ module Guard
         ENV['GUARD_NOTIFY'] = 'false'
       else
         notifications.each do |notification|
-          ::Guard::UI.info "Guard uses #{ get_notifier_module(notification[:name]).to_s.split('::').last } to send notifications."
+          ::Guard::UI.info "Guard is using #{ get_notifier_module(notification[:name]).to_s.split('::').last } to send notifications."
           notifier = get_notifier_module(notification[:name])
           notifier.turn_on(notification[:options]) if notifier.respond_to?(:turn_on)
         end

data/lib/guard/notifiers/tmux.rb

@@ -164,7 +164,7 @@ module Guard
       private
 
       def system(args)
-        args += " >/dev/null 2>&1" if ENV['GUARD_ENV'] == 'test'
+        args += " >#{ DEV_NULL } 2>&1" if ENV['GUARD_ENV'] == 'test'
         super
       end
 

data/lib/guard/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -98,16 +98,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me
@@ -161,7 +161,8 @@ files:
 - man/guard.1.html
 - README.md
 homepage: http://guardgem.org
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []