terminal-notifier-guard 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8cef1ebe06e3689a8a28f0e9b1d1961f8a55043
-  data.tar.gz: 4fd5e78f3d7e0b3a36873f24a9cdb97f3d65fa47
+  metadata.gz: 8ae13fa13ff54e5b948035e9c41e0fd5b5bda057
+  data.tar.gz: f5dbeb151daa73937ad14d38ddbeab8b1b5c9fa2
 SHA512:
-  metadata.gz: 9501b1a9843391d89f89a49ac5ae56124d88e45f74b364d9c37f9ead3b124d6b6688e9bb74dc8e157c98bc2093e7b06603004359f3e0cf799214af9f42d1e53f
-  data.tar.gz: 33e42c534864e955825030f855674e31aefcc0425ba29e607415eeed708ecfcc2d396ed99be25e9b7c7068e3793c4132b16bbd324ef3e46a4255b9d451acfdf3
+  metadata.gz: 553858a9ab227318be15aac89fc178b030dfd10a651a1f0776f49d2d042abb4605c82879746242e445b88a503f80e653d79d052b5c8746f8d6d261e2d5a995f2
+  data.tar.gz: ce7341119a38f58b9e8f10e2f0c3f0021799ad5218acc8b8683a09886aa99bab2948c4034f91af190edf9c1cbfdf4d8ce4a59a0dce5250b737ca4c650c9ab0b9

data/README.markdown

@@ -4,7 +4,7 @@ A simple Ruby wrapper around the [`terminal-notifier`][HOMEPAGE] command-line
 tool, which allows you to send User Notifications to the Notification Center on
 Mac OS X 10.8, or higher.
 
-This version has 4 different `terminal-notifiers` included for each status that
+This version has 4 different icons included for each status that
 [Guard][GUARD] supports:
 
  1. Failed
@@ -12,8 +12,6 @@ This version has 4 different `terminal-notifiers` included for each status that
  3. Pending
  4. Success
 
-And each one with their own icon representing it's status.
-
 
 ## Installation
 
@@ -21,10 +19,15 @@ And each one with their own icon representing it's status.
 $ gem install terminal-notifier-guard
 ```
 
+### OSX 10.8 users
+
+As of version `1.6.1`, we no longer bundle notifiers binaries in this gem. Please revert to
+version `1.5.3` for OSX 10.8 support.
+
 
 ## Usage
 
-For full information on all the options, see the tool’s [README][README].
+You could also use the notifier directly.
 
 Examples are:
 
@@ -55,5 +58,11 @@ See [LICENSE][LICENSE] for details.
 
 [HOMEPAGE]: https://github.com/Springest/terminal-notifier-guard
 [GUARD]: https://github.com/guard/guard
-[README]: https://github.com/Springest/terminal-notifier-guard/blob/master/README.markdown
 [LICENSE]: https://github.com/Springest/terminal-notifier-guard/blob/master/Ruby/LICENSE
+
+
+## Contributors & Thanks to
+
+- @alloy (For the terminal-notifier)
+- @railsme (For a clean way to test for OSX version #15)
+- @jamilbx (For support for local terminal-notifier command #8)

data/lib/terminal-notifier-guard.rb

@@ -1,38 +1,40 @@
-%w(failed notify pending success).each do |type|
-  require File.expand_path("../terminal_notifier/guard/#{type}", __FILE__)
-end
-
 module TerminalNotifier
   module Guard
-    include TerminalNotifier::Guard::Notify
-    include TerminalNotifier::Guard::Success
-    include TerminalNotifier::Guard::Failed
-    include TerminalNotifier::Guard::Pending
+    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')
+
+    def self.osx_version
+      Gem::Version.new(`sw_vers -productVersion`.strip)
+    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
+    end
 
     # Returns wether or not the current platform is Mac OS X 10.8, or higher.
     def self.available?
+      deprecation_check
       if @available.nil?
         @available = `uname`.strip == 'Darwin' &&
-          Gem::Version.new(`sw_vers -productVersion`.strip) >= Gem::Version.new('10.8')
+          osx_version >= Gem::Version.new('10.9')
       end
       @available
     end
 
+    # Whether or not the terminal notifier is installed
+    def self.installed?
+      return true if File.exist? BIN_PATH
+    end
+
     def self.execute(verbose, options)
-      if available?
-        case options[:type]
-        when :failed
-          bin_path = TerminalNotifier::Guard::Failed::BIN_PATH
-        when :success
-          bin_path = TerminalNotifier::Guard::Success::BIN_PATH
-        when :pending
-          bin_path = TerminalNotifier::Guard::Pending::BIN_PATH
-        else
-          bin_path = TerminalNotifier::Guard::Notify::BIN_PATH
-        end
-        options.delete(:type) if options[:type]
+      if available? && installed?
+        options.merge!({ :appIcon => GUARD_ICON, :contentImage => 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)
@@ -45,7 +47,8 @@ module TerminalNotifier
         end
         result
       else
-        raise "terminal-notifier is only supported on Mac OS X 10.8, or higher."
+        raise "terminal-notifier is only supported on Mac OS X 10.8, or higher." if !available?
+        raise "TerminalNotifier not installed. Please do so by running `brew install terminal-notifier`" if !installed?
       end
     end
 
@@ -58,12 +61,12 @@ module TerminalNotifier
     #
     # Examples are:
     #
-    #   TerminalNotifier.notify('Hello World')
-    #   TerminalNotifier.notify('Hello World', :title => 'Ruby')
-    #   TerminalNotifier.notify('Hello World', :group => Process.pid)
-    #   TerminalNotifier.notify('Hello World', :activate => 'com.apple.Safari')
-    #   TerminalNotifier.notify('Hello World', :open => 'http://twitter.com/alloy')
-    #   TerminalNotifier.notify('Hello World', :execute => 'say "OMG"')
+    #   TerminalNotifier::Guard.notify('Hello World')
+    #   TerminalNotifier::Guard.notify('Hello World', :title => 'Ruby')
+    #   TerminalNotifier::Guard.notify('Hello World', :group => Process.pid)
+    #   TerminalNotifier::Guard.notify('Hello World', :activate => 'com.apple.Safari')
+    #   TerminalNotifier::Guard.notify('Hello World', :open => 'http://twitter.com/alloy')
+    #   TerminalNotifier::Guard.notify('Hello World', :execute => 'say "OMG"')
     #
     # Raises if not supported on the current platform.
     def notify(message, options = {}, verbose = false)
@@ -90,6 +93,13 @@ module TerminalNotifier
     end
     module_function :success
 
+    def icon(type = :notify)
+      type ||= :notify
+      file_name = "#{type}.icns".capitalize
+      File.join(ICONS_PATH, file_name)
+    end
+    module_function :icon
+
     # Removes a notification that was previously sent with the specified
     # ‘group’ ID, if one exists.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal-notifier-guard
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -67,42 +67,16 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier
-  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'
 description: 
 email:
 - wouter@springest.com
-executables:
-- terminal-notifier-notify
-- terminal-notifier-success
-- terminal-notifier-failed
-- terminal-notifier-pending
+executables: []
 extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
 - README.markdown
-- bin/terminal-notifier-failed
-- bin/terminal-notifier-notify
-- bin/terminal-notifier-pending
-- bin/terminal-notifier-success
 - lib/terminal-notifier-guard.rb
-- lib/terminal_notifier/guard/failed.rb
-- lib/terminal_notifier/guard/notify.rb
-- lib/terminal_notifier/guard/pending.rb
-- lib/terminal_notifier/guard/success.rb
 homepage: https://github.com/Springest/terminal-notifier-guard
 licenses: []
 metadata: {}

data/bin/terminal-notifier-failed

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-if $0 == __FILE__
-  $:.unshift File.expand_path('../../lib', __FILE__)
-end
-
-require 'terminal-notifier-guard'
-
-exec TerminalNotifier::Guard::Failed::BIN_PATH, *ARGV

data/bin/terminal-notifier-notify

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-if $0 == __FILE__
-  $:.unshift File.expand_path('../../lib', __FILE__)
-end
-
-require 'terminal-notifier-guard'
-
-exec TerminalNotifier::Guard::Notify::BIN_PATH, *ARGV

data/bin/terminal-notifier-pending

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-if $0 == __FILE__
-  $:.unshift File.expand_path('../../lib', __FILE__)
-end
-
-require 'terminal-notifier-guard'
-
-exec TerminalNotifier::Guard::Pending::BIN_PATH, *ARGV

data/bin/terminal-notifier-success

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-if $0 == __FILE__
-  $:.unshift File.expand_path('../../lib', __FILE__)
-end
-
-require 'terminal-notifier-guard'
-
-exec TerminalNotifier::Guard::Success::BIN_PATH, *ARGV

data/lib/terminal_notifier/guard/failed.rb

@@ -1,12 +0,0 @@
-module TerminalNotifier
-  module Guard
-    module Failed
-      terminal_notifier_path = `which terminal-notifier`.strip
-
-      BIN_PATH = terminal_notifier_path.empty? ?
-        File.expand_path('../../../../vendor/terminal-notifier-failed.app/Contents/MacOS/terminal-notifier', __FILE__)
-        :
-        terminal_notifier_path
-    end
-  end
-end

data/lib/terminal_notifier/guard/notify.rb

@@ -1,12 +0,0 @@
-module TerminalNotifier
-  module Guard
-    module Notify
-      terminal_notifier_path = `which terminal-notifier`.strip
-
-      BIN_PATH = terminal_notifier_path.empty? ?
-        File.expand_path('../../../../vendor/terminal-notifier-notify.app/Contents/MacOS/terminal-notifier', __FILE__)
-        :
-        terminal_notifier_path
-    end
-  end
-end

data/lib/terminal_notifier/guard/pending.rb

@@ -1,12 +0,0 @@
-module TerminalNotifier
-  module Guard
-    module Pending
-      terminal_notifier_path = `which terminal-notifier`.strip
-
-      BIN_PATH = terminal_notifier_path.empty? ?
-        File.expand_path('../../../../vendor/terminal-notifier-pending.app/Contents/MacOS/terminal-notifier', __FILE__)
-        :
-        terminal_notifier_path
-    end
-  end
-end

data/lib/terminal_notifier/guard/success.rb

@@ -1,12 +0,0 @@
-module TerminalNotifier
-  module Guard
-    module Success
-      terminal_notifier_path = `which terminal-notifier`.strip
-
-      BIN_PATH = terminal_notifier_path.empty? ?
-        File.expand_path('../../../../vendor/terminal-notifier-success.app/Contents/MacOS/terminal-notifier', __FILE__)
-        :
-        terminal_notifier_path
-    end
-  end
-end