terminal-notifier-guard 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847b7fdf031e5f756f6ad1e35108d8b8a4af7b7f
-  data.tar.gz: 8c56f73c99e2decfef7ff9140dbf17b92b4a903d
+  metadata.gz: c457de656a8cec0edd86e15468dc7b7ec6a07293
+  data.tar.gz: 1d368877580f070c2f2035b2e2cb9b5108bf4fee
 SHA512:
-  metadata.gz: 4b8719741b4fe1b9ef0507bfd5831781a8861b165dd3c8b661bc8ef34e5a2bed2419abf7920fb5b3ba2fcd1f446aa9ab1b2d0d5f2261ae0a694dd79c0900cc39
-  data.tar.gz: 53f1fdc187a07af6394e1446562a3f12b8d7fada323db5c709378ab6aae0375bd84ff50f7a537eaac2b83f001bbd1a17375468c8ad5c018e459cd72590ed0a84
+  metadata.gz: 553bb299a08031794fdfc782e8938f37efda65b751e936070029c0ee011911d46d913d0b80a7e7ef6a3b90d66a2294c3f8955ae562090fb8f1dc11d6d0edc6f5
+  data.tar.gz: d9e1d1460d02ee251bdf95080c09002a230b09eb7f0fb9039770a7f8a91e9b1c1f04094b04b0d4ac4c335f0a65c9e189deea4f5152689556b1c6d6aeb985b84f

data/lib/terminal-notifier-guard.rb

@@ -1,18 +1,28 @@
 module TerminalNotifier
   module Guard
-    VERSION = "1.6.2"
-    BIN_PATH = "/usr/local/Cellar/terminal-notifier/1.6.1/terminal-notifier.app/Contents/MacOS/terminal-notifier"
+    VERSION = "1.6.3"
     ICONS_PATH = File.expand_path("../../icons", __FILE__)
-    GUARD_ICON = File.join(ICONS_PATH, 'guard.png')
+    GUARD_ICON = File.join(ICONS_PATH, 'Guard.icns')
 
     def self.osx_version
       Gem::Version.new(`sw_vers -productVersion`.strip)
     end
 
+    def self.terminal_notifier_version
+      return unless installed?
+      Gem::Version.new(`#{bin_path}`.lines.first.match(/\d\.\d\.\d/)[0])
+    rescue
+      Gem::Version.new("0.0.0")
+    end
+
     def self.deprecation_check
       if osx_version <= Gem::Version.new('10.8')
         raise "OSX 10.8 is no longer supported by this gem. Please revert to version <= 1.5.3."
       end
+
+      if terminal_notifier_version < Gem::Version.new('1.6.0')
+        puts "Notice: Your terminal-notifier is older than what terminal-notifier-guard supports, consider upgrading."
+      end
     end
 
     # Returns wether or not the current platform is Mac OS X 10.8, or higher.
@@ -27,14 +37,18 @@ module TerminalNotifier
 
     # Whether or not the terminal notifier is installed
     def self.installed?
-      return true if File.exist? BIN_PATH
+      File.exist? bin_path
+    end
+
+    def self.bin_path
+      @@binary ||= `which terminal-notifier`.chomp
     end
 
     def self.execute(verbose, options)
       if available? && installed?
-        options.merge!({ :appIcon => GUARD_ICON, :contentImage => icon(options.delete(:type)) })
+        options.merge!({ :contentImage=> GUARD_ICON, :appIcon => icon(options.delete(:type)) })
 
-        command = [BIN_PATH, *options.map { |k,v| ["-#{k}", v.to_s] }.flatten]
+        command = [bin_path, *options.map { |k,v| ["-#{k}", v.to_s] }.flatten]
         if RUBY_VERSION < '1.9'
           require 'shellwords'
           command = Shellwords.shelljoin(command)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal-notifier-guard
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Eloy Duran
@@ -77,10 +77,10 @@ extra_rdoc_files:
 files:
 - README.markdown
 - icons/Failed.icns
+- icons/Guard.icns
 - icons/Notify.icns
 - icons/Pending.icns
 - icons/Success.icns
-- icons/guard.png
 - lib/terminal-notifier-guard.rb
 homepage: https://github.com/Springest/terminal-notifier-guard
 licenses: []