terminal-notifier 1.3.0 → 1.4.0

data/README.markdown

@@ -20,12 +20,16 @@ Examples are:
 
 ```ruby
 TerminalNotifier.notify('Hello World')
-TerminalNotifier.notify('Hello World', :title => 'Ruby')
+TerminalNotifier.notify('Hello World', :title => 'Ruby', :subtitle => 'Programming Language')
 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.notify('Hello World', :group => Process.pid)
-TerminalNotifier.remove('previous Process.pid')
+
+TerminalNotifier.remove(Process.pid)
+
+TerminalNotifier.list(Process.pid)
+TerminalNotifier.list
 ```
 
 

data/bin/terminal-notifier

@@ -6,4 +6,4 @@ end
 
 require 'terminal-notifier'
 
-TerminalNotifier.execute(ARGV)
+exec TerminalNotifier::BIN_PATH, *ARGV

data/lib/terminal-notifier.rb

@@ -9,21 +9,20 @@ module TerminalNotifier
     @available
   end
 
-  def self.silence_stdout
-    stdout = STDOUT.clone
-    STDOUT.reopen(File.new('/dev/null', 'w'))
-    yield
-  ensure
-    STDOUT.reopen(stdout)
-  end
-
-  def self.execute_with_options(options)
-    execute(options.map { |k,v| ["-#{k}", v.to_s] }.flatten)
-  end
-
-  def self.execute(argv)
+  def self.execute(verbose, options)
     if available?
-      system(BIN_PATH, *argv)
+      command = [BIN_PATH, *options.map { |k,v| ["-#{k}", v.to_s] }.flatten]
+      if RUBY_VERSION < '1.9'
+        require 'shellwords'
+        command = Shellwords.shelljoin(command)
+      end
+      result = ''
+      IO.popen(*command) do |stdout|
+        output = stdout.read
+        STDOUT.print output if verbose
+        result << output
+      end
+      result
     else
       raise "terminal-notifier is only supported on Mac OS X 10.8, or higher."
     end
@@ -46,27 +45,44 @@ module TerminalNotifier
   #   TerminalNotifier.notify('Hello World', :execute => 'say "OMG"')
   #
   # Raises if not supported on the current platform.
-  def notify(message, options = {})
-    TerminalNotifier.silence_stdout { TerminalNotifier.verbose_notify(message, options) }
+  def notify(message, options = {}, verbose = false)
+    TerminalNotifier.execute(verbose, options.merge(:message => message))
+    $?.success?
   end
   module_function :notify
 
-  # The same as `verbose`, but sends the output from the tool to STDOUT.
-  def verbose_notify(message, options = {})
-    TerminalNotifier.execute_with_options(options.merge(:message => message))
-  end
-  module_function :verbose_notify
-
   # Removes a notification that was previously sent with the specified
   # ‘group’ ID, if one exists.
-  def remove(group)
-    TerminalNotifier.silence_stdout { TerminalNotifier.verbose_remove(group) }
+  #
+  # If no ‘group’ ID is given, all notifications are removed.
+  def remove(group = 'ALL', verbose = false)
+    TerminalNotifier.execute(verbose, :remove => group)
+    $?.success?
   end
   module_function :remove
 
-  # The same as `remove`, but sends the output from the tool to STDOUT.
-  def verbose_remove(group)
-    TerminalNotifier.execute_with_options(:remove => group)
+  LIST_FIELDS = [:group, :title, :subtitle, :message, :delivered_at].freeze
+
+  # If a ‘group’ ID is given, and a notification for that group exists,
+  # returns a hash with details about the notification.
+  #
+  # If no ‘group’ ID is given, an array of hashes describing all
+  # notifications.
+  #
+  # If no information is available this will return `nil`.
+  def list(group = 'ALL', verbose = false)
+    output = TerminalNotifier.execute(verbose, :list => group)
+    return if output.strip.empty?
+
+    require 'time'
+    notifications = output.split("\n")[1..-1].map do |line|
+      LIST_FIELDS.zip(line.split("\t")).inject({}) do |hash, (key, value)|
+        hash[key] = key == :delivered_at ? Time.parse(value) : (value unless value == '(null)')
+        hash
+      end
+    end
+
+    group == 'ALL' ? notifications : notifications.first
   end
-  module_function :verbose_remove
+  module_function :list
 end

data/vendor/terminal-notifier/README.markdown

@@ -50,8 +50,8 @@ This will obviously be a bit slower than using the tool without the wrapper.
 
 #### Options
 
-At a minimum, you have to specify either the `-message` option or the `-remove`
-option.
+At a minimum, you have to specify either the `-message` , the `-remove`
+option or the `-list` option.
 
 -------------------------------------------------------------------------------
 
@@ -67,6 +67,12 @@ The title of the notification. This defaults to ‘Terminal’.
 
 -------------------------------------------------------------------------------
 
+`-subtitle VALUE`
+
+The subtitle of the notification.
+
+-------------------------------------------------------------------------------
+
 `-group ID`
 
 Specifies the ‘group’ a notification belongs to. For any ‘group’ only _one_
@@ -86,7 +92,16 @@ Examples are:
 `-remove ID`  **[required]**
 
 Removes a notification that was previously sent with the specified ‘group’ ID,
-if one exists.
+if one exists. If used with the special group "ALL", all message are removed.
+
+-------------------------------------------------------------------------------
+
+`-list ID` **[required]**
+
+Lists details about the specified ‘group’ ID. If used with the special group
+"ALL", details about all currently active  messages are displayed.
+
+The output of this command is tab-separated, which makes it easy to parse.
 
 -------------------------------------------------------------------------------
 

data/vendor/terminal-notifier/terminal-notifier.app/Contents/Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>1.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>DTCompiler</key>
 	<string></string>
 	<key>DTPlatformBuild</key>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: terminal-notifier
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-30 00:00:00 Z
+date: 2012-08-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bacon