wtapack 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 413f8bf6f6637084f59551cd1ec7a35cf2d1a28b
-  data.tar.gz: c64eb0a95247d0fc1f137897b7ef333d8bbd27c7
+  metadata.gz: 5d9b012148ea0c5a46df2805c6d1b8cc783a050b
+  data.tar.gz: c82ea92f569f99efce65360351c1aa0eff102142
 SHA512:
-  metadata.gz: 4cbb05c8a39e23ada0922b94ce43a70d1e075c16426667d0c66a8d5123754f3a9ff8943567d6407c2dcea35c6f858edc263270d85989331d0e7c7c95af772d09
-  data.tar.gz: 95683b033d7691d413d2cc200f97d47e86e24ffa8067ad7d1c4c671c2acfb1422f1ab35dc9223030085f18756009aa449fe7066fe9a6509d48fdfbae444bacaf
+  metadata.gz: 620e12d8db481ee3f55341068ea08b12dbe14e356e8b584d69a54af52f79e6f21b4d11bce52c9250c8c3cc993f7987aa0926f0e0679e3d24a13b6a14b6b5ea89
+  data.tar.gz: 2d7d24c38bd6fa7610942c2627e1c3d2542c12b99fa4f830547e10adf676a0012fdace5a5e6959d0ec078a43ad36325e23e9ea18e33948a57606e35639786ba4

data/ext/wtapack/PlistManager.h

@@ -9,6 +9,8 @@
 @import Foundation;
 
 @interface PlistManager : NSObject
+@property (strong, nonatomic, readonly) NSString* binaryName;
+
 - (void)updateBundleID:(NSString*)newBundleID;
 - (void)updateDisplayName:(NSString*)displayName;
 

data/ext/wtapack/PlistManager.m

@@ -88,4 +88,9 @@
         }
     }
 }
+
+- (NSString*)binaryName
+{
+    return self.infoPlist[@"CFBundleExecutable"];
+}
 @end

data/ext/wtapack/ProfileManager.h

@@ -15,4 +15,5 @@
 
 - (void)replaceProfile;
 - (void)replaceEntitlements;
+
 @end

data/ext/wtapack/main.m

@@ -12,6 +12,10 @@
 #import "NSArray+WTAMap.h"
 #import "ErrorHandler.h"
 #import "PlistManager.h"
+#import <sys/types.h>
+#import <unistd.h>
+#import <grp.h>
+#import <pwd.h>
 #ifndef WTA_STANDALONE
 #import <ruby.h>
 #endif
@@ -22,6 +26,8 @@ static NSString* const usageString = @"Usage: %s -input <path to original .app>
 [-<extension name> <extension provisioning profile UUID> ...] -output <path to output ipa>";
 
 void showUsageAndExit(void);
+void stripBinary(NSURL* binaryURL);
+void setOwnership(NSURL* bundleURL);
 
 #ifndef WTA_STANDALONE
 VALUE rb_main(int argc, const char * argv[]) {
@@ -149,11 +155,16 @@ int main(int argc, const char* argv[]) {
             [appPlistManager updateDisplayName:newDisplayName];
         }
         
+        NSString* binaryName = appPlistManager.binaryName;
+        
         [appPlistManager commit];
         
         [mainProfileManager replaceEntitlements];
        
         [mainProfileManager replaceProfile];
+                
+        setOwnership(destApp);
+        system([NSString stringWithFormat:@"/bin/chmod -RH u+w,go-w,a+rX \"%s\"", destApp.path.fileSystemRepresentation].UTF8String);
         
         // Extensions handling starts here
         NSString* extensionsString = [standardDefaults stringForKey:@"extensions"];
@@ -187,6 +198,10 @@ int main(int argc, const char* argv[]) {
                            [extensionProfileManager replaceEntitlements];
                            
                            [extensionProfileManager replaceProfile];
+                                          
+                           // strip binary
+                           NSURL* binaryURL = [extensionURL URLByAppendingPathComponent:extension];
+                           stripBinary(binaryURL);
                            
                            // Code signing
                            [CodeSigner signBinary:extensionURL];
@@ -200,14 +215,42 @@ int main(int argc, const char* argv[]) {
                                                    options:NSDirectoryEnumerationSkipsHiddenFiles
                                                      error:NULL];
         
+        // Check to see if the Swift libs are included
+        NSArray* swiftLibs = [frameworks filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"SELF.path CONTAINS %@", @"libswift"]];
+
+        if (swiftLibs.count)
+        {
+            NSURL* swiftSupportURL = [tmpDirURL URLByAppendingPathComponent:@"SwiftSupport"];
+            [fm createDirectoryAtURL:swiftSupportURL withIntermediateDirectories:YES attributes:nil error:NULL];
+            for (NSURL* lib in swiftLibs)
+            {
+                [fm copyItemAtURL:lib toURL:[swiftSupportURL URLByAppendingPathComponent:lib.lastPathComponent] error:NULL];
+            }   
+            
+            setOwnership(swiftSupportURL);
+        }
+        
         dispatch_apply(frameworks.count,
                        dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,
                                                  0),
                        ^(size_t i) {
                            // Embedded Frameworks don't need a provisioning profile
                            [fm removeItemAtURL:[frameworks[i] URLByAppendingPathComponent:@"embedded.mobileprovision"] error: NULL];
+                           
+                           NSRange frameRange = [[frameworks[i] lastPathComponent] rangeOfString:@".framework"];
+                           if (frameRange.location != NSNotFound)
+                           {
+                               NSLog(@"%@", [frameworks[i] path]);
+                               NSString* frameworkBinaryName = [[frameworks[i] lastPathComponent] substringWithRange:NSMakeRange(0, frameRange.location)];
+                               NSURL* binaryURL = [frameworks[i] URLByAppendingPathComponent:frameworkBinaryName];
+                               stripBinary(binaryURL);                               
+                           }
+                           
                            [CodeSigner signFramework:frameworks[i]];
                        });
+                       
+        NSURL* binaryURL = [destApp URLByAppendingPathComponent:binaryName];
+        stripBinary(binaryURL);
         
         // Finally sign whole app.
         [CodeSigner signBinary:destApp];
@@ -249,6 +292,21 @@ void showUsageAndExit(void)
     [ErrorHandler fatalErrorWithMessage:[NSString stringWithFormat:usageString, [[NSProcessInfo processInfo].arguments.firstObject UTF8String]]
                                exitCode:EX_USAGE];
 }
+
+void stripBinary(NSURL* binaryURL)
+{
+    NSString* stripCommand = [NSString stringWithFormat:@"/usr/bin/strip -x \"%s\"", binaryURL.path.fileSystemRepresentation];
+    system(stripCommand.UTF8String);
+}
+
+void setOwnership(NSURL* bundleURL)
+{
+    uid_t currentUID = getuid();
+    gid_t currentGID = getgid();
+    
+    NSString* chownCommand = [NSString stringWithFormat:@"/usr/sbin/chown -RH %@:%@ \"%s\"", @(currentUID), @(currentGID), bundleURL.path.fileSystemRepresentation];
+    system(chownCommand.UTF8String);
+}
 // This is left here for historical interest, in case anyone wants to know how to do this.
 //NSMutableDictionary* readRawEntitlements(NSURL* rawEntitlementsPath)
 //{

data/lib/wtapack.rb

@@ -30,7 +30,6 @@ module Wtapack
       # end
             
       argc = argv.count
-      
       Wtapack::native_pack(argc, argv)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wtapack
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.8
 platform: ruby
 authors:
 - Robert Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler