guard 2.2.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5c095e15ffd825f5b44a76fccc7876c3720c17
-  data.tar.gz: 17adc2900e6ba19bd56b266c45d8ab36a11ef9c1
+  metadata.gz: 9a9c7c3c069655878f11c259de0b8f30c0e97914
+  data.tar.gz: df85000a6061c14ba2df3231d5ce2297a39c61b5
 SHA512:
-  metadata.gz: 3ebe13bbb141439cec3005cca533ab37c6b4d8352ea680cc432ecc32808796f057039870c7cba7848a2bcbdc8f87713a230cf11f9b91614eaee7ebe92e6a2c89
-  data.tar.gz: fb246be778aadad200aa3ca328c35c542aef5c639cd249a58eef920bd50c0358645c5ff30b97aa64a8cfd7de4ac5b0ec52b39a3f544a246c6c3beed22a7e3341
+  metadata.gz: 3a16582451f68776b47e8d71740858f2d5135ae33e5d3e507204719a86a668f97c0488ba7b7bccd4de555070e7020ca52ca3eaa45f589003a05f4a036b74c97a
+  data.tar.gz: 2abaeda0d2a2387ce3da9ea64f1080c32226f59a3d82bb10f7c4990a67a9f1f375e1efaed76b19d9e9b29933e9c1910704549cf2df7cc2ea3f7afb850c7abb7c

data/README.md

@@ -197,12 +197,12 @@ $ bundle exec guard -g group_name another_group_name # shortcut
 
 See the Guardfile DSL below for creating groups.
 
-#### `-P`/`--plugins` option
+#### `-P`/`--plugin` option
 
 Scope Guard to certain plugins on start:
 
 ```bash
-$ bundle exec guard --plugins plugin_name another_plugin_name
+$ bundle exec guard --plugin plugin_name another_plugin_name
 $ bundle exec guard -P plugin_name another_plugin_name # shortcut
 ```
 
@@ -253,6 +253,10 @@ $ bundle exec guard start -B
 $ bundle exec guard start --no-bundler-warning
 ```
 
+#### `--show-deprecations`
+
+Turn on deprecation warnings.
+
 #### `-l`/`--latency` option
 
 Overwrite Listen's default latency, useful when your hard-drive / system is slow.
@@ -271,6 +275,15 @@ $ bundle exec guard start -p
 $ bundle exec guard start --force-polling
 ```
 
+#### `-y`/`--wait-for-delay` option
+
+Overwrite Listen's default wait_for_delay, useful for kate-like editors through ssh access.
+
+```bash
+$ bundle exec guard start -y 1
+$ bundle exec guard start --wait-for-delay 1
+```
+
 ### List
 
 You can list the available plugins with the `list` task:

data/lib/guard/cli.rb

@@ -86,6 +86,11 @@ module Guard
                   aliases: '-p',
                   banner:  'Force usage of the Listen polling listener'
 
+    method_option :wait_for_delay,
+                  type:    :numeric,
+                  aliases: '-y',
+                  banner:  'Overwrite Listen\'s default wait_for_delay'
+
     # Start Guard by initializing the defined Guard plugins and watch the file system.
     # This is the default task, so calling `guard` is the same as calling `guard start`.
     #

data/lib/guard/guardfile/generator.rb

@@ -17,7 +17,12 @@ module Guard
       GUARDFILE_TEMPLATE = File.expand_path('../../../guard/templates/Guardfile', __FILE__)
 
       # The location of user defined templates
-      HOME_TEMPLATES = File.expand_path('~/.guard/templates')
+      begin
+        HOME_TEMPLATES = File.expand_path('~/.guard/templates')
+      rescue ArgumentError => e
+        # home isn't defined.  Set to the root of the drive.  Trust that there won't be user defined templates there
+        HOME_TEMPLATES = File.expand_path('/')
+      end
 
       # Initialize a new `Guard::Guardfile::Generator` object.
       #

data/lib/guard/notifiers/terminal_notifier.rb

@@ -18,8 +18,11 @@ module Guard
     # @example Add the `:terminal_notifier` notifier to your `Guardfile`
     #   notification :terminal_notifier
     #
-    # @example Add the `:terminal_notifier` notifier with configuration options to your `Guardfile`
-    #   notification :terminal_notifier, app_name: "MyApp"
+    # @example Display application name as subtitle
+    #   notification :terminal_notifier, subtitle: “MyApp"
+    #
+    # @example Use iTerm2 for notifications
+    #   notification :terminal_notifier, activate: "com.googlecode.iterm2"
     #
     class TerminalNotifier < Base
 

data/lib/guard/notifiers/tmux.rb

@@ -29,6 +29,7 @@ module Guard
         display_message:        false,
         default_message_format: '%s - %s',
         default_message_color:  'white',
+        display_on_all_clients: false,
         display_title:          false,
         default_title_format:   '%s - %s',
         line_separator:         ' - ',
@@ -89,6 +90,8 @@ module Guard
       #   color notification
       # @option opts [Boolean] display_message whether to display a message
       #   or not
+      # @option opts [Boolean] display_on_all_clients whether to display a
+      #   message on all tmux clients or not
       #
       def notify(message, opts = {})
         super
@@ -99,7 +102,7 @@ module Guard
           color = tmux_color(opts[:type], opts)
 
           color_locations.each do |color_location|
-            _run_client "set -q #{ color_location } #{ color }"
+            _run_client "set","-q #{ color_location } #{ color }"
           end
         end
 
@@ -135,9 +138,9 @@ module Guard
         display_title  = title_format % [title, teaser_message]
 
         if _tmux_version >= 1.7
-          _run_client "set-option -q set-titles-string '#{ display_title }'"
+          _run_client "set-option", "-q set-titles-string '#{ display_title }'"
         else
-          _run_client "set-option set-titles-string '#{ display_title }'"
+          _run_client "set-option", "set-titles-string '#{ display_title }'"
         end
       end
 
@@ -179,11 +182,11 @@ module Guard
         formatted_message = message.split("\n").join(separator)
         display_message = message_format % [title, formatted_message]
 
-        _run_client "set -q display-time #{ display_time * 1000 }"
-        _run_client "set -q message-fg #{ message_color }"
-        _run_client "set -q message-bg #{ color }"
-        _run_client "display-message '#{ display_message }'"
-      end
+        _run_client "set", "-q display-time #{ display_time * 1000 }"
+        _run_client "set", "-q message-fg #{ message_color }"
+        _run_client "set", "-q message-bg #{ color }"
+        _run_client "display-message", "'#{ display_message }'"
+     end
 
       # Get the Tmux color for the notification type.
       # You can configure your own color by overwriting the defaults.
@@ -204,11 +207,13 @@ module Guard
       def turn_on
         unless @options_stored
           _reset_options_store
-          `#{ DEFAULTS[:client] } show`.each_line do |line|
-            option, _, setting = line.chomp.partition(' ')
-            options_store[option] = setting
+          _clients.each do |client|
+            options_store[client] ||= {}
+            `#{ DEFAULTS[:client] } show -t #{ client }`.each_line do |line|
+              option, _, setting = line.chomp.partition(' ')
+              @options_store[client][option] = setting
+            end
           end
-
           @options_stored = true
         end
       end
@@ -219,11 +224,13 @@ module Guard
       #
       def turn_off
         if @options_stored
-          @options_store.each do |key, value|
-            if value
-              _run_client "set -q #{ key } #{ value }"
-            else
-              _run_client "set -q -u #{ key }"
+          @options_store.each do |client, options|
+            options.each do |key, value|
+              if value
+                `#{ DEFAULTS[:client] } set -t #{ client } -q #{ key } #{ value }`
+              else
+                `#{ DEFAULTS[:client] } set -t #{ client } -q -u #{ key }`
+              end
             end
           end
           _reset_options_store
@@ -241,23 +248,51 @@ module Guard
         super
       end
 
-      def _run_client(args)
-        system("#{ DEFAULTS[:client] } #{args}")
+      def _clients
+        %x( #{DEFAULTS[:client]} list-clients -F '\#{client_tty}').split(/\n/);
+      end
+
+      def _run_client(cmd, args)
+        if @options.fetch(:display_on_all_clients, DEFAULTS[:display_on_all_clients])
+          _clients.each do |client|
+            system("#{ DEFAULTS[:client] } #{ cmd } #{ _client_cmd_flag(cmd) } #{ client.strip } #{ args }")
+          end
+        else
+          system("#{ DEFAULTS[:client] } #{ cmd } #{ args }")
+        end
+      end
+
+      def _client_cmd_flag(cmd)
+        case cmd
+          when 'set', 'set-option' then '-t'
+          when 'display-message' then '-c'
+        end
       end
 
       # Reset the internal Tmux options store defaults.
       #
       def _reset_options_store
         @options_stored = false
-        @options_store = {
-          'status-left-bg'  => nil,
-          'status-right-bg' => nil,
-          'status-left-fg'  => nil,
-          'status-right-fg' => nil,
-          'message-bg'      => nil,
-          'message-fg'      => nil,
-          'display-time'    => nil
-        }
+        @options_store = {}
+        _clients.each do | client |
+          @options_store[client] = {
+            'status-left-bg'  => nil,
+            'status-right-bg' => nil,
+            'status-left-fg'  => nil,
+            'status-right-fg' => nil,
+            'message-bg'      => nil,
+            'message-fg'      => nil,
+            'display-time'    => nil
+          }
+        end
+      end
+
+      # Remove clients which no longer exist from options store
+      #
+      def _remove_old_clients
+        (options_store.keys - _clients).each do | old_client |
+          options_store.delete old_client
+        end
       end
 
       def _tmux_version

data/lib/guard/setuper.rb

@@ -18,7 +18,8 @@ module Guard
       no_bundler_warning: false,
       show_deprecations: false,
       latency: nil,
-      force_polling: false
+      force_polling: false,
+      wait_for_delay: nil
     }
     DEFAULT_GROUPS = [:default]
 
@@ -191,7 +192,7 @@ module Guard
       end
 
       listener_options = {}
-      [:latency, :force_polling].each do |option|
+      [:latency, :force_polling, :wait_for_delay].each do |option|
         listener_options[option] = options[option] if options[option]
       end
 

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = '2.2.5'
+  VERSION = '2.3.0'
 end

data/man/guard.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GUARD" "1" "September 2013" "" ""
+.TH "GUARD" "1" "January 2014" "" ""
 .
 .SH "NAME"
 \fBguard\fR \- Guard keeps an eye on your file modifications\.
@@ -27,15 +27,15 @@ The following options are available:
 \fB\-n\fR, \fB\-\-notify\fR \fIFLAG\fR Disable notifications (Growl or Libnotify depending on your system)\. Notifications can be disabled globally by setting a GUARD_NOTIFY environment variable to false\. FLAG can be \fBtrue\fR/\fBfalse\fR or \fBt\fR/\fBf\fR\.
 .
 .P
-\fB\-d\fR, \fB\-\-debug\fR Runs Guard in debug mode\.
-.
-.P
 \fB\-g\fR, \fB\-\-group\fR \fIGROUP1\fR \fIGROUP2\fR\.\.\. Scopes the Guard actions to the groups specified by GROUP1, GROUP2, etc\. Group names should be separated by spaces\. Plugins that don\'t belong to a group are considered global and are always run\.
 .
 .P
 \fB\-P\fR, \fB\-\-plugin\fR \fIPLUGIN1\fR \fIPLUGIN2\fR\.\.\. Scopes the Guard actions to the plugins specified by PLUGIN1, PLUGIN2, etc\. Plugin names should be separated by spaces\.
 .
 .P
+\fB\-d\fR, \fB\-\-debug\fR Runs Guard in debug mode\.
+.
+.P
 \fB\-w\fR, \fB\-\-watchdir\fR \fIPATH\fR Tells Guard to watch PATH instead of \fB\./\fR\.
 .
 .P
@@ -56,6 +56,9 @@ The following options are available:
 .P
 \fB\-p\fR, \fB\-\-force\-polling\fR Force usage of the Listen polling listener\.
 .
+.P
+\fB\-y\fR, \fB\-\-wait\-for\-delay\fR Overwrite Listen\'s default \fBwait_for_delay\fR, useful for kate\-like editors through ssh access\.
+.
 .SS "init [GUARDS]"
 If no Guardfile is present in the current directory, creates an empty Guardfile\.
 .

data/man/guard.1.html

@@ -98,9 +98,6 @@
   Notifications can be disabled globally by setting a GUARD_NOTIFY environment variable to false.
   FLAG can be <code>true</code>/<code>false</code> or <code>t</code>/<code>f</code>.</p>
 
-<p><code>-d</code>, <code>--debug</code>
-  Runs Guard in debug mode.</p>
-
 <p><code>-g</code>, <code>--group</code> <var>GROUP1</var> <var>GROUP2</var>...
   Scopes the Guard actions to the groups specified by GROUP1, GROUP2, etc.
   Group names should be separated by spaces.
@@ -110,6 +107,9 @@
   Scopes the Guard actions to the plugins specified by PLUGIN1, PLUGIN2, etc.
   Plugin names should be separated by spaces.</p>
 
+<p><code>-d</code>, <code>--debug</code>
+  Runs Guard in debug mode.</p>
+
 <p><code>-w</code>, <code>--watchdir</code> <var>PATH</var>
   Tells Guard to watch PATH instead of <code>./</code>.</p>
 
@@ -131,6 +131,9 @@
 <p><code>-p</code>, <code>--force-polling</code>
   Force usage of the Listen polling listener.</p>
 
+<p><code>-y</code>, <code>--wait-for-delay</code>
+  Overwrite Listen's default <code>wait_for_delay</code>, useful for kate-like editors through ssh access.</p>
+
 <h3 id="init-GUARDS-">init [GUARDS]</h3>
 
 <p>If no Guardfile is present in the current directory, creates an empty Guardfile.</p>
@@ -187,7 +190,7 @@ https://github.com/guard/guard/contributors</p>
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>September 2013</li>
+    <li class='tc'>January 2014</li>
     <li class='tr'>guard(1)</li>
   </ol>
 

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.3.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: lumberjack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.0.0.beta1
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me
@@ -116,12 +116,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
 - bin/fsevent_watch_guard
 - bin/guard
 - images/failed.png
 - images/guard.png
 - images/pending.png
 - images/success.png
+- lib/guard.rb
 - lib/guard/cli.rb
 - lib/guard/commander.rb
 - lib/guard/commands/all.rb
@@ -137,9 +141,9 @@ files:
 - lib/guard/dsl_describer.rb
 - lib/guard/group.rb
 - lib/guard/guard.rb
+- lib/guard/guardfile.rb
 - lib/guard/guardfile/evaluator.rb
 - lib/guard/guardfile/generator.rb
-- lib/guard/guardfile.rb
 - lib/guard/interactor.rb
 - lib/guard/notifier.rb
 - lib/guard/notifiers/base.rb
@@ -155,24 +159,20 @@ files:
 - lib/guard/notifiers/terminal_title.rb
 - lib/guard/notifiers/tmux.rb
 - lib/guard/options.rb
+- lib/guard/plugin.rb
 - lib/guard/plugin/base.rb
 - lib/guard/plugin/hooker.rb
-- lib/guard/plugin.rb
 - lib/guard/plugin_util.rb
 - lib/guard/rake_task.rb
 - lib/guard/runner.rb
 - lib/guard/setuper.rb
 - lib/guard/templates/Guardfile
-- lib/guard/ui/colors.rb
 - lib/guard/ui.rb
+- lib/guard/ui/colors.rb
 - lib/guard/version.rb
 - lib/guard/watcher.rb
-- lib/guard.rb
-- CHANGELOG.md
-- LICENSE
 - man/guard.1
 - man/guard.1.html
-- README.md
 homepage: http://guardgem.org
 licenses:
 - MIT
@@ -183,17 +183,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications