gapic-generator-cloud 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67c698edddd3e5884a7ea49222c4bc4fcda045354d60380db267279d2524aa82
-  data.tar.gz: 7367fbc57dec1cf102cd69de072bf0f8a57d0a01fc895bcdf376c32163568b11
+  metadata.gz: eec7df4dfcbb98ec9f6a1a8b005730b679469b7cb2f3988066ad8bbeef97d705
+  data.tar.gz: 52c89e5c4b99a86e491192b32ab9cc7b156bf6c7d2060e5825c529b01c733ae1
 SHA512:
-  metadata.gz: 45d9725ff2c9b1b1db1fcd426edf33fdbfd3709274cbe9f172483ec86e315173fd342d520a2ffa05e55ac5df3a1bb633a06325120550bbdd78b271b7c2038f35
-  data.tar.gz: 69812b1f0fe041ed416b82a8fdc7af1408ae3e642f11917541a3277ba69e65ef2b52feb85fd5a9fec52da25bb3688dfd2e8bf0c4edc0b9bd6896efc0f2eccce9
+  metadata.gz: 2f8e1372befecc7c33904ff5f267ae05b762c5343d771d65f5cc0518505ff406c304bd497b131884190c8a198d0a4f84dcc57eb0cf0277572c5c42035a4f51d9
+  data.tar.gz: 34a3a70bcffa3c1afd591e710c51ba7ce886ee69dad70e60a585793848bfadb8691cd233d6ec1a2e953b6a8e5990ffd566664b1f17adbf8d602d2d78ef49a555

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History for gapic-generator-cloud
 
+### 0.4.2 / 2020-04-28
+
+* Includes changes from gapic-generator 0.4.2
+* Eliminate a circular require in generated wrappers.
+
+### 0.4.1 / 2020-04-23
+
+* Wrapper templates honor overridden namespaces.
+* Support setting the gem namespace from the docker interface.
+
 ### 0.4.0 / 2020-04-20
 
 * Includes changes from gapic-generator 0.4.0

data/bin/ruby-cloud-docker-entrypoint

@@ -28,6 +28,7 @@ bool_option_map = {
 value_option_map = {
   "configuration" => "ruby-cloud-config",
   ":gem.:name" => "ruby-cloud-gem-name",
+  ":gem.:namespace" => "ruby-cloud-gem-namespace",
   ":gem.:title" => "ruby-cloud-title",
   ":gem.:description" => "ruby-cloud-description",
   ":gem.:summary" => "ruby-cloud-summary",

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

@@ -18,7 +18,7 @@
 module Gapic
   module Generator
     module Cloud
-      VERSION = "0.4.0"
+      VERSION = "0.4.2"
     end
   end
 end

data/templates/cloud/service/client/_credentials.erb

@@ -3,7 +3,7 @@
 require "googleauth"
 <% end %>
 # Credentials for the <%= service.name %> API.
-class <%= service.credentials_name %> < Google::Auth::Credentials
+class <%= service.credentials_name %> < ::Google::Auth::Credentials
   <%- if service.client_scopes.any? -%>
   self.scope = [
   <%- service.client_scopes.each_with_index do |client_scope, index| -%>

data/templates/cloud/service/client/_self_configure.erb

@@ -1,6 +1,6 @@
 <%- assert_locals service -%>
 @configure ||= begin
-  namespace = <%= service.namespace.split("::").inspect %>
+  namespace = <%= service.namespace.split("::").reject(&:empty?).inspect %>
   parent_config = while namespace.any?
                     parent_name = namespace.join "::"
                     parent_const = const_get parent_name

data/templates/cloud/service/client/method/def/_rescue.erb

@@ -1,3 +1,3 @@
  <%- assert_locals method -%>
-rescue GRPC::BadStatus => e
-  raise Google::Cloud::Error.from_error(e)
+rescue ::GRPC::BadStatus => e
+  raise ::Google::Cloud::Error.from_error(e)

data/templates/cloud/service/client/method/docs/_error.erb

@@ -1,2 +1,2 @@
 <%- assert_locals method -%>
-# @raise [Google::Cloud::Error] if the RPC is aborted.
+# @raise [::Google::Cloud::Error] if the RPC is aborted.

data/templates/cloud/wrapper_gem/_main.erb

@@ -1,45 +1,50 @@
 <%- assert_locals gem -%>
 <% @requires = capture do %>
+# Require this file early so that the version constant gets defined before
+# requiring "google/cloud". This is because google-cloud-core will load the
+# entrypoint (gem name) file, which in turn re-requires this file (hence
+# causing a require cycle) unless the version constant is already defined.
 require "<%= gem.version_require %>"
+
 require "googleauth"
 <%- if gem.needs_default_config_block? -%>
 gem "google-cloud-core"
-require "google/cloud" unless defined? Google::Cloud.new
+require "google/cloud" unless defined? ::Google::Cloud.new
 require "google/cloud/config"
 
 # Set the default configuration
-Google::Cloud.configure.add_config! :<%= gem.google_cloud_short_name %> do |config|
-  config.add_field! :credentials,  nil, match: [String, Hash, Google::Auth::Credentials]
-  config.add_field! :lib_name,     nil, match: String
-  config.add_field! :lib_version,  nil, match: String
-  config.add_field! :interceptors, nil, match: Array
-  config.add_field! :timeout,      nil, match: Numeric
-  config.add_field! :metadata,     nil, match: Hash
-  config.add_field! :retry_policy, nil, match: [Hash, Proc]
+::Google::Cloud.configure.add_config! :<%= gem.google_cloud_short_name %> do |config|
+  config.add_field! :credentials,  nil, match: [::String, ::Hash, ::Google::Auth::Credentials]
+  config.add_field! :lib_name,     nil, match: ::String
+  config.add_field! :lib_version,  nil, match: ::String
+  config.add_field! :interceptors, nil, match: ::Array
+  config.add_field! :timeout,      nil, match: ::Numeric
+  config.add_field! :metadata,     nil, match: ::Hash
+  config.add_field! :retry_policy, nil, match: [::Hash, ::Proc]
 end
 <%- end -%>
 <% end %>
 <%- gem.services.each do |service| -%>
 ##
-# Create a new client object for <%= service.name %>.
+# Create a new client object for <%= service.module_name %>.
 #
 # By default, this returns an instance of
-# <%= gem.docs_link version: gem.default_version, class_name: "#{service.name}::Client" %>
+# <%= gem.docs_link version: gem.default_version, class_name: "#{service.module_name}::Client" %>
 # for version <%= gem.default_version.capitalize %> of the API.
 # However, you can specify specify a different API version by passing it in the
-# `version` parameter. If the <%= service.name %> service is
+# `version` parameter. If the <%= service.module_name %> service is
 # supported by that API version, and the corresponding gem is available, the
 # appropriate versioned client will be returned.
 #
 <%- if service.doc_description -%>
-# ## About <%= service.name %>
+# ## About <%= service.module_name %>
 #
 <%= indent service.doc_description(disable_xrefs: true), "# " %>
 #
 <%- end -%>
-# @param version [String, Symbol] The API version to connect to. Optional.
+# @param version [::String, ::Symbol] The API version to connect to. Optional.
 #   Defaults to `:<%= gem.default_version %>`.
-# @return [<%= service.name %>::Client] A client object for the specified version.
+# @return [<%= service.module_name %>::Client] A client object for the specified version.
 #
 def self.<%= service.factory_method_name %> version: :<%= gem.default_version %>, &block
   require "<%= gem.namespace_require %>/#{version.to_s.downcase}"
@@ -49,7 +54,7 @@ def self.<%= service.factory_method_name %> version: :<%= gem.default_version %>
                   .select { |sym| sym.to_s.downcase == version.to_s.downcase.tr("_", "") }
                   .first
   package_module = <%= gem.namespace %>.const_get package_name
-  package_module.const_get(:<%= service.name %>).const_get(:Client).new(&block)
+  package_module.const_get(:<%= service.module_name %>).const_get(:Client).new(&block)
 end
 
 <%- end -%>
@@ -80,11 +85,11 @@ end
 #     * `:retry_codes` (*type:* `Array<String>`) -
 #       The error codes that should trigger a retry.
 #
-# @return [Google::Cloud::Config] The default configuration used by this library
+# @return [::Google::Cloud::Config] The default configuration used by this library
 #
 def self.configure
-  yield Google::Cloud.configure.<%= gem.google_cloud_short_name %> if block_given?
+  yield ::Google::Cloud.configure.<%= gem.google_cloud_short_name %> if block_given?
 
-  Google::Cloud.configure.<%= gem.google_cloud_short_name %>
+  ::Google::Cloud.configure.<%= gem.google_cloud_short_name %>
 end
 <%- end -%>

data/templates/cloud/wrapper_gem/client_test.erb

@@ -14,7 +14,7 @@ class <%= gem.namespace %>::ClientConstructionMinitest < Minitest::Test
       client = <%= gem.namespace %>.<%= service.factory_method_name %> do |config|
         config.credentials = grpc_channel
       end
-      assert_kind_of <%= gem.namespaced_class "#{service.name}::Client", version: gem.default_version %>, client
+      assert_kind_of <%= gem.namespaced_class "#{service.module_name}::Client", version: gem.default_version %>, client
     end
   end
 

data/templates/cloud/wrapper_gem/entrypoint.erb

@@ -1,4 +1,4 @@
 <%- assert_locals gem -%>
 <%= render partial: "shared/header" -%>
 
-require "<%= gem.namespace_require %>"
+require "<%= gem.namespace_require %>" unless defined? <%= gem.namespace %>::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An API Client Generator for Ruby in Ruby!