Merge pull request #200 from thomasvl/update

Update deps and add custom framework generation support

Author: thomasvl

Deps/gtm-oauth2

@@ -29,12 +29,14 @@ typedef enum {
 @property (readonly, retain) GTLDiscoveryRpcDescription* api;
 @property (readonly, assign) NSUInteger verboseLevel;
 @property (readonly, assign) BOOL allowRootURLOverrides;
+@property (readonly, copy) NSString *frameworkName;
 
 + (instancetype)generatorForApi:(GTLDiscoveryRpcDescription *)api
                    verboseLevel:(NSUInteger)verboseLevel
           allowRootURLOverrides:(BOOL)allowRootURLOverrides
           formattedNameOverride:(NSString *)formattedNameOverride
-               skipIfLikelyREST:(BOOL)skipIfLikelyREST;
+               skipIfLikelyREST:(BOOL)skipIfLikelyREST
+               useFrameworkName:(NSString *)frameworkName;
 
 // Keys are the file names; values are the contents of the files.
 - (NSDictionary *)generateFilesWithHandler:(void (^)(FHGeneratorHandlerMessageType msgType,

Deps/gtm-session-fetcher

@@ -177,7 +177,8 @@ - (instancetype)initWithApi:(GTLDiscoveryRpcDescription *)api
                verboseLevel:(NSUInteger)verboseLevel
       allowRootURLOverrides:(BOOL)allowRootURLOverrides
       formattedNameOverride:(NSString *)formattedNameOverride
-           skipIfLikelyREST:(BOOL)skipIfLikelyREST;
+           skipIfLikelyREST:(BOOL)skipIfLikelyREST
+           useFrameworkName:(NSString *)frameworkName;
 
 - (void)adornMethods:(GTLDiscoveryRpcDescriptionMethods *)methods;
 - (void)adornSchema:(GTLDiscoveryJsonSchema *)schema
@@ -242,7 +243,8 @@ @implementation FHGenerator
 
 @synthesize api = api_,
             verboseLevel = verboseLevel_,
-            allowRootURLOverrides = allowRootURLOverrides_;
+            allowRootURLOverrides = allowRootURLOverrides_,
+            frameworkName = frameworkName_;
 
 @synthesize warnings = warnings_,
             infos = infos_;
@@ -251,25 +253,29 @@ + (instancetype)generatorForApi:(GTLDiscoveryRpcDescription *)api
                    verboseLevel:(NSUInteger)verboseLevel
           allowRootURLOverrides:(BOOL)allowRootURLOverrides
           formattedNameOverride:(NSString *)formattedNameOverride
-               skipIfLikelyREST:(BOOL)skipIfLikelyREST {
+               skipIfLikelyREST:(BOOL)skipIfLikelyREST
+               useFrameworkName:(NSString *)frameworkName {
   return [[[self alloc] initWithApi:api
                        verboseLevel:verboseLevel
               allowRootURLOverrides:allowRootURLOverrides
               formattedNameOverride:formattedNameOverride
-                   skipIfLikelyREST:skipIfLikelyREST] autorelease];
+                   skipIfLikelyREST:skipIfLikelyREST
+                   useFrameworkName:frameworkName] autorelease];
 }
 
 - (instancetype)initWithApi:(GTLDiscoveryRpcDescription *)api
                verboseLevel:(NSUInteger)verboseLevel
       allowRootURLOverrides:(BOOL)allowRootURLOverrides
       formattedNameOverride:(NSString *)formattedNameOverride
-           skipIfLikelyREST:(BOOL)skipIfLikelyREST {
+           skipIfLikelyREST:(BOOL)skipIfLikelyREST
+           useFrameworkName:(NSString *)frameworkName {
   self = [super init];
   if (self != nil) {
     api_ = [api retain];
     verboseLevel_ = verboseLevel;
     allowRootURLOverrides_ = allowRootURLOverrides;
     formattedName_ = [formattedNameOverride copy];
+    frameworkName_ = [frameworkName copy];
     if (!api) {
       [self release];
       self = nil;
@@ -2473,11 +2479,15 @@ - (NSString *)authorizationScopeToConstant:(NSString *)scope {
 
 - (NSString *)frameworkedImport:(NSString *)headerName {
   NSMutableString *result = [NSMutableString string];
-  [result appendFormat:@"#if %@\n", kFrameworkIncludeGate];
-  [result appendFormat:@"  #import \"%@/%@.h\"\n", kProjectPrefix, headerName];
-  [result appendString:@"#else\n"];
-  [result appendFormat:@"  #import \"%@.h\"\n", headerName];
-  [result appendString:@"#endif\n"];
+  if (self.frameworkName) {
+    [result appendFormat:@"#import <%@/%@.h>\n", self.frameworkName, headerName];
+  } else {
+    [result appendFormat:@"#if %@\n", kFrameworkIncludeGate];
+    [result appendFormat:@"  #import \"%@/%@.h\"\n", kProjectPrefix, headerName];
+    [result appendString:@"#else\n"];
+    [result appendFormat:@"  #import \"%@.h\"\n", headerName];
+    [result appendString:@"#endif\n"];
+  }
   return result;
 }
 

Source/Tools/ServiceGenerator/FHGenerator.h

@@ -47,6 +47,11 @@
     " to send the JSON-RPC requests.  This is useful for running against a"
     " custom or prerelease server."
   },
+  { "--gtlFrameworkName NAME",
+    "Will generate sources that include GTL's headers as if they are in a"
+    " framework with the given name.  If you are using GTL via CocoaPods,"
+    " you'll likely want to pass \"GoogleAPIClient\" as the value for this."
+  },
   { "--apiLogDir DIR",
     "Write out a file into DIR for each JSON API description processed.  These"
     " can be useful for reporting bugs if generation fails with an error."
@@ -103,7 +108,7 @@
       " the files for it are generated.  When using --generatePreferred"
       " version can be '-' to skip generating the name service." },
   { "http[s]://url/to/rpc_description_json",
-      "A URL to download containing the descripiton of a service to"
+      "A URL to download containing the description of a service to"
       " generate." },
   { "path/to/rpc_description.json",
       "The path to a text file containing the description of a service to"
@@ -159,6 +164,7 @@ @interface FHMain ()
 @property (copy) NSString *appName;
 @property (copy) NSString *outputDir;
 @property (copy) NSString *discoveryServiceURLString;
+@property(copy) NSString *gtlFrameworkName;
 @property (copy) NSString *apiLogDir;
 @property (copy) NSString *httpLogDir;
 @property (assign) BOOL generatePreferred;
@@ -446,6 +452,7 @@ - (void)stateParseArgs {
   struct option longopts[] = {
     { "outputDir",          required_argument,  NULL,               'o' },
     { "discoveryService",   required_argument,  NULL,               'd' },
+    { "gtlFrameworkName",   required_argument,  NULL,               'n' },
     { "apiLogDir",          required_argument,  NULL,               'a' },
     { "httpLogDir",         required_argument,  NULL,               'h' },
     { "generatePreferred",  no_argument,        &generatePreferred, 1 },
@@ -469,6 +476,9 @@ - (void)stateParseArgs {
       case 'd':
         self.discoveryServiceURLString = [NSString stringWithUTF8String:optarg];
         break;
+      case 'n':
+        self.gtlFrameworkName = @(optarg);
+        break;
       case 'a':
         self.apiLogDir = [NSString stringWithUTF8String:optarg];
         break;
@@ -562,6 +572,9 @@ - (void)stateParseArgs {
   if ([self.discoveryServiceURLString length] == 0) {
     self.discoveryServiceURLString = nil;
   }
+  if (self.gtlFrameworkName.length == 0) {
+    self.gtlFrameworkName = nil;
+  }
 
   // Make sure output dir exists.
   NSFileManager *fm = [NSFileManager defaultManager];
@@ -958,7 +971,8 @@ - (void)stateGenerate {
                                                 verboseLevel:self.verboseLevel
                                        allowRootURLOverrides:self.rootURLOverrides
                                        formattedNameOverride:formattedNameOverride
-                                            skipIfLikelyREST:fromDiscovery];
+                                            skipIfLikelyREST:fromDiscovery
+                                            useFrameworkName:self.gtlFrameworkName];
       if (fromDiscovery && [aGenerator likelyRESTOnlyAPI]) {
         fprintf(stderr,
                 "    %s Skipping this api. It appears to be a REST only and can't be supported via JSON-RPC\n", kWARNING);