guard 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5f98e7ee3f48051531b01f09d182aa98f4e72a5
-  data.tar.gz: 6b6ea9cc3d917469c588049826d81113c22deb43
+  metadata.gz: 2904fe4ebe6903b8c0c69b0c9b6fd419041552fe
+  data.tar.gz: bdf69fc777ed5a8ebdc63822d3013d04663cc913
 SHA512:
-  metadata.gz: 473962947d938558ee966d8215d77cb76c2de65255e81baba1f90bbcc71654d9c0ed5aa25366c125fe4bce6fe05ece34be44e75b010c7c041aeadab3871207fe
-  data.tar.gz: 1a2566513ff891bf79d29f406aea3f7e16dd940c54d1af607629e9e6070e7183f8379ba6dafedc5dcc98edd34e1b48b7154437f7deb3a136e23a0826be744fa6
+  metadata.gz: 348997dc9b494a611354c55a179187d052331d7538b22ec9b76093e5a56c1d03a216fd048cee7508636804a296251f260aef218c951aee73f5fe3788ce692050
+  data.tar.gz: 75e6bb26d53e19d4cfe24561e465be64de99e4a49c7254cf0f37a6ebd1368221ba1e5cd5dbaf1e2e02aaff7f667438e0422193b2541ed1ed3c4ea01e57919cc9

data/lib/guard/dsl_describer.rb

@@ -90,7 +90,7 @@ module Guard
         name      = definition[0]
         clazz     = definition[1]
         available = clazz.available?(silent: true) ? '✔' : '✘'
-        notifier  = ::Guard::Notifier.notifiers.find{ |n| n[:name] == name }
+        notifier  = ::Guard::Notifier.notifiers.find { |n| n[:name] == name }
         used      = notifier ? '✔' : '✘'
         options   = notifier ? notifier[:options] : {}
         defaults  = clazz.const_defined?(:DEFAULTS) ? clazz.const_get(:DEFAULTS) : {}

data/lib/guard/notifiers/base.rb

@@ -43,21 +43,20 @@ module Guard
       # @return [Boolean] the availability status
       #
       def self.available?(opts = {})
-        options = { silent: false }.merge(opts)
-
         unless _supported_host?
           hosts = supported_hosts.map { |host| HOSTS[host.to_sym] }.join(', ')
-          ::Guard::UI.error "The :#{name} notifier runs only on #{hosts}." unless options[:silent]
+          ::Guard::UI.error "The :#{name} notifier runs only on #{hosts}." unless opts.fetch(:silent) { false }
           return false
         end
 
         true
       end
 
-      # This method must be implemented.
+      # This method must be overriden.
       #
       def notify(message, opts = {})
-        raise NotImplementedError
+        opts.replace(options.merge(opts))
+        normalize_standard_options!(opts)
       end
 
       # Returns the title of the notifier.

data/lib/guard/notifiers/emacs.rb

@@ -47,7 +47,7 @@ module Guard
       #   (default is 0)
       #
       def notify(message, opts = {})
-        normalize_standard_options!(opts)
+        super
 
         opts      = DEFAULTS.merge(opts)
         color     = emacs_color(opts[:type], opts)

data/lib/guard/notifiers/file_notifier.rb

@@ -36,7 +36,7 @@ module Guard
       # @option opts [String] path the path of where to write the file
       #
       def notify(message, opts = {})
-        normalize_standard_options!(opts)
+        super
 
         if opts[:path]
           format = opts.fetch(:format, DEFAULTS[:format])

data/lib/guard/notifiers/gntp.rb

@@ -69,8 +69,8 @@ module Guard
       # @option opts [Boolean] sticky make the notification sticky
       #
       def notify(message, opts = {})
+        super
         self.class.require_gem_safely
