Merge pull request #428 from joshuafeldman/issue-427

Issue #427 - Adding subdirectory support for iOS bundle

Author: geof90

ios/CodePush/CodePush.h

@@ -21,6 +21,10 @@
 + (NSURL *)bundleURLForResource:(NSString *)resourceName
                   withExtension:(NSString *)resourceExtension;
 
++ (NSURL *)bundleURLForResource:(NSString *)resourceName
+                  withExtension:(NSString *)resourceExtension
+                   subdirectory:(NSString *)resourceSubdirectory;
+
 + (NSString *)getApplicationSupportDirectory;
 
 /*

ios/CodePush/CodePush.m

@@ -56,12 +56,15 @@ @implementation CodePush {
 // in the binary.
 static NSString *bundleResourceExtension = @"jsbundle";
 static NSString *bundleResourceName = @"main";
+static NSString *bundleResourceSubdirectory = nil;
 
 #pragma mark - Public Obj-C API
 
 + (NSURL *)binaryBundleURL
 {
-    return [[NSBundle mainBundle] URLForResource:bundleResourceName withExtension:bundleResourceExtension];
+    return [[NSBundle mainBundle] URLForResource:bundleResourceName
+                                   withExtension:bundleResourceExtension
+                                    subdirectory:bundleResourceSubdirectory];
 }
 
 + (NSURL *)bundleURL
@@ -78,10 +81,20 @@ + (NSURL *)bundleURLForResource:(NSString *)resourceName
 
 + (NSURL *)bundleURLForResource:(NSString *)resourceName
                   withExtension:(NSString *)resourceExtension
+{
+    return [self bundleURLForResource:resourceName
+                        withExtension:resourceExtension
+                         subdirectory:nil];
+}
+
++ (NSURL *)bundleURLForResource:(NSString *)resourceName
+                  withExtension:(NSString *)resourceExtension
+                   subdirectory:(NSString *)resourceSubdirectory
 {
     bundleResourceName = resourceName;
     bundleResourceExtension = resourceExtension;
-
+    bundleResourceSubdirectory = resourceSubdirectory;
+    
     [self ensureBinaryBundleExists];
 
     NSString *logMessageFormat = @"Loading JS bundle from %@";