terminal-notifier 1.2.0 → 1.3.0

data/README.markdown

@@ -21,10 +21,11 @@ Examples are:
 ```ruby
 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.notify('Hello World', :group => Process.pid)
+TerminalNotifier.remove('previous Process.pid')
 ```
 
 

data/bin/terminal-notifier

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

data/lib/terminal-notifier.rb

@@ -9,16 +9,26 @@ module TerminalNotifier
     @available
   end
 
-  # Executes the `terminal-notifier` tool through Kernel::system while
-  # redirecting output to `/dev/null`.
-  def self.silent_execute(options)
+  def self.silence_stdout
     stdout = STDOUT.clone
     STDOUT.reopen(File.new('/dev/null', 'w'))
-    system(BIN_PATH, *options)
+    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)
+    if available?
+      system(BIN_PATH, *argv)
+    else
+      raise "terminal-notifier is only supported on Mac OS X 10.8, or higher."
+    end
+  end
+
   # Sends a User Notification and returns wether or not it was a success.
   #
   # The available options are `:title`, `:group`, `:activate`, `:open`, and
@@ -37,11 +47,26 @@ module TerminalNotifier
   #
   # Raises if not supported on the current platform.
   def notify(message, options = {})
-    if TerminalNotifier.available?
-      TerminalNotifier.silent_execute(options.merge(:message => message).map { |k,v| ["-#{k}", v.to_s] }.flatten)
-    else
-      raise "terminal-notifier is only supported on Mac OS X 10.8, or higher."
-    end
+    TerminalNotifier.silence_stdout { TerminalNotifier.verbose_notify(message, options) }
   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) }
+  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)
+  end
+  module_function :verbose_remove
 end

data/vendor/terminal-notifier/README.markdown

@@ -20,19 +20,38 @@ status of commands which are executed due to filesystem changes. (v3.0.0)
 Prebuilt binaries, which are code-signed and ready to use, are available from
 the [downloads section](https://github.com/alloy/terminal-notifier/downloads).
 
+Or if you want to use this from
+[Ruby](https://github.com/alloy/terminal-notifier/tree/master/Ruby), you can
+install it through RubyGems:
+
+```
+$ [sudo] gem install terminal-notifier
+```
+
 
 ## Usage
 
 ```
-$ ./terminal-notifier.app/Contents/MacOS/terminal-notifier -message VALUE [options]
+$ ./terminal-notifier.app/Contents/MacOS/terminal-notifier -[message|group] [VALUE|ID] [options]
 ```
 
 In order to use terminal-notifier, you have to call the binary _inside_ the
-application mbundle.
+application bundle.
+
+The Ruby gem, which wraps this tool, _does_ have a bin wrapper. If installed
+you can simply do:
+
+```
+$ terminal-notifier -[message|group] [VALUE|ID] [options]
+```
+
+This will obviously be a bit slower than using the tool without the wrapper.
+
 
 #### Options
 
-The `-message` option is the only one that is required.
+At a minimum, you have to specify either the `-message` option or the `-remove`
+option.
 
 -------------------------------------------------------------------------------
 
@@ -53,6 +72,9 @@ The title of the notification. This defaults to ‘Terminal’.
 Specifies the ‘group’ a notification belongs to. For any ‘group’ only _one_
 notification will ever be shown, replacing previously posted notifications.
 
+A notification can be explicitely removed with the `-remove` option, describe
+below.
+
 Examples are:
 
 * The sender’s name to scope the notifications by tool.
@@ -61,6 +83,13 @@ Examples are:
 
 -------------------------------------------------------------------------------
 
+`-remove ID`  **[required]**
+
+Removes a notification that was previously sent with the specified ‘group’ ID,
+if one exists.
+
+-------------------------------------------------------------------------------
+
 `-activate ID`
 
 Specifies which application should be activated when the user clicks the

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.2.0</string>
+	<string>1.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</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: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -15,19 +15,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-28 00:00:00 Z
-dependencies: []
-
+date: 2012-07-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha-on-bacon
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: 
 email: 
 - eloy.de.enige@gmail.com
-executables: []
-
+executables: 
+- terminal-notifier
 extensions: []
 
 extra_rdoc_files: 
 - README.markdown
 files: 
+- bin/terminal-notifier
 - lib/terminal-notifier.rb
 - vendor/terminal-notifier/README.markdown
 - vendor/terminal-notifier/terminal-notifier.app/Contents/_CodeSignature/CodeResources