gapic-generator-cloud 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c441fdc1fa39c04dd899ecdf54220aee63f9c37e612f7967f29fec9760370c
-  data.tar.gz: c7946bf5da749801f61af89282bb581958efe12c891fe6288c827f9496298712
+  metadata.gz: 67c698edddd3e5884a7ea49222c4bc4fcda045354d60380db267279d2524aa82
+  data.tar.gz: 7367fbc57dec1cf102cd69de072bf0f8a57d0a01fc895bcdf376c32163568b11
 SHA512:
-  metadata.gz: 382a4df1000768f154070a62776dd9bf36d64326771addc29e5f7a904643657f6c0f68300e2e7d1f1b664afc7402dd0b68882f1023cb10eb9da534e544c21494
-  data.tar.gz: c43058e550a06efffd832b7b7437d97da4f847824291bd738470850238a3bcbe9671ab1b15afe1f12280e19a3e4cfe0dc10cf3cd746aba70f5ea4c6e3fdec300
+  metadata.gz: 45d9725ff2c9b1b1db1fcd426edf33fdbfd3709274cbe9f172483ec86e315173fd342d520a2ffa05e55ac5df3a1bb633a06325120550bbdd78b271b7c2038f35
+  data.tar.gz: 69812b1f0fe041ed416b82a8fdc7af1408ae3e642f11917541a3277ba69e65ef2b52feb85fd5a9fec52da25bb3688dfd2e8bf0c4edc0b9bd6896efc0f2eccce9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release History for gapic-generator-cloud
 
+### 0.4.0 / 2020-04-20
+
+* Includes changes from gapic-generator 0.4.0
+* Apply overrides to client namespaces but not proto namespaces.
+* Remove common resources proto from generated files.
+* Multiple overrides can be specified in the docker interface.
+* Fixed: The pre-migration versions in wrapper readmes were malformed if the migration version was still 0.x.
+
 ### 0.3.3 / 2020-04-13
 
 * Includes changes from gapic-generator 0.3.3

data/bin/ruby-cloud-docker-entrypoint

@@ -18,10 +18,13 @@
 require "optparse"
 require "fileutils"
 
+# Boolean options may have values "true" or "false" (as strings)
 bool_option_map = {
   ":gem.:free_tier" => "ruby-cloud-free-tier",
   ":gem.:yard_strict" => "ruby-cloud-yard-strict"
 }
+
+# Value options always take string values.
 value_option_map = {
   "configuration" => "ruby-cloud-config",
   ":gem.:name" => "ruby-cloud-gem-name",
@@ -36,15 +39,28 @@ value_option_map = {
   ":gem.:api_id" => "ruby-cloud-api-id",
   ":gem.:factory_method_suffix" => "ruby-cloud-factory-method-suffix"
 }
+
+# Path options take one or more file paths delimited by semicolons.
 path_option_map = {
   "samples" => ["ruby-cloud-samples", "samples"],
   "grpc_service_config" => "ruby-cloud-grpc-service-config"
 }
+
+# Map options take one or more mappings delimited by semicolons. Each mapping
+# must be of the form "key=value". Note that periods in keys are treated as
+# literal periods, not subkey delimiters.
 map_option_map = {
+  ":common_services" => "ruby-cloud-common-services",
   ":overrides.:file_path" => "ruby-cloud-path-override",
   ":overrides.:namespace" => "ruby-cloud-namespace-override"
 }
 
+# A set of files that, if generated, should be removed.
+remove_paths = [
+  "lib/google/iam/v1/iam_policy_pb.rb",
+  "lib/google/cloud/common_resources_pb.rb"
+]
+
 parameters = {}
 
 OptionParser.new do |op|
@@ -72,8 +88,11 @@ OptionParser.new do |op|
   map_option_map.each do |key, flags|
     flags = Array(flags).map { |f| "--#{f} MAPPING" }
     op.on(*flags) do |mapping|
-      mapping_key, mapping_val = mapping.split("=", 2)
-      parameters["#{key}.#{mapping_key}"] = mapping_val if mapping_val
+      mapping.split(";").each do |mapping_kv|
+        mapping_key, mapping_val = mapping_kv.split("=", 2)
+        mapping_key.gsub!(".", "\\\\\\\\.")
+        parameters["#{key}.#{mapping_key}"] = mapping_val if mapping_val
+      end
     end
   end
 end.parse! ARGV
@@ -93,11 +112,18 @@ ruby_plugin_args =
 
 protoc_cmd = [
   "grpc_tools_ruby_protoc",
-  "--proto_path=/protos/", "--proto_path=/in/"
+  # It is important for /in to come before /protos because all input files
+  # come from /in, and protoc will complain if any of those are also found
+  # earlier in the proto path.
+  "--proto_path=/in/", "--proto_path=/protos/"
 ] + ruby_plugin_args + [
   "--ruby_cloud_out=/out/",
   "--ruby_cloud_opt", parameter_strs.join(",")
 ] + ARGV + Dir.glob("/in/**/*.proto").sort
 
 FileUtils.mkdir_p "/out/lib"
-exec(*protoc_cmd)
+system(*protoc_cmd)
+
+remove_paths.each do |path|
+  FileUtils.rm_f Dir.glob "/out/#{path}"
+end

data/lib/gapic/generator/cloud/version.rb

@@ -14,10 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 module Gapic
   module Generator
     module Cloud
-      VERSION = "0.3.3"
+      VERSION = "0.4.0"
     end
   end
 end

data/lib/gapic/presenters/wrapper_gem_presenter.rb

@@ -54,10 +54,16 @@ module Gapic
         gem_config :migration_version
       end
 
+      # A description of the versions prior to the migration version.
+      # Could be "a.x" if the migration version is 1.0 or later, otherwise
+      # falls back to "pre-a.b".
       def pre_migration_version
-        m = /^(\d)+\./.match migration_version.to_s
-        return nil unless m
-        "#{m[1].to_i - 1}.x"
+        match = /^(\d)+\.0/.match migration_version.to_s
+        if match
+          major = match[1].to_i
+          return "#{major - 1}.x" if major.positive?
+        end
+        "pre-#{migration_version}"
       end
 
       def migration?

data/lib/gapic/presenters/wrapper_service_presenter.rb

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 require "gapic/presenters"
+require "gapic/ruby_info"
 
 module Gapic
   module Presenters
@@ -27,10 +28,13 @@ module Gapic
       end
 
       def factory_method_name
-        method_name = ActiveSupport::Inflector.underscore name
-        suffix = gem.factory_method_suffix
-        method_name = "#{method_name}#{suffix}" unless method_name.end_with? suffix
-        method_name
+        @factory_method_name ||= begin
+          method_name = ActiveSupport::Inflector.underscore name
+          suffix = gem.factory_method_suffix
+          method_name = "#{method_name}#{suffix}" unless method_name.end_with? suffix
+          method_name = "#{method_name}_client" if Gapic::RubyInfo.excluded_method_names.include? method_name
+          method_name
+        end
       end
 
       def create_client_call

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator-cloud
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement