guard 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53af35fa31798f99a8230636673520c16f4c7e72
-  data.tar.gz: 210eae70340553a7bcbd008ae728c936739e2cad
+  metadata.gz: 24dadb9bdcb23445a1551ae1d5717e76f567c757
+  data.tar.gz: 4166e22e0d9637b5044bab05b9fa067c7677f928
 SHA512:
-  metadata.gz: 47b4e5af3573d6a44f428dcd6cfcec942548ff69dcd702ad1f5a752f2b7e921ffddc10a85944912b75907c692f9d130b2ef3d102e12a13f8a670d0880eb3f2b6
-  data.tar.gz: d610139610407063ca8f4533335ccf009d950c40328017cb0f545149955a4659cc529ca9a6f5bbc37d778610cb2da584c8a81892d9052577a44c1b3de8d63f47
+  metadata.gz: bfe00b908e251e96da33060b4dd4754e83a5bc00d2ef42ba6fdbef00f0b24338d43a151858b3c79c908e3333e5c663921cd8b15aa832e39876fc23701f6f030e
+  data.tar.gz: 0619e035846ea334c5a03b2e09c92d4031296f5364bd80340d0a66fd3586265a7ecda601d732b0b1beb49edf58519d427694f9e51ede313ebf319a9bea269816

data/lib/guard/notifiers/tmux.rb

@@ -29,6 +29,8 @@ module Guard
         display_message:        false,
         default_message_format: '%s - %s',
         default_message_color:  'white',
+        display_title:          false,
+        default_title_format:   '%s - %s',
         line_separator:         ' - ',
         change_color:           true,
         color_location:         'status-left-bg'
@@ -97,15 +99,44 @@ module Guard
           color = tmux_color(opts[:type], opts)
 
           color_locations.each do |color_location|
-            _run_client "set #{ color_location } #{ color }"
+            _run_client "set -q #{ color_location } #{ color }"
           end
         end
 
+        type  = opts.delete(:type).to_s
+        title = opts.delete(:title)
+
+        if opts.fetch(:display_title, DEFAULTS[:display_title])
+          display_title(type, title, message, opts)
+        end
+
         if opts.fetch(:display_message, DEFAULTS[:display_message])
-          display_message(opts.delete(:type).to_s, opts.delete(:title), message, opts)
+          display_message(type, title, message, opts)
         end
       end
 
+      # Displays a message in the title bar of the terminal.
+      #
+      # @param [String] title the notification title
+      # @param [String] message the notification message body
+      # @param [Hash] options additional notification library options
+      # @option options [String] success_message_format a string to use as
+      #   formatter for the success message.
+      # @option options [String] failed_message_format a string to use as
+      #   formatter for the failed message.
+      # @option options [String] pending_message_format a string to use as
+      #   formatter for the pending message.
+      # @option options [String] default_message_format a string to use as
+      #   formatter when no format per type is defined.
+      #
+      def display_title(type, title, message, opts = {})
+        title_format   = opts.fetch("#{ type }_title_format".to_sym, opts.fetch(:default_title_format, DEFAULTS[:default_title_format]))
+        teaser_message = message.split("\n").first
+        display_title  = title_format % [title, teaser_message]
+
+        _run_client "set-option -q set-titles-string '#{ display_title }'"
+      end
+
       # Displays a message in the status bar of tmux.
       #
       # @param [String] type the notification type. Either 'success',
@@ -144,9 +175,9 @@ module Guard
         formatted_message = message.split("\n").join(separator)
         display_message = message_format % [title, formatted_message]
 
-        _run_client "set display-time #{ display_time * 1000 }"
-        _run_client "set message-fg #{ message_color }"
-        _run_client "set message-bg #{ color }"
+        _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
 
@@ -176,8 +207,6 @@ module Guard
 
           @options_stored = true
         end
-
-        _run_client 'set quiet on'
       end
 
       # Notification stopping. Restore the previous Tmux state
@@ -188,15 +217,13 @@ module Guard
         if @options_stored
           @options_store.each do |key, value|
             if value
-              _run_client "set #{ key } #{ value }"
+              _run_client "set -q #{ key } #{ value }"
             else
-              _run_client "set -u #{ key }"
+              _run_client "set -q -u #{ key }"
             end
           end
           _reset_options_store
         end
-
-        _run_client 'set quiet off'
       end
 
       def options_store

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-22 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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 description: Guard is a command line tool to easily handle events on file system modifications.
@@ -116,7 +116,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/fsevent_watch_guard
 - bin/guard
 - images/failed.png
 - images/guard.png
@@ -183,18 +182,19 @@ 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.1.8
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications
 test_files: []
+has_rdoc: