terminal-notifier 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb346770c5841b855bd10ed29ef4978737796f04
-  data.tar.gz: a0a5aafa6599e3f25b9a77008caef94b5e1bd2ad
+  metadata.gz: 4dcd4d5574c0f6a72194c404b75c3492c4cf1893
+  data.tar.gz: 141fcb8e6689657588c37473bf5c62d99113a9f5
 SHA512:
-  metadata.gz: cb29172445667301209d649c57c0859c2f2efd49732d1626cd0372739d2d2ad2bd5f183dd341b3c7a1a1573a11710eb8a716f6838ffac1e3b6c750dc5a88d32a
-  data.tar.gz: ed36e3f179a80f957e1e55b375e59080a4590e40f7d5b0f0c536671f511c7b0d01409a7f22ce20a174bf423069b56298e2b111d9e6292594a2da9b9c9dccb68b
+  metadata.gz: b5aa0028909e4ac903c9e8593502e96b80a3febcc4052a3cdb56d7ef53586bd53715e0f533faf8f229056d7f28aacde56bfee1d03265cba1d5a41a3c46c19c8b
+  data.tar.gz: 3e9f8458371332df5f478dc8e2e1c900b832e13f1114aca718de301270ab0c80193de4806d6a4c7a66be10a494da410f2d68b41bee045cce87bbb2efa63b82af

data/lib/terminal-notifier.rb

@@ -16,7 +16,7 @@ module TerminalNotifier
 
   def self.execute(verbose, options)
     if available?
-      command = [BIN_PATH, *options.map { |k,v| v = v.to_s; ["-#{k}", "#{Shellwords.escape(v[0,1])}#{v[1..-1]}"] }.flatten]
+      command = [BIN_PATH, *options.map { |k,v| v = v.to_s; ["-#{k}", "#{v[0] == "-" ? " " : ""}#{Shellwords.escape(v[0,1])}#{v[1..-1]}"] }.flatten]
       command = Shellwords.join(command) if RUBY_VERSION < '1.9'
       result = ''
       IO.popen(command) do |stdout|

data/vendor/terminal-notifier/README.markdown

@@ -1,27 +1,29 @@
 # terminal-notifier
 
-terminal-notifier is a command-line tool to send Mac OS X User Notifications,
-which are available in Mac OS X 10.8 and higher.
+terminal-notifier is a command-line tool to send macOS User Notifications,
+which are available on macOS 10.8 and higher.
 
 
 ## Caveats
 
-* Under OS X 10.8, the Notification Center _always_ uses the application’s own
-  icon, there’s currently no way to specify a custom icon for a notification. The only
-  way to use this tool with your own icon is to use the `-sender` option or include a
-  build of terminal-notifier with your icon and **a different bundle identifier**
-  instead. (If you do not change the bundle identifier, launch services will use
-  a cached version of the icon.)
-  <br/>Consequently the `-appIcon` & `-contentImage` options aren't doing anything
-  under 10.8.
-  <br/>However, you _can_ use unicode symbols and emojis. See the examples.
+* On macOS 10.8, the `-appIcon` and `-contentImage` options do nothing.
+  This is because Notification Center on 10.8 _always_ uses the application’s own icon.
+
+  You can do one of the following to work around this limitation on 10.8:
+    - Use the `-sender` option to  “fake it” (see below)
+    - Include a build of terminal-notifier with your icon **and a different bundle identifier**.
+    (If you don’t change the bundle identifier, launch services uses a cached version of the icon.)
+
+  However, you _can_ use unicode symbols and emojis! See the examples.
 
 * It is currently packaged as an application bundle, because `NSUserNotification`
   does not work from a ‘Foundation tool’. [radar://11956694](radar://11956694)
 
-* If you intend to package terminal-notifier with your app to distribute it on the
-  MAS, please use 1.5.2 since 1.6.0+ uses a private method override which is not
-  allowed in the AppStore guidelines.
+* If you intend to package terminal-notifier with your app to distribute it on the Mac App Store, please use 1.5.2; version 1.6.0+ uses a private method override, which is not allowed in the App Store Guidelines.
+
+* To enable actions on the notification (the buttons that allow the user to select an option),
+  open System Preferences > Notifications, select terminal-notifer in the sidebar, and select the "Alerts" alert style.
+  ![Enable alerts in System Preferences](assets/System_prefs.png)
 
 
 ## Download
@@ -60,38 +62,49 @@ $ terminal-notifier -[message|group|list] [VALUE|ID|ID] [options]
 
 This will obviously be a bit slower than using the tool without the wrapper.
 
-Some examples are:
 
-Display piped data with a sound
+### Example Uses
+
+Display piped data with a sound:
 ```
 $ echo 'Piped Message Data!' | terminal-notifier -sound default
 ```
 
-Multiple actions and custom dropdown list
+![Example 1](assets/Example_1.png)
+
+Multiple actions and custom dropdown list:
 ```
 $ terminal-notifier -message "Deploy now on UAT ?" -actions Now,"Later today","Tomorrow" -dropdownLabel "When ?"
 ```
 
-Yes or No ?
+![Example 2](assets/Example_2.png)
+
+“Yes or No ?”:
 ```
 $ terminal-notifier -title ProjectX -subtitle "new tag detected" -message "Deploy now on UAT ?" -closeLabel No -actions Yes -appIcon http://vjeantet.fr/images/logo.png
 ```
 
-Open an URL when the notification is clicked
+![Example 3](assets/Example_3.png)
+
+Open an URL when the notification is clicked:
 ```
 $ terminal-notifier -title '💰' -message 'Check your Apple stock!' -open 'http://finance.yahoo.com/q?s=AAPL'
 ```
 
-Open an app when the notification is clicked
+![Example 4](assets/Example_4.png)
+
+Open an app when the notification is clicked:
 ```
 $ terminal-notifier -group 'address-book-sync' -title 'Address Book Sync' -subtitle 'Finished' -message 'Imported 42 contacts.' -activate 'com.apple.AddressBook'
 ```
 
+![Example 5](assets/Example_5.png)
+
 
-#### Options
+### Options
 
-At a minimum, you have to specify either the `-message` , the `-remove`
-or the `-list` option.
+At a minimum, you must specify either the `-message` , the `-remove`, or the
+`-list` option.
 
 -------------------------------------------------------------------------------
 
@@ -99,8 +112,8 @@ or the `-list` option.
 
 The message body of the notification.
 
-Note that if this option is omitted and data is piped to the application, that
-data will be used instead.
+If you pipe data into terminal-notifier, you can omit this option,
+and the piped data will become the message body instead.
 
 -------------------------------------------------------------------------------
 
@@ -118,78 +131,86 @@ The subtitle of the notification.
 
 `-sound NAME`
 
-The name of a sound to play when the notification appears. The names are listed
-in Sound Preferences. Use 'default' for the default notification sound.
+Play the `NAME` sound when the notification appears.
+Sound names are listed in Sound Preferences.
+
+Use the special `NAME` “default” for the default notification sound.
 
 -------------------------------------------------------------------------------
 
 `-reply` **[10.9+ only]**
 
-The notification will be displayed as a reply type alert.
+Display the notification as a reply type alert.
 
 -------------------------------------------------------------------------------
 
 `-actions VALUE1,VALUE2,"VALUE 3"` **[10.9+ only]**
 
-The notification actions avalaible.
+Use `VALUE*` as actions for the notification.
 When you provide more than one value, a dropdown will be displayed.
-You can customize this dropdown label with the next option
-Does not work when -reply is used
+
+You can customize this dropdown label with the `-dropdownLabel` option.
+
+Does not work when `-reply` is used.
 
 -------------------------------------------------------------------------------
 
 `-dropdownLabel VALUE` **[10.9+ only]**
 
-The notification actions dropdown title (only when multiples -actions values are provided).
-Does not work when -reply is used
+Use the `VALUE` label for the notification’s dropdown menu actions
+(only when multiple `-actions` values are provided).
+
+Does not work when `-reply` is used.
 
 -------------------------------------------------------------------------------
 
 `-closeLabel VALUE` **[10.9+ only]**
 
-The notification "Close" button label.
+Use the `VALUE` label for the notification’s “Close” button.
 
 -------------------------------------------------------------------------------
 
 `-timeout NUMBER`
 
-Auto close the alert notification after NUMBER seconds.
+Automatically close the alert notification after `NUMBER` seconds.
 
 -------------------------------------------------------------------------------
 
 `-json`
 
-Outputs the event as JSON.
+Output the event as JSON.
 
 -------------------------------------------------------------------------------
 
 `-group ID`
 
-Specifies the ‘group’ a notification belongs to. For any ‘group’ only _one_
+Specifies the notification’s ‘group’. 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.
+A notification can be explicitly removed with the `-remove` option (see
+below).
 
-Examples are:
+Example group IDs:
 
-* The sender’s name to scope the notifications by tool.
-* The sender’s process ID to scope the notifications by a unique process.
-* The current working directory to scope notifications by project.
+* The sender’s name (to scope the notifications by tool).
+* The sender’s process ID (to scope the notifications by a unique process).
+* The current working directory (to scope notifications by project).
 
 -------------------------------------------------------------------------------
 
 `-remove ID`  **[required]**
 
-Removes a notification that was previously sent with the specified ‘group’ ID,
-if one exists. If used with the special group "ALL", all message are removed.
+Remove a previous notification from the `ID` ‘group’, if one exists.
+
+Use the special `ID` “ALL” to remove all messages.
 
 -------------------------------------------------------------------------------
 
 `-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.
+Lists details about the specified ‘group’ `ID`.
+
+Use the special `ID` “ALL” to list details about all currently active messages.
 
 The output of this command is tab-separated, which makes it easy to parse.
 
@@ -197,13 +218,13 @@ The output of this command is tab-separated, which makes it easy to parse.
 
 `-activate ID`
 
-Specifies which application should be activated when the user clicks the
+Activate the application specified by `ID` when the user clicks the
 notification.
 
-You can find the bundle identifier of an application in its `Info.plist` file
+You can find the bundle identifier (`CFBundleIdentifier`) of an application in its `Info.plist` file
 _inside_ the application bundle.
 
-Examples are:
+Examples application IDs are:
 
 * `com.apple.Terminal` to activate Terminal.app
 * `com.apple.Safari` to activate Safari.app
@@ -212,30 +233,28 @@ Examples are:
 
 `-sender ID`
 
-Specifying this will make it appear as if the notification was send by that
-application instead, including using its icon.
+Fakes the sender application of the notification. This uses the specified
+application’s icon, and will launch it when the notification is clicked.
 
-Using this option fakes the sender application, so that the notification system
-will launch that application when the notification is clicked. Because of this
-it is important to note that you cannot combine this with options like
-`-execute`, `-open`, and `-activate` which depend on the sender of the
-notification to be ‘terminal-notifier’ to perform its work.
+Because this option fakes the notification sender, it cannot be used with options
+like `-execute`, `-open`, and `-activate`, because they depend on the sender being
+‘terminal-notifier’ to work.
 
-For information on the `ID` see the `-activate` option.
+For information on the `ID`, see the `-activate` option.
 
 -------------------------------------------------------------------------------
 
 `-appIcon PATH` **[10.9+ only]**
 
-Specifies The PATH of an image to display instead of the application icon.
+Specify an image `PATH` to display instead of the application icon.
 
-**WARNING: This option is subject to change since it relies on a private method.**
+**WARNING: This option is subject to change, since it relies on a private method.**
 
 -------------------------------------------------------------------------------
 
 `-contentImage PATH` **[10.9+ only]**
 
-Specifies The PATH of an image to display attached inside the notification.
+Specify an image `PATH` to attach inside of the notification.
 
 **WARNING: This option is subject to change since it relies on a private method.**
 
@@ -243,14 +262,14 @@ Specifies The PATH of an image to display attached inside the notification.
 
 `-open URL`
 
-Specifies a resource to be opened when the user clicks the notification. This
-can be a web or file URL, or any custom URL scheme.
+Open `URL` when the user clicks the notification. This can be a web or file URL,
+or any custom URL scheme.
 
 -------------------------------------------------------------------------------
 
 `-execute COMMAND`
 
-Specifies a shell command to run when the user clicks the notification.
+Run the shell command `COMMAND` when the user clicks the notification.
 
 
 ## License
@@ -259,7 +278,7 @@ All the works are available under the MIT license. **Except** for
 ‘Terminal.icns’, which is a copy of Apple’s Terminal.app icon and as such is
 copyright of Apple.
 
-Copyright (C) 2012-2016 Eloy Durán <eloy.de.enige@gmail.com>, Julien Blanchard
+Copyright (C) 2012-2017 Eloy Durán <eloy.de.enige@gmail.com>, Julien Blanchard
 <julien@sideburns.eu>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -279,3 +298,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+

data/vendor/terminal-notifier/Ruby/lib/terminal-notifier.rb

@@ -16,7 +16,7 @@ module TerminalNotifier
 
   def self.execute(verbose, options)
     if available?
-      command = [BIN_PATH, *options.map { |k,v| v = v.to_s; ["-#{k}", "#{Shellwords.escape(v[0,1])}#{v[1..-1]}"] }.flatten]
+      command = [BIN_PATH, *options.map { |k,v| v = v.to_s; ["-#{k}", "#{v[0] == "-" ? " " : ""}#{Shellwords.escape(v[0,1])}#{v[1..-1]}"] }.flatten]
       command = Shellwords.join(command) if RUBY_VERSION < '1.9'
       result = ''
       IO.popen(command) do |stdout|

data/vendor/terminal-notifier/Ruby/spec/terminal-notifier_spec.rb

@@ -15,6 +15,13 @@ describe "TerminalNotifier" do
     IO.expects(:popen).with(command).yields(StringIO.new('output'))
     TerminalNotifier.execute(false, :message => '[ZOMG] "OH YEAH"')
   end
+ 
+  it "correctly escapes arguments that start with a dash" do
+    command = [TerminalNotifier::BIN_PATH, '-message', ' -kittens', '-title', ' -rule']
+    command = Shellwords.join(command) if RUBY_VERSION < '1.9'
+    IO.expects(:popen).with(command).yields(StringIO.new('output'))
+    TerminalNotifier.execute(false, :message => '-kittens', :title => '-rule')
+  end
 
   it "returns the result output of the command" do
     TerminalNotifier.execute(false, 'help' => '').should == `'#{TerminalNotifier::BIN_PATH}' -help`

data/vendor/terminal-notifier/Terminal Notifier/AppDelegate.m

@@ -420,11 +420,13 @@ isMavericks()
                  ^{
                    __block BOOL notificationStillPresent;
                    do {
-                     notificationStillPresent = NO;
-                     for (NSUserNotification *nox in [[NSUserNotificationCenter defaultUserNotificationCenter] deliveredNotifications]) {
-                       if ([nox.userInfo[@"uuid"]  isEqualToString:[NSString stringWithFormat:@"%ld", self.hash] ]) notificationStillPresent = YES;
+                     @autoreleasepool {
+                       notificationStillPresent = NO;
+                       for (NSUserNotification *nox in [[NSUserNotificationCenter defaultUserNotificationCenter] deliveredNotifications]) {
+                         if ([nox.userInfo[@"uuid"]  isEqualToString:[NSString stringWithFormat:@"%ld", self.hash] ]) notificationStillPresent = YES;
+                       }
+                       if (notificationStillPresent) [NSThread sleepForTimeInterval:0.20f];
                      }
-                     if (notificationStillPresent) [NSThread sleepForTimeInterval:0.20f];
                    } while (notificationStillPresent);
 
                    dispatch_async(dispatch_get_main_queue(), ^{

data/vendor/terminal-notifier/Terminal Notifier/Terminal Notifier-Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.1</string>
+	<string>1.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>16</string>
+	<string>17</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>LSUIElement</key>
@@ -32,7 +32,12 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-  <key>NSUserNotificationAlertStyle</key>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>NSUserNotificationAlertStyle</key>
 	<string>alert</string>
 </dict>
 </plist>

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15G1004</string>
+	<string>16E195</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.1</string>
+	<string>1.7.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -27,25 +27,30 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>16</string>
+	<string>17</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>8A218a</string>
+	<string>8B62</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>16A300</string>
+	<string>16B2649</string>
 	<key>DTSDKName</key>
 	<string>macosx10.12</string>
 	<key>DTXcode</key>
-	<string>0800</string>
+	<string>0810</string>
 	<key>DTXcodeBuild</key>
-	<string>8A218a</string>
+	<string>8B62</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.8</string>
 	<key>LSUIElement</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2012-2016 Eloy Durán, Julien Blanchard. All rights reserved.</string>
 	<key>NSMainNibFile</key>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal-notifier
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -92,6 +92,12 @@ files:
 - vendor/terminal-notifier/Terminal Notifier/en.lproj/MainMenu.xib
 - vendor/terminal-notifier/Terminal Notifier/main.m
 - vendor/terminal-notifier/Terminal.icns
+- vendor/terminal-notifier/assets/Example_1.png
+- vendor/terminal-notifier/assets/Example_2.png
+- vendor/terminal-notifier/assets/Example_3.png
+- vendor/terminal-notifier/assets/Example_4.png
+- vendor/terminal-notifier/assets/Example_5.png
+- vendor/terminal-notifier/assets/System_prefs.png
 - vendor/terminal-notifier/terminal-notifier.app/Contents/Info.plist
 - vendor/terminal-notifier/terminal-notifier.app/Contents/MacOS/terminal-notifier
 - vendor/terminal-notifier/terminal-notifier.app/Contents/PkgInfo
@@ -119,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Send User Notifications on Mac OS X 10.8 or higher.
 test_files: []
-has_rdoc: