terminal-notifier 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08bd293cf43906f2a2981022d9437f0a6758210
-  data.tar.gz: d64d013c3d638884daace7310cbde29cf618f9a0
+  metadata.gz: bc0d510f599b6936ce8b16fbda223456053c2280
+  data.tar.gz: 314e51d3fdb3859e55a6b5500abe8fead4bbb6f6
 SHA512:
-  metadata.gz: 1209ea24eb31275b6f1d6cc42b67c3ab2d557aa27d049d338f16a9f3fcef08a2cd084f5370501a4f412e587cef86bf9d5d193ba819b232dfbe00cef8dffd2340
-  data.tar.gz: 4e0f15e611525579d5117c39df8fdea49a0ffb8488a8bca7a41fbbfbb3aef93285d869739faf807ab5ca2855073ad02439312c6725ac13f579599f273a982c6c
+  metadata.gz: a21300312cffba5d3d617becb181325a4bdc93c5d6de395343f87c505bed0bfbde2d2c8bca0a288e789d2e723e1cda39d99487952c7ca94ad7cad6b230e0c5b1
+  data.tar.gz: 2f54d00f7f18b78aac700484634db6c43531496fcc299a51a8a2f9a9cfca75405d5df4d4f01d6584ea62508019ceb8a2901012e6eeecf9264bca650b5a6a1f9c

data/vendor/terminal-notifier/README.markdown

@@ -6,18 +6,23 @@ which are available in Mac OS X 10.8 and higher.
 
 ## Caveats
 
-* 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
+* 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.)
-
-  However, you _can_ use unicode symbols and emojis. See the examples.
+  <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.
 
 * 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.
+
 
 ## Download
 
@@ -67,7 +72,7 @@ $ terminal-notifier -group 'address-book-sync' -title 'Address Book Sync' -subti
 #### Options
 
 At a minimum, you have to specify either the `-message` , the `-remove`
-option or the `-list` option.
+or the `-list` option.
 
 -------------------------------------------------------------------------------
 
@@ -161,6 +166,22 @@ For information on the `ID` see the `-activate` option.
 
 -------------------------------------------------------------------------------
 
+`-appIcon URL` **[10.9+ only]**
+
+Specifies The URL of an image to display instead of the application icon.
+
+**WARNING: This option is subject to change since it relies on a private method.**
+
+-------------------------------------------------------------------------------
+
+`-contentImage URL` **[10.9+ only]**
+
+Specifies The URL of an image to display attached inside the notification.
+
+**WARNING: This option is subject to change since it relies on a private method.**
+
+-------------------------------------------------------------------------------
+
 `-open URL`
 
 Specifies a resource to be opened when the user clicks the notification. This

data/vendor/terminal-notifier/Ruby/Rakefile

@@ -10,7 +10,7 @@ def filename
 end
 
 def zipfile
-  "#{filename}.zip"
+  "#{version}.zip"
 end
 
 task :clean do
@@ -21,14 +21,18 @@ end
 desc "Fetch latest build from the GitHub releases"
 task :update_build do
   unless File.exist?(zipfile)
-    sh "curl -L -O 'https://github.com/alloy/terminal-notifier/releases/download/#{version}/terminal-notifier-#{version}.zip'"
+    sh "curl -L -O 'https://github.com/alloy/terminal-notifier/archive/#{zipfile}'"
   end
 
   rm_rf "vendor"
   mkdir "vendor"
 
   sh "unzip -o -d vendor #{zipfile}"
-  mv "vendor/#{filename}", "vendor/terminal-notifier"
+  mv "vendor/#{filename}", 'vendor/terminal-notifier'
+
+  %x(xcodebuild -project '../Terminal\ Notifier.xcodeproj' -target terminal-notifier SYMROOT=build -verbose)
+  mv '../build/Release/terminal-notifier.app', 'vendor/terminal-notifier/'
+  chmod 0755, 'vendor/terminal-notifier/terminal-notifier.app/Contents/MacOS/terminal-notifier'
 end
 
 desc "Build gem"

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

@@ -9,6 +9,8 @@ NSString * const NotificationCenterUIBundleID = @"com.apple.notificationcenterui
 #define NSAppKitVersionNumber10_8 1187
 #define NSAppKitVersionNumber10_9 1265
 
+#define contains(str1, str2) ([str1 rangeOfString: str2 ].location != NSNotFound)
+
 NSString *_fakeBundleIdentifier = nil;
 
 @implementation NSBundle (FakeBundleIdentifier)
@@ -66,24 +68,21 @@ isMavericks()
 
 +(void)initializeUserDefaults
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 
-    // initialize the dictionary with default values depending on OS level
-    NSDictionary *appDefaults;
+  // initialize the dictionary with default values depending on OS level
+  NSDictionary *appDefaults;
 
-    if (isMavericks())
-    {
-        //10.9
-        appDefaults = @{@"sender": @"com.apple.Terminal"};
-    }
-    else
-    {
-        //10.8
-        appDefaults = @{@"": @"message"};
-    }
+  if (isMavericks()) {
+    //10.9
+    appDefaults = @{@"sender": @"com.apple.Terminal"};
+  } else {
+    //10.8
+    appDefaults = @{@"": @"message"};
+  }
 
-    // and set them appropriately
-    [defaults registerDefaults:appDefaults];
+  // and set them appropriately
+  [defaults registerDefaults:appDefaults];
 }
 
 - (void)printHelpBanner;
@@ -113,6 +112,8 @@ isMavericks()
          "                          Old notifications with the same ID will be removed.\n" \
          "       -activate ID       The bundle identifier of the application to activate when the user clicks the notification.\n" \
          "       -sender ID         The bundle identifier of the application that should be shown as the sender, including its icon.\n" \
+         "       -appIcon URL       The URL of a image to display instead of the application icon (Mavericks+ only)\n" \
+         "       -contentImage URL  The URL of a image to display attached to the notification (Mavericks+ only)\n" \
          "       -open URL          The URL of a resource to open when the user clicks the notification.\n" \
          "       -execute COMMAND   A shell command to perform when the user clicks the notification.\n" \
          "\n" \
@@ -186,10 +187,12 @@ isMavericks()
 
     if (message) {
       NSMutableDictionary *options = [NSMutableDictionary dictionary];
-      if (defaults[@"activate"]) options[@"bundleID"] = defaults[@"activate"];
-      if (defaults[@"group"])    options[@"groupID"]  = defaults[@"group"];
-      if (defaults[@"execute"])  options[@"command"]  = defaults[@"execute"];
-      if (defaults[@"open"])     options[@"open"]     = [defaults[@"open"] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+      if (defaults[@"activate"]) options[@"bundleID"]         = defaults[@"activate"];
+      if (defaults[@"group"])    options[@"groupID"]          = defaults[@"group"];
+      if (defaults[@"execute"])  options[@"command"]          = defaults[@"execute"];
+      if (defaults[@"open"])     options[@"open"]             = [defaults[@"open"] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+      if (defaults[@"appIcon"])  options[@"appIcon"]          = defaults[@"appIcon"];
+      if (defaults[@"contentImage"]) options[@"contentImage"] = defaults[@"contentImage"];
 
       [self deliverNotificationWithTitle:defaults[@"title"] ?: @"Terminal"
                                 subtitle:subtitle
@@ -200,6 +203,15 @@ isMavericks()
   }
 }
 
+- (NSImage*)getImageFromURL:(NSString *) url;
+{
+  if(!contains(url, @"file://")){ // Prefix file:// if not present
+    url = [NSString stringWithFormat:@"%@%@", @"file://", url];
+  }
+  NSURL *imageURL = [NSURL URLWithString:url];
+  return [[NSImage alloc] initWithContentsOfURL:imageURL];
+}
+
 - (void)deliverNotificationWithTitle:(NSString *)title
                              subtitle:(NSString *)subtitle
                              message:(NSString *)message
@@ -215,6 +227,19 @@ isMavericks()
   userNotification.informativeText = message;
   userNotification.userInfo = options;
 
+  if(isMavericks()){
+    // Mavericks options
+    if(options[@"appIcon"]){
+      // replacement app icon
+      [userNotification setValue:[self getImageFromURL:options[@"appIcon"]] forKey:@"_identityImage"];
+      [userNotification setValue:@(true) forKey:@"_identityImageHasBorder"];
+    }
+    if(options[@"contentImage"]){
+      // content image
+      userNotification.contentImage = [self getImageFromURL:options[@"contentImage"]];
+    }
+  }
+
   if (sound != nil) {
     userNotification.soundName = [sound isEqualToString: @"default"] ? NSUserNotificationDefaultSoundName : sound ;
   }

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.5.2</string>
+	<string>1.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>10</string>
+	<string>11</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>LSUIElement</key>

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.5.2</string>
+	<string>1.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>10</string>
+	<string>11</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-notifier
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon