Added a nice Guard icon.

mattbeedle · Oct 23, 2014 · f9d8c62 · f9d8c62
1 parent c44d970
commit f9d8c62
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/icons/guard.png b/icons/guard.png
diff --git a/lib/terminal-notifier-guard.rb b/lib/terminal-notifier-guard.rb
@@ -3,6 +3,7 @@ module Guard
     VERSION = "1.6.1"
     BIN_PATH = "/usr/local/Cellar/terminal-notifier/1.6.1/terminal-notifier.app/Contents/MacOS/terminal-notifier"
     ICONS_PATH = File.expand_path("../../icons", __FILE__)
+    GUARD_ICON = File.join(ICONS_PATH, 'guard.png')
 
     # Returns wether or not the current platform is Mac OS X 10.8, or higher.
     def self.available?
@@ -20,7 +21,7 @@ def self.installed?
 
     def self.execute(verbose, options)
       if available? && installed?
-        options.merge!({ :appIcon => icon(options.delete(:type)) })
+        options.merge!({ :appIcon => GUARD_ICON, :contentImage => icon(options.delete(:type)) })
 
         command = [BIN_PATH, *options.map { |k,v| ["-#{k}", v.to_s] }.flatten]
         if RUBY_VERSION < '1.9'

diff --git a/spec/terminal-notifier-guard_spec.rb b/spec/terminal-notifier-guard_spec.rb
@@ -11,7 +11,7 @@
 describe "TerminalNotifier::Guard" do
   describe ".execute" do
     it "executes the tool with the given options" do
-      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard.icon]
+      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard::GUARD_ICON, '-contentImage', TerminalNotifier::Guard.icon]
       if RUBY_VERSION < '1.9'
         require 'shellwords'
         command = Shellwords.shelljoin(command)
@@ -21,7 +21,7 @@
     end
 
     it "executes with the right icon path according to the type option" do
-      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard.icon(:success)]
+      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard::GUARD_ICON, '-contentImage', TerminalNotifier::Guard.icon(:success)]
       if RUBY_VERSION < '1.9'
         require 'shellwords'
         command = Shellwords.shelljoin(command)
@@ -87,7 +87,7 @@
 
   describe ".failed" do
     it "executes with the 'failed' icon flag" do
-      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard.icon(:failed)]
+      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard::GUARD_ICON, '-contentImage', TerminalNotifier::Guard.icon(:failed)]
       if RUBY_VERSION < '1.9'
         require 'shellwords'
         command = Shellwords.shelljoin(command)
@@ -99,7 +99,7 @@
 
   describe ".success" do
     it "executes with the 'success' icon flag" do
-      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard.icon(:success)]
+      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard::GUARD_ICON, '-contentImage', TerminalNotifier::Guard.icon(:success)]
       if RUBY_VERSION < '1.9'
         require 'shellwords'
         command = Shellwords.shelljoin(command)
@@ -111,7 +111,7 @@
 
   describe ".pending" do
     it "executes with the 'pending' icon flag" do
-      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard.icon(:pending)]
+      command = [TerminalNotifier::Guard::BIN_PATH, '-message', 'ZOMG', '-appIcon', TerminalNotifier::Guard::GUARD_ICON, '-contentImage', TerminalNotifier::Guard.icon(:pending)]
       if RUBY_VERSION < '1.9'
         require 'shellwords'
         command = Shellwords.shelljoin(command)