wtapack 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acf75d6063e0a0d11329dc7be0f120a22ebe4673
-  data.tar.gz: f5ac4ec0e1b1e7490b2fefe7e3d081c5c90778a7
+  metadata.gz: 413f8bf6f6637084f59551cd1ec7a35cf2d1a28b
+  data.tar.gz: c64eb0a95247d0fc1f137897b7ef333d8bbd27c7
 SHA512:
-  metadata.gz: 8ec3fc0d82adfdb3fe3615f2a1165a91cc2e68438e77471f31acd2e9e1256621f697d5cbca3cd5b168417d975482a75a024eafe129260f9404537f442cf4c5df
-  data.tar.gz: d3be62501cc612bec72354768de6342dafeef996e0ef5db685cdd350bc4179754d09dd0bbae93e677377455fa65b6c3dbc56c6d6ad254d69c8964b95014a9fc2
+  metadata.gz: 4cbb05c8a39e23ada0922b94ce43a70d1e075c16426667d0c66a8d5123754f3a9ff8943567d6407c2dcea35c6f858edc263270d85989331d0e7c7c95af772d09
+  data.tar.gz: 95683b033d7691d413d2cc200f97d47e86e24ffa8067ad7d1c4c671c2acfb1422f1ab35dc9223030085f18756009aa449fe7066fe9a6509d48fdfbae444bacaf

data/ext/wtapack/PlistManager.h

@@ -0,0 +1,18 @@
+//
+//  PlistManager.h
+//  WTAPackageApplication
+//
+//  Created by Robert Thompson on 10/29/14.
+//  Copyright (c) 2014 WillowTree Apps. All rights reserved.
+//
+
+@import Foundation;
+
+@interface PlistManager : NSObject
+- (void)updateBundleID:(NSString*)newBundleID;
+- (void)updateDisplayName:(NSString*)displayName;
+
+- (void)commit;
+
+- (instancetype)initWithURL:(NSURL*)bundleURL;
+@end

data/ext/wtapack/PlistManager.m

@@ -0,0 +1,91 @@
+//
+//  PlistManager.m
+//  WTAPackageApplication
+//
+//  Created by Robert Thompson on 10/13/14.
+//  Copyright (c) 2014 WillowTree Apps. All rights reserved.
+//
+
+#import "PlistManager.h"
+#import "ErrorHandler.h"
+
+@interface PlistManager ()
+@property (strong, nonatomic) NSMutableDictionary* infoPlist;
+@property (strong, nonatomic) NSURL* bundleURL;
+@property (nonatomic) BOOL needsSaving;
+@property (nonatomic) NSPropertyListFormat format;
+@end
+
+@implementation PlistManager
+- (instancetype)initWithURL:(NSURL*)bundleURL
+{
+    self = [super init];
+    if (self)
+    {
+        NSFileManager* fm = [NSFileManager defaultManager];
+
+        NSURL* infoPlistURL = [bundleURL URLByAppendingPathComponent:@"Info.plist"];
+        NSData* infoPlistData = [fm contentsAtPath:infoPlistURL.path];
+        NSError* error = nil;
+        _infoPlist = [NSPropertyListSerialization propertyListWithData:infoPlistData
+                                                               options:NSPropertyListMutableContainersAndLeaves
+                                                                format:&_format
+                                                                 error:&error];
+        if (error)
+        {
+            [ErrorHandler fatalErrorWithError:error
+                            additionalMessage:[NSString stringWithFormat:@"Failed to deserialize Info.plist in %@",
+                                               bundleURL.path]];
+        }
+        
+        _needsSaving = NO;
+        _bundleURL = bundleURL;
+    }
+    
+    return self;
+}
+
+- (void)updateBundleID:(NSString*)newBundleID
+{
+    self.infoPlist[@"CFBundleIdentifier"] = newBundleID;
+    self.needsSaving = YES;
+}
+
+- (void)updateDisplayName:(NSString*)newDisplayName
+{
+    self.infoPlist[@"CFBundleDisplayName"] = newDisplayName;
+    self.needsSaving = YES;
+}
+
+- (void)commit
+{
+    if (self.needsSaving)
+    {
+        NSError* error = nil;
+        
+        NSData* infoPlistData = [NSPropertyListSerialization dataWithPropertyList:self.infoPlist
+                                                                           format:self.format
+                                                                          options:0
+                                                                            error:&error];
+        if (error)
+        {
+            [ErrorHandler fatalErrorWithError:error
+                            additionalMessage:[NSString stringWithFormat:@"Failed to serialize new Info.plist for %@",
+                                               self.bundleURL.path]];
+        }
+        
+        NSURL* infoPlistURL = [self.bundleURL URLByAppendingPathComponent:@"Info.plist"];
+    
+        BOOL success = [infoPlistData writeToURL:infoPlistURL
+                                      atomically:YES];
+    
+        if (!success)
+        {
+            NSString* errorString = [NSString stringWithFormat:@"Failed to write new Info.plist in %@",
+                                     self.bundleURL.path];
+            [ErrorHandler fatalErrorWithMessage:errorString
+                                       exitCode:EX_CANTCREAT];
+        }
+    }
+}
+@end

data/ext/wtapack/main.m

@@ -9,9 +9,9 @@
 @import Foundation;
 #import "ProfileManager.h"
 #import "CodeSigner.h"
-#import "updateBundleID.h"
 #import "NSArray+WTAMap.h"
 #import "ErrorHandler.h"
+#import "PlistManager.h"
 #ifndef WTA_STANDALONE
 #import <ruby.h>
 #endif
@@ -136,12 +136,21 @@ int main(int argc, const char* argv[]) {
         // therein.
         ProfileManager* mainProfileManager = [[ProfileManager alloc] initWithKey:@"profile"
                                                                         bundleURL:destApp];
+        PlistManager* appPlistManager = [[PlistManager alloc] initWithURL:destApp];
         if (newBundleID)
         {
             // Sometimes we may not be changing the bundle ID
-            updateBundleID(destApp, newBundleID);
+            [appPlistManager updateBundleID:newBundleID];
         }
-       
+        
+        NSString* newDisplayName = [standardDefaults stringForKey:@"displayName"];
+        if (newDisplayName)
+        {
+            [appPlistManager updateDisplayName:newDisplayName];
+        }
+        
+        [appPlistManager commit];
+        
         [mainProfileManager replaceEntitlements];
        
         [mainProfileManager replaceProfile];
@@ -168,8 +177,11 @@ int main(int argc, const char* argv[]) {
                            {
                                NSString* extensionBundleName = [extension stringByReplacingOccurrencesOfString:@" " withString:@"-"];
                                NSString* newExtensionBundleID = [newBundleID stringByAppendingString:[NSString stringWithFormat:@".%@", extensionBundleName]];
+                               PlistManager* extensionPlistManager = [[PlistManager alloc] initWithURL: extensionURL];
+                               
+                               [extensionPlistManager updateBundleID: newExtensionBundleID];
                                
-                               updateBundleID(extensionURL, newExtensionBundleID);
+                               [extensionPlistManager commit];
                            }
                            
                            [extensionProfileManager replaceEntitlements];

data/ext/wtapack/updateBundleID.h

@@ -9,3 +9,4 @@
 @import Foundation;
 
 void updateBundleID(NSURL* appURL, NSString* newBundleID);
+void updateDisplayName(NSURL* appURL, NSString* newDisplayName);

data/lib/wtapack.rb

@@ -2,7 +2,7 @@ require File.expand_path('../wtapack.bundle', __FILE__)
 
 module Wtapack
   class Packer
-    attr_accessor :profile, :extensions, :input, :sign, :bundleID, :extension_profiles, :output
+    attr_accessor :profile, :extensions, :input, :sign, :bundleID, :displayName, :extension_profiles, :output
     
     def pack
       argv = ["wtapack", "-profile", "#{self.profile}", "-sign", "#{self.sign}", "-input", "\"#{self.input}\"", "-output", "\"#{self.output}\"", "-bundleID", "#{self.bundleID}"]
@@ -21,9 +21,13 @@ module Wtapack
 
         end
       end
-      if self.extensions.nil?
-        self.extensions = []
+      
+      unless self.displayName.nil?
+        argv = argv + ["-displayName", "\"#{self.displayName}\""]
       end
+      # if self.extensions.nil?
+      #   self.extensions = []
+      # end
             
       argc = argv.count
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wtapack
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Robert Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -39,6 +39,8 @@ files:
 - ext/wtapack/ErrorHandler.m
 - ext/wtapack/NSArray+WTAMap.h
 - ext/wtapack/NSArray+WTAMap.m
+- ext/wtapack/PlistManager.h
+- ext/wtapack/PlistManager.m
 - ext/wtapack/ProfileManager.h
 - ext/wtapack/ProfileManager.m
 - ext/wtapack/extconf.rb
@@ -68,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Codesigning and ipa packaging