-        normalize_standard_options!(opts)
 
         opts = DEFAULTS.merge(
           name: opts.delete(:type).to_s,

data/lib/guard/notifiers/growl.rb

@@ -71,9 +71,9 @@ module Guard
       #   notifications
       #
       def notify(message, opts = {})
-        self.class.require_gem_safely
-        normalize_standard_options!(opts)
+        super
         opts.delete(:type)
+        self.class.require_gem_safely
 
         opts = DEFAULTS.merge(opts).merge(name: 'Guard')
 

data/lib/guard/notifiers/growl_notify.rb

@@ -49,8 +49,8 @@ module Guard
       #   low) to 2 (emergency)
       #
       def notify(message, opts = {})
+        super
         self.class.require_gem_safely
-        normalize_standard_options!(opts)
 
         opts = DEFAULTS.merge(
           application_name: 'Guard',

data/lib/guard/notifiers/libnotify.rb

@@ -54,8 +54,8 @@ module Guard
       #   (1.5 (s), 1000 (ms), false)
       #
       def notify(message, opts = {})
+        super
         self.class.require_gem_safely
-        normalize_standard_options!(opts)
 
         opts = DEFAULTS.merge(
           summary:   opts.delete(:title),

data/lib/guard/notifiers/notifysend.rb

@@ -42,7 +42,7 @@ module Guard
       #   3000)
       #
       def notify(message, opts = {})
-        normalize_standard_options!(opts)
+        super
 
         command = [title, message]
         opts = DEFAULTS.merge(

data/lib/guard/notifiers/rb_notifu.rb

@@ -67,8 +67,8 @@ module Guard
       #   IUserNotification2 is available
       #
       def notify(message, opts = {})
+        super
         self.class.require_gem_safely
-        normalize_standard_options!(opts)
 
         opts = DEFAULTS.merge(
           type:    _notifu_type(opts.delete(:type)),

data/lib/guard/notifiers/terminal_notifier.rb

@@ -50,9 +50,9 @@ module Guard
       # @option opts [String] open some url or file
       #
       def notify(message, opts = {})
+        title = opts[:title] || options[:title]
+        super
         self.class.require_gem_safely
-        title = opts[:title]
-        normalize_standard_options!(opts)
 
         opts.delete(:image)
         opts[:title] = title || [opts.delete(:app_name) { 'Guard' }, opts[:type].downcase.capitalize].join(' ')

data/lib/guard/notifiers/terminal_title.rb

@@ -16,7 +16,7 @@ module Guard
       # @option opts [String] title the notification title
       #
       def notify(message, opts = {})
-        normalize_standard_options!(opts)
+        super
 
         first_line = message.sub(/^\n/, '').sub(/\n.*/m, '')
 

data/lib/guard/notifiers/tmux.rb

@@ -30,6 +30,7 @@ module Guard
         default_message_format: '%s - %s',
         default_message_color:  'white',
         line_separator:         ' - ',
+        change_color:           true,
         color_location:         'status-left-bg'
       }
 
@@ -52,8 +53,10 @@ module Guard
       # use of a color based notification, changing the background color of the
       # `color_location` to the color defined in either the `success`,
       # `failed`, `pending` or `default`, depending on the notification type.
-      # If you also want display a text message, you have to enable it explicit
-      # by setting `display_message` to `true`.
+      #
+      # You may enable an extra explicit message by setting `display_message`
+      # to true, and may further disable the colorization by setting
+      # `change_color` to false.
       #
       # @param [String] title the notification title
       # @param [Hash] opts additional notification library options
@@ -61,19 +64,23 @@ module Guard
       #   'pending', 'failed' or 'notify'
       # @option opts [String] message the notification message body
       # @option opts [String] image the path to the notification image
+      # @option opts [Boolean] change_color whether to show a color
+      #   notification
       # @option opts [String] color_location the location where to draw the
       #   color notification
       # @option opts [Boolean] display_message whether to display a message
       #   or not
       #
       def notify(message, opts = {})
-        normalize_standard_options!(opts)
+        super
         opts.delete(:image)
 
-        color_location = opts.fetch(:color_location, DEFAULTS[:color_location])
-        color = tmux_color(opts[:type], opts)
+        if opts.fetch(:change_color, DEFAULTS[:change_color])
+          color_location = opts.fetch(:color_location, DEFAULTS[:color_location])
+          color = tmux_color(opts[:type], opts)
 
-        _run_client "set #{ color_location } #{ color }"
+          _run_client "set #{ color_location } #{ color }"
+        end
 
         if opts.fetch(:display_message, DEFAULTS[:display_message])
           display_message(opts.delete(:type).to_s, opts.delete(:title), message, opts)

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil