terminal-notifier 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96140bb35740bd35bddea3e2e202a32cf1617a1f
-  data.tar.gz: 2f170c56de4b2721ec500173a4103bd86fe60390
+  metadata.gz: eb346770c5841b855bd10ed29ef4978737796f04
+  data.tar.gz: a0a5aafa6599e3f25b9a77008caef94b5e1bd2ad
 SHA512:
-  metadata.gz: 29ec5f7c96e9be0a0610a9151634edd0eb1e9761a48d6ed86a3b4e2d60338cf30a75bf1fd13068cb653bd32ffcf640f2fdbe9867c56cdb689b1d4eb4a8b319aa
-  data.tar.gz: 0ac46c139e48faf4d4140b6ae8f451b115c870e499450af99dd28989eb8768094fb2ab8c4d5ab893b1e44837988dbc4738cfa337ec736f016bce69e82ad61728
+  metadata.gz: cb29172445667301209d649c57c0859c2f2efd49732d1626cd0372739d2d2ad2bd5f183dd341b3c7a1a1573a11710eb8a716f6838ffac1e3b6c750dc5a88d32a
+  data.tar.gz: ed36e3f179a80f957e1e55b375e59080a4590e40f7d5b0f0c536671f511c7b0d01409a7f22ce20a174bf423069b56298e2b111d9e6292594a2da9b9c9dccb68b

data/vendor/terminal-notifier/LICENSE.md

@@ -0,0 +1,9 @@
+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 julien@sideburns.eu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 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/README.markdown

@@ -123,13 +123,13 @@ in Sound Preferences. Use 'default' for the default notification sound.
 
 -------------------------------------------------------------------------------
 
-`-reply`
+`-reply` **[10.9+ only]**
 
 The notification will be displayed as a reply type alert.
 
 -------------------------------------------------------------------------------
 
-`-actions VALUE1,VALUE2,"VALUE 3"`
+`-actions VALUE1,VALUE2,"VALUE 3"` **[10.9+ only]**
 
 The notification actions avalaible.
 When you provide more than one value, a dropdown will be displayed.
@@ -138,14 +138,14 @@ Does not work when -reply is used
 
 -------------------------------------------------------------------------------
 
-`-dropdownLabel VALUE`
+`-dropdownLabel VALUE` **[10.9+ only]**
 
 The notification actions dropdown title (only when multiples -actions values are provided).
 Does not work when -reply is used
 
 -------------------------------------------------------------------------------
 
-`-closeLabel VALUE`
+`-closeLabel VALUE` **[10.9+ only]**
 
 The notification "Close" button label.
 
@@ -259,7 +259,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-2015 Eloy Durán <eloy.de.enige@gmail.com>, Julien Blanchard
+Copyright (C) 2012-2016 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

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

@@ -224,8 +224,10 @@ isMavericks()
         options[@"output"] = @"json";
       }
 
-      options[@"timeout"] = @"0";
-      if (defaults[@"timeout"]) options[@"timeout"] = defaults[@"timeout"];
+      options[@"uuid"] = [NSString stringWithFormat:@"%ld", self.hash];
+      options[@"timeout"] = defaults[@"timeout"] ? defaults[@"timeout"] : @"0";
+
+      if (options[@"reply"] || defaults[@"timeout"] || defaults[@"actions"]) options[@"waitForResponse"] = @YES;
 
       if (defaults[@"open"]) {
         /*
@@ -303,37 +305,32 @@ isMavericks()
       // content image
       userNotification.contentImage = [self getImageFromURL:options[@"contentImage"]];
     }
-  }
-
-  if (sound != nil) {
-    userNotification.soundName = [sound isEqualToString: @"default"] ? NSUserNotificationDefaultSoundName : sound;
-  }
-
-  // Actions
-  if (options[@"actions"]){
-    [userNotification setValue:@YES forKey:@"_showsButtons"];
-    NSArray *myActions = [options[@"actions"] componentsSeparatedByString:@","];
-    if (myActions.count > 1) {
-      [userNotification setValue:@YES forKey:@"_alwaysShowAlternateActionMenu"];
-      [userNotification setValue:myActions forKey:@"_alternateActionButtonTitles"];
-
-      //Main Actions Title
-      if(options[@"dropdownLabel"]){
-        userNotification.actionButtonTitle = options[@"dropdownLabel"];
-        userNotification.hasActionButton = true;
+    // Actions
+    if (options[@"actions"]){
+      [userNotification setValue:@YES forKey:@"_showsButtons"];
+      NSArray *myActions = [options[@"actions"] componentsSeparatedByString:@","];
+      if (myActions.count > 1) {
+        [userNotification setValue:@YES forKey:@"_alwaysShowAlternateActionMenu"];
+        [userNotification setValue:myActions forKey:@"_alternateActionButtonTitles"];
+
+        //Main Actions Title
+        if(options[@"dropdownLabel"]){
+          userNotification.actionButtonTitle = options[@"dropdownLabel"];
+          userNotification.hasActionButton = true;
+        }
+      }else{
+        userNotification.actionButtonTitle = options[@"actions"];
       }
-    }else{
-      userNotification.actionButtonTitle = options[@"actions"];
+    }else if (options[@"reply"]) {
+      [userNotification setValue:@YES forKey:@"_showsButtons"];
+      userNotification.hasReplyButton = 1;
+      userNotification.responsePlaceholder = options[@"reply"];
     }
-  }else if (options[@"reply"]) {
-    [userNotification setValue:@YES forKey:@"_showsButtons"];
-    userNotification.hasReplyButton = 1;
-    userNotification.responsePlaceholder = options[@"reply"];
-  }
 
-  // Close button
-  if(options[@"closeLabel"]){
-    userNotification.otherButtonTitle = options[@"closeLabel"];
+    // Close button
+    if(options[@"closeLabel"]){
+      userNotification.otherButtonTitle = options[@"closeLabel"];
+    }
   }
 
   if (sound != nil) {
@@ -415,6 +412,8 @@ isMavericks()
 - (void)userNotificationCenter:(NSUserNotificationCenter *)center
         didDeliverNotification:(NSUserNotification *)userNotification;
 {
+  if (!userNotification.userInfo[@"waitForResponse"]) exit(0);
+
   currentNotification = userNotification;
 
   dispatch_async(dispatch_get_global_queue( DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
@@ -427,6 +426,7 @@ isMavericks()
                      }
                      if (notificationStillPresent) [NSThread sleepForTimeInterval:0.20f];
                    } while (notificationStillPresent);
+
                    dispatch_async(dispatch_get_main_queue(), ^{
                        NSDictionary *udict = @{@"activationType" : @"closed", @"activationValue" : userNotification.otherButtonTitle};
                        [self Quit:udict notification:userNotification];
@@ -443,7 +443,6 @@ isMavericks()
                      NSDictionary *udict = @{@"activationType" : @"timeout"};
                      [self Quit:udict notification:userNotification];
                      exit(0);
-
                    });
   }
 }
@@ -590,15 +589,4 @@ isMavericks()
   }
 }
 
-- (void) bye; {
-  //Look for the notification sent, remove it when found
-  NSString *UUID = currentNotification.userInfo[@"uuid"];
-  for (NSUserNotification *nox in [[NSUserNotificationCenter defaultUserNotificationCenter] deliveredNotifications]) {
-    if ([nox.userInfo[@"uuid"] isEqualToString:UUID ]){
-      [[NSUserNotificationCenter defaultUserNotificationCenter] removeDeliveredNotification:nox];
-      [[NSUserNotificationCenter defaultUserNotificationCenter] removeDeliveredNotification:nox];
-    }
-  }
-}
-
 @end

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.0</string>
+	<string>1.7.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>15</string>
+	<string>16</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>LSUIElement</key>

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>16B2333a</string>
+	<string>15G1004</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.0</string>
+	<string>1.7.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -27,7 +27,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>15</string>
+	<string>16</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal-notifier
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
@@ -66,6 +66,7 @@ files:
 - README.markdown
 - bin/terminal-notifier
 - lib/terminal-notifier.rb
+- vendor/terminal-notifier/LICENSE.md
 - vendor/terminal-notifier/README.markdown
 - vendor/terminal-notifier/Ruby/Gemfile
 - vendor/terminal-notifier/Ruby/Gemfile.lock
@@ -118,8 +119,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Send User Notifications on Mac OS X 10.8 or higher.
 test_files: []
+has_rdoc: