gapic-generator-cloud 0.3.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c441fdc1fa39c04dd899ecdf54220aee63f9c37e612f7967f29fec9760370c
-  data.tar.gz: c7946bf5da749801f61af89282bb581958efe12c891fe6288c827f9496298712
+  metadata.gz: '02926a88b55343003c21f8032beb370d1bbdb2ae37ebf88aefe0ddd4d40a69df'
+  data.tar.gz: ced33bd5a212b6bd52a31bb9a49eee2913423a0350bfea48f33d18ced6ca3a83
 SHA512:
-  metadata.gz: 382a4df1000768f154070a62776dd9bf36d64326771addc29e5f7a904643657f6c0f68300e2e7d1f1b664afc7402dd0b68882f1023cb10eb9da534e544c21494
-  data.tar.gz: c43058e550a06efffd832b7b7437d97da4f847824291bd738470850238a3bcbe9671ab1b15afe1f12280e19a3e4cfe0dc10cf3cd746aba70f5ea4c6e3fdec300
+  metadata.gz: 7ceca5878427fafb3b122924851298a99addaa2832ff45eb3219178cbb63e31545a91504909e54c1c05d945a75967c3f98680e4a2dbf0728270269ae5ba18bd1
+  data.tar.gz: 82e55f290ca429d499158c9f33342e3895b06c6de1e2d1d37eee88718561501444f713503279c04d4fb7bd13fbf41d42b98cae4293d6a3edb8940f014057e1a3

data/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Release History for gapic-generator-cloud
 
+### 0.6.0 / 2020-06-02
+
+* Includes changes from gapic-generator 0.6.0.
+* Support for clients with generic endpoint and credentials.
+* Support for adding extra dependencies.
+* Fix the logic determining whether a wrapper needs a separate entrypoint file.
+* Disable Metrics/BlockLength check for all sample tests.
+
+### 0.5.1 / 2020-05-21
+
+* Includes changes from gapic-generator 0.5.1
+
+### 0.5.0 / 2020-05-19
+
+* Includes changes from gapic-generator 0.5.0
+* Wrappers now support partial-gapic helpers.
+* Generated configs for wrappers now include endpoint and scope.
+
+### 0.4.3 / 2020-05-01
+
+* Unpin minitest in the generated wrappers.
+
+### 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
+* 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,13 +18,18 @@
 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"
+  ":gem.:yard_strict" => "ruby-cloud-yard-strict",
+  ":gem.:generic_endpoint" => "ruby-cloud-generic-endpoint"
 }
+
+# Value options always take string values.
 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",
@@ -36,15 +41,30 @@ 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"
+  ":overrides.:namespace" => "ruby-cloud-namespace-override",
+  ":overrides.:service" => "ruby-cloud-service-override",
+  ":gem.:extra_dependencies" => "ruby-cloud-extra-dependencies"
 }
 
+# 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 +92,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 +116,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.6.0"
     end
   end
 end

data/lib/gapic/generators/cloud_generator.rb

@@ -16,6 +16,7 @@
 
 require "gapic/generators/default_generator"
 require "gapic/presenters"
+require "gapic/presenters/cloud_gem_presenter"
 require "gapic/presenters/wrapper_gem_presenter"
 
 module Gapic
@@ -42,19 +43,19 @@ module Gapic
       # @return [Array<
       #   Google::Protobuf::Compiler::CodeGeneratorResponse::File>]
       #   The files that were generated for the API.
-      def generate
+      def generate gem_presenter: nil
         gem_config = @api.configuration[:gem] ||= {}
         return generate_wrapper if gem_config[:version_dependencies]
 
-        orig_files = super
-
-        cloud_files = []
-
-        gem = Gapic::Presenters.gem_presenter @api
+        gem = gem_presenter || Gapic::Presenters.cloud_gem_presenter(@api)
+        orig_files = super gem_presenter: gem
 
         # Additional Gem level files
-        cloud_files << g("gem/repo-metadata.erb",  ".repo-metadata.json", gem: gem)
-        cloud_files << g("gem/authentication.erb", "AUTHENTICATION.md",   gem: gem) unless gem.services.empty?
+        cloud_files = []
+        cloud_files << g("gem/repo-metadata.erb", ".repo-metadata.json", gem: gem)
+        unless gem.services.empty? || gem.generic_endpoint?
+          cloud_files << g("gem/authentication.erb", "AUTHENTICATION.md", gem: gem)
+        end
 
         format_files cloud_files
 
@@ -79,7 +80,7 @@ module Gapic
         files << g("gem/repo-metadata.erb",        ".repo-metadata.json",                           gem: gem)
         files << g("wrapper_gem/rubocop.erb",      ".rubocop.yml",                                  gem: gem)
         files << g("wrapper_gem/yardopts.erb",     ".yardopts",                                     gem: gem)
-        files << g("gem/authentication.erb",       "AUTHENTICATION.md",                             gem: gem)
+        files << g("gem/authentication.erb",       "AUTHENTICATION.md",                             gem: gem) unless gem.generic_endpoint?
         files << g("gem/changelog.erb",            "CHANGELOG.md",                                  gem: gem)
         files << g("wrapper_gem/gemfile.erb",      "Gemfile",                                       gem: gem)
         files << g("gem/license.erb",              "LICENSE.md",                                    gem: gem)
@@ -89,7 +90,7 @@ module Gapic
         files << g("wrapper_gem/entrypoint.erb",   "lib/#{gem.name}.rb",                            gem: gem) if gem.needs_entrypoint?
         files << g("wrapper_gem/main.erb",         "lib/#{gem.namespace_file_path}",                gem: gem)
         files << g("gem/version.erb",              "lib/#{gem.version_file_path}",                  gem: gem)
-        files << g("wrapper_gem/test_helper.erb",  "test/helper.rb",                                gem: gem)
+        files << g("gem/test_helper.erb",          "test/helper.rb",                                gem: gem)
         files << g("wrapper_gem/client_test.erb",  "test/#{gem.namespace_require}/client_test.rb",  gem: gem)
         files << g("wrapper_gem/version_test.erb", "test/#{gem.namespace_require}/version_test.rb", gem: gem)
 

data/lib/gapic/presenters/cloud_gem_presenter.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "gapic/presenters"
+require "gapic/presenters/wrapper_service_presenter"
+
+module Gapic
+  module Presenters
+    ##
+    # A presenter subclass for cloud gems.
+    #
+    class CloudGemPresenter < GemPresenter
+      def license_name
+        "Apache-2.0"
+      end
+
+      def extra_files
+        return ["README.md", "LICENSE.md", ".yardopts"] if generic_endpoint?
+        ["README.md", "LICENSE.md", "AUTHENTICATION.md", ".yardopts"]
+      end
+
+      def dependencies
+        deps = super
+        deps["google-cloud-errors"] = "~> 1.0"
+        deps
+      end
+    end
+
+    def self.cloud_gem_presenter api
+      CloudGemPresenter.new api
+    end
+  end
+end

data/lib/gapic/presenters/wrapper_gem_presenter.rb

@@ -22,7 +22,7 @@ module Gapic
     ##
     # A presenter for wrapper gems.
     #
-    class WrapperGemPresenter < GemPresenter
+    class WrapperGemPresenter < CloudGemPresenter
       def entrypoint_require
         namespace_require
       end
@@ -30,7 +30,7 @@ module Gapic
       def services
         @services ||= begin
           files = @api.generate_files
-          files.map(&:services).flatten.map { |s| WrapperServicePresenter.new @api, s }
+          files.map(&:services).flatten.map { |s| WrapperServicePresenter.new self, @api, s }
         end
       end
 
@@ -38,12 +38,20 @@ module Gapic
         ruby_file_path @api, namespace
       end
 
+      def main_directory_name
+        namespace_require.split("/").last
+      end
+
+      def helpers_require
+        "#{namespace_require}/helpers"
+      end
+
       def namespace_file_path
         "#{namespace_require}.rb"
       end
 
       def needs_entrypoint?
-        name != namespace_file_path
+        name != namespace_require
       end
 
       def needs_default_config_block?
@@ -54,10 +62,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?
@@ -78,19 +92,24 @@ module Gapic
         gem_config(:version_dependencies).to_s.split(";").map { |str| str.split ":" }
       end
 
-      def gem_version_dependencies
-        version_dependencies.sort_by { |version, _requirement| version }
-                            .map { |version, requirement| ["#{name}-#{version}", requirement] }
-      end
-
       def versioned_gems
-        gem_version_dependencies.map { |name, _requirement| name }
+        version_dependencies.map { |version, _requirement| "#{name}-#{version}" }.sort
       end
 
       def default_version
         version_dependencies.first&.first
       end
 
+      def dependencies
+        deps = { "google-cloud-core" => "~> 1.5" }
+        version_dependencies.each do |version, requirement|
+          deps["#{name}-#{version}"] = "~> #{requirement}"
+        end
+        extra_deps = gem_config :extra_dependencies
+        deps.merge! extra_deps if extra_deps
+        deps
+      end
+
       def google_cloud_short_name
         m = /^google-cloud-(.*)$/.match name
         return nil unless m

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
@@ -22,15 +23,14 @@ module Gapic
     # A presenter for wrapper services.
     #
     class WrapperServicePresenter < ServicePresenter
-      def gem
-        WrapperGemPresenter.new @api
-      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

data/templates/cloud/gem/rakefile.erb

@@ -11,6 +11,7 @@ RuboCop::RakeTask.new
 require "rake/testtask"
 desc "Run tests."
 Rake::TestTask.new do |t|
+  t.libs << "test"
   t.test_files = FileList["test/**/*_test.rb"]
   t.warning = false
 end
@@ -52,7 +53,7 @@ end
 # Acceptance tests
 desc "Run the <%= gem.name %> acceptance tests."
 task :acceptance, :project, :keyfile do |t, args|
-  <%- if service -%>
+  <%- if service && !gem.generic_endpoint? -%>
   project = args[:project]
   project ||=
     ENV["<%= gem.env_prefix %>_TEST_PROJECT"] ||
@@ -78,8 +79,8 @@ task :acceptance, :project, :keyfile do |t, args|
   ENV["<%= gem.env_prefix %>_PROJECT"] = project
   ENV["<%= gem.env_prefix %>_TEST_PROJECT"] = project
   ENV["<%= gem.env_prefix %>_KEYFILE_JSON"] = keyfile
-  <%- end -%>
 
+  <%- end -%>
   Rake::Task["acceptance:run"].invoke
 end
 

data/templates/cloud/gem/readme.erb

@@ -12,6 +12,7 @@
 $ gem install <%= gem.name %>
 ```
 
+<%- unless gem.generic_endpoint? -%>
 ## Before You Begin
 
 In order to use this library, you first need to go through the following steps:
@@ -29,6 +30,7 @@ In order to use this library, you first need to go through the following steps:
 <%- end -%>
 1. {file:AUTHENTICATION.md Set up authentication.}
 
+<%- end -%>
 ## Quick Start
 
 <%- if gem.packages? -%>

data/templates/cloud/gem/yardopts.erb

@@ -10,4 +10,6 @@
 -
 README.md
 LICENSE.md
+<%- unless gem.generic_endpoint? -%>
 AUTHENTICATION.md
+<%- 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,53 @@
 <%- 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! :endpoint,      <%= gem.services.first&.client_endpoint.inspect %>, match: ::String
+  config.add_field! :credentials,   nil, match: [::String, ::Hash, ::Google::Auth::Credentials]
+  config.add_field! :scope,         nil, match: [::Array, ::String]
+  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]
+  config.add_field! :quota_project, nil, match: ::String
 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 +57,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 +88,15 @@ 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 -%>
+<% @footer = capture do %>
+helper_path = ::File.join __dir__, "<%= gem.main_directory_name %>", "helpers.rb"
+require "<%= gem.helpers_require %>" if ::File.file? helper_path
+<% 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

data/templates/cloud/wrapper_gem/gemfile.erb

@@ -3,15 +3,9 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "google-cloud-core", path: "../google-cloud-core"
-gem "google-cloud-env", path: "../google-cloud-env"
-gem "google-cloud-errors", path: "../google-cloud-errors"
-<%- gem.gem_version_dependencies.each do |name, _requirement| -%>
+<%- gem.versioned_gems.each do |name| -%>
 gem "<%= name %>", path: "../<%= name %>"
 <%- end -%>
 
-gem "rake"
-
-# Pin minitest to 5.11.x to avoid warnings emitted by 5.12.
-# See https://github.com/googleapis/google-cloud-ruby/issues/4110
-gem "minitest", "~> 5.11.3"
+# google-protobuf 3.12.0 requires Ruby 2.5 or later, so pin to 3.11 on older Rubies
+gem "google-protobuf", (RUBY_VERSION < "2.5" ? "~> 3.11.4" : "~> 3.12")

data/templates/cloud/wrapper_gem/gemspec.erb

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.description   = <%= gem.description.inspect %>
   gem.summary       = <%= gem.summary.inspect %>
   gem.homepage      = <%= gem.homepage.inspect %>
-  gem.license       = "Apache-2.0"
+  gem.license       = <%= gem.license_name.inspect %>
 
   gem.platform      = Gem::Platform::RUBY
 
@@ -23,17 +23,15 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.4"
 
-  gem.add_dependency "google-cloud-core", "~> 1.5"
-  <%- gem.gem_version_dependencies.each do |name, requirement| -%>
-  gem.add_dependency "<%= name %>", "~> <%= requirement %>"
+  <%- gem.dependency_list.each do |name, requirements| -%>
+  gem.add_dependency <%= name.inspect %>, <%= requirements.map { |v| v.inspect }.join ", " %>
   <%- end -%>
 
-  gem.add_development_dependency "autotest-suffix", "~> 1.1"
   gem.add_development_dependency "google-style", "~> 1.24.0"
-  gem.add_development_dependency "minitest", "~> 5.10"
-  gem.add_development_dependency "minitest-autotest", "~> 1.0"
+  gem.add_development_dependency "minitest", "~> 5.14"
   gem.add_development_dependency "minitest-focus", "~> 1.1"
   gem.add_development_dependency "minitest-rg", "~> 5.2"
+  gem.add_development_dependency "rake", ">= 12.0"
   gem.add_development_dependency "redcarpet", "~> 3.0"
   gem.add_development_dependency "simplecov", "~> 0.9"
   gem.add_development_dependency "yard", "~> 0.9"

data/templates/cloud/wrapper_gem/readme.erb

@@ -32,6 +32,7 @@ for more usage information.
 $ gem install <%= gem.name %>
 ```
 
+<%- unless gem.generic_endpoint? -%>
 In order to use this library, you first need to go through the following steps:
 
 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
@@ -47,6 +48,7 @@ In order to use this library, you first need to go through the following steps:
 <%- end -%>
 1. {file:AUTHENTICATION.md Set up authentication.}
 
+<%- end -%>
 <%- if gem.migration? %>
 ## Migrating from <%= gem.pre_migration_version %> versions
 

data/templates/cloud/wrapper_gem/rubocop.erb

@@ -16,7 +16,7 @@ Documentation:
 
 Metrics/BlockLength:
   Exclude:
-    - "samples/acceptance/*.rb"
+    - "samples/**/acceptance/*.rb"
 
 Naming/FileName:
   Exclude:

data/templates/cloud/wrapper_gem/yardopts.erb

@@ -8,7 +8,9 @@
 ./lib/**/*.rb
 -
 README.md
+<%- unless gem.generic_endpoint? -%>
 AUTHENTICATION.md
+<%- end -%>
 <%- if gem.migration? -%>
 MIGRATING.md
 <%- end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator-cloud
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.6.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-06-02 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.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: google-style
   requirement: !ruby/object:Gem::Requirement
@@ -172,10 +172,10 @@ files:
 - cloud-rubocop.yml
 - lib/gapic/generator/cloud/version.rb
 - lib/gapic/generators/cloud_generator.rb
+- lib/gapic/presenters/cloud_gem_presenter.rb
 - lib/gapic/presenters/wrapper_gem_presenter.rb
 - lib/gapic/presenters/wrapper_service_presenter.rb
 - templates/cloud/gem/authentication.erb
-- templates/cloud/gem/gemspec.erb
 - templates/cloud/gem/gitignore.erb
 - templates/cloud/gem/license.erb
 - templates/cloud/gem/rakefile.erb
@@ -198,7 +198,6 @@ files:
 - templates/cloud/wrapper_gem/rakefile.erb
 - templates/cloud/wrapper_gem/readme.erb
 - templates/cloud/wrapper_gem/rubocop.erb
-- templates/cloud/wrapper_gem/test_helper.erb
 - templates/cloud/wrapper_gem/version_test.erb
 - templates/cloud/wrapper_gem/yardopts.erb
 homepage: https://github.com/googleapis/gapic-generator-ruby
@@ -220,7 +219,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!

data/templates/cloud/gem/gemspec.erb

@@ -1,38 +0,0 @@
-<%- assert_locals gem -%>
-# -*- ruby -*-
-# encoding: utf-8
-require File.expand_path("lib/<%= gem.version_require %>", __dir__)
-
-Gem::Specification.new do |gem|
-  gem.name          = "<%= gem.name %>"
-  gem.version       = <%= gem.version_name_full %>
-
-  gem.authors       = <%= gem.authors.inspect %>
-  gem.email         = <%= gem.email.inspect %>
-  gem.description   = <%= gem.description.inspect %>
-  gem.summary       = <%= gem.summary.inspect %>
-  gem.homepage      = <%= gem.homepage.inspect %>
-  gem.license       = "Apache-2.0"
-
-  gem.platform      = Gem::Platform::RUBY
-
-  gem.files         = `git ls-files -- lib/*`.split("\n") +
-                      `git ls-files -- proto_docs/*`.split("\n") +
-                      ["README.md", "LICENSE.md", "AUTHENTICATION.md", ".yardopts"]
-  gem.require_paths = ["lib"]
-
-  gem.required_ruby_version = ">= 2.4"
-
-  gem.add_dependency "gapic-common", "~> 0.2"
-  gem.add_dependency "google-cloud-errors", "~> 1.0"
-  <%- if gem.iam_dependency? -%>
-  gem.add_dependency "grpc-google-iam-v1", ">= 0.6.10", "< 2.0"
-  <%- end -%>
-
-  gem.add_development_dependency "google-style", "~> 1.24.0"
-  gem.add_development_dependency "minitest", "~> 5.10"
-  gem.add_development_dependency "rake", ">= 12.0"
-  gem.add_development_dependency "redcarpet", "~> 3.0"
-  gem.add_development_dependency "simplecov", "~> 0.18"
-  gem.add_development_dependency "yard", "~> 0.9"
-end

data/templates/cloud/wrapper_gem/test_helper.erb

@@ -1,9 +0,0 @@
-<%- assert_locals gem -%>
-<%= render partial: "shared/header" -%>
-
-require "simplecov"
-
-gem "minitest"
-require "minitest/autorun"
-require "minitest/focus"
-require "minitest/rg"