gapic-generator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53e29f5e9a5cd2e6c4cf68d8e28fe095b5a0f5155f7c892f0b9b5429914b5dfb
-  data.tar.gz: 5ea2ad00f9c340675f2bd4f1b16d02dbb5d2e2b7444b450d326993de263a1cc0
+  metadata.gz: d4dce46e53ba5c481f1d6af583b40c66205dc3ddb7c54aa4e1e0acc40c9b7258
+  data.tar.gz: f35b6cb5a0817ef329f37f36c4a0bfd22f977106c7eee83db9eff90f37a0470c
 SHA512:
-  metadata.gz: 8f975242f0242375263e065351763fb67594ba65fc571f882bb54ce1877a5e14ad1419ecaf75e5c58ea0c29c81f5e8becdef635f1013111b624acd3e06248e92
-  data.tar.gz: 10abc98e678f667815d6e325cb27d582d4cbe27f4037edc66cde40ae8eb76b0d7b6fc884258d8ec5473612d327059baffbea94f3e9edf1ba83ae29f2d988e655
+  metadata.gz: 8786390ccd5b065e8e58bfb613c6a1be7f7132f94de7b12c8fbc3cae4653135f6ba8aa004332093a04444ff3521832ddc9b4bfa11ed618b05fd41d66b6f85518
+  data.tar.gz: 1979480b8fbad820b96f1208d3b9f59c7bee12a3bd7790465a088f2f86fc14d1e342327f7b45d8dc9c40e8b28f18be08b23fc3f685116cd929a71fbcbaecb7e5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History for gapic-generator
 
+### 0.1.2 / 2020-03-09
+
+* Support multiple grpc service config files
+
 ### 0.1.1 / 2020-03-09
 
 * Relax rake dependency.

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/gapic/schema/api.rb

@@ -200,16 +200,14 @@ module Gapic
         end
       end
 
-      # Raw parsed json of the grpc service config if provided
-      # or an empty hash if config was not provided
+      # Raw parsed json of the combined grpc service config files if provided
+      # or an empty hash if no config was provided
       def grpc_service_config_raw
         @grpc_service_config_raw ||= begin
-          grpc_service_config_filename = protoc_options["grpc_service_config"]
-          if grpc_service_config_filename
-            file = ::File.read grpc_service_config_filename
-            JSON.parse file
-          else
-            {}
+          filenames = protoc_options["grpc_service_config"].to_s.split ";"
+          filenames.inject({}) do |running_hash, filename|
+            file_hash = JSON.parse ::File.read filename
+            deep_merge running_hash, file_hash
           end
         end
       end
@@ -252,6 +250,8 @@ module Gapic
         left.merge right do |_k, lt, rt|
           if lt.is_a?(Hash) && rt.is_a?(Hash)
             deep_merge lt, rt
+          elsif lt.is_a?(Array) && rt.is_a?(Array)
+            lt + rt
           else
             rt
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack