gapic-generator 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aaec7f146400572f3b4ad346c8a69849ff3903073eadabd7eec6f6e882d6bb9
-  data.tar.gz: 39987ab08fe97c6e4acdcfe3357e398df99db73f2ab95960c8c1015456f79224
+  metadata.gz: 19f79c05f4e657a010e8f9663f1eefeadabd18ef4b456c137a8278bf8bb13a9e
+  data.tar.gz: ebe4c8c756ebd1e18424eccffc986f92bcda6f694a50842ed394c7d62d91f252
 SHA512:
-  metadata.gz: 87bfd8d75d938d8e82ff4fc5b17aab92260dedb745faf47c5abda914920145d85a0415c43ddc57126bd7942fe1b76801ed53d4a2d0b14f851adb3539ce34d0c6
-  data.tar.gz: 89e9820c8f7ba98c77165e3ff0fb38ae2b84b333873bf458ca7c87dca1e0a38c7a09f5940027fe081a2589ef429488ebd7bad94284bc343b918faf414486296b
+  metadata.gz: 4a6689a12fcd02390d416ab8ada828f79e182e87a3230361fe32e3a8eea42d7555039b61c699903d25a5fb244c9db1857bbad1d816ea04e4de329d67c4359c74
+  data.tar.gz: fac5801f38bb3fd92b871c2c5ab9b2d7ee7138d0947ffb0c9695bd21ea0561762fee5dc462de884b5182cbf4627c5c9148783474584b6cb4c9dc7727313f7f1c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release History for gapic-generator
 
+### 0.6.0 / 2020-06-02
+
+* Support for clients with generic endpoint and credentials.
+* Support for adding extra dependencies.
+* Fixed a Ruby warning when looking up RPC-scoped configs with no parent.
+* Internal: Presenters reference their parent rather than creating new objects.
+
 ### 0.5.1 / 2020-05-21
 
 * Support a configuration for overriding service module names.

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

data/lib/gapic/generators/default_generator.rb

@@ -41,10 +41,10 @@ module Gapic
       # @return [Array<
       #   Google::Protobuf::Compiler::CodeGeneratorResponse::File>]
       #   The files that were generated for the API.
-      def generate
+      def generate gem_presenter: nil
         files = []
 
-        gem = Gapic::Presenters.gem_presenter @api
+        gem = gem_presenter || Gapic::Presenters.gem_presenter(@api)
 
         gem.packages.each do |package|
           # Package level files
@@ -54,7 +54,7 @@ module Gapic
             # Service level files
             files << g("service.erb",                        "lib/#{service.service_file_path}",                 service: service)
             files << g("service/client.erb",                 "lib/#{service.client_file_path}",                  service: service)
-            files << g("service/credentials.erb",            "lib/#{service.credentials_file_path}",             service: service)
+            files << g("service/credentials.erb",            "lib/#{service.credentials_file_path}",             service: service) unless gem.generic_endpoint?
             files << g("service/paths.erb",                  "lib/#{service.paths_file_path}",                   service: service) if service.paths?
             files << g("service/operations.erb",             "lib/#{service.operations_file_path}",              service: service) if service.lro?
             files << g("service/test/client.erb",            "test/#{service.test_client_file_path}",            service: service)

data/lib/gapic/presenters/gem_presenter.rb

@@ -33,7 +33,7 @@ module Gapic
       def packages
         @packages ||= begin
           packages = @api.generate_files.map(&:package).uniq.sort
-          packages.map { |p| PackagePresenter.new @api, p }.delete_if(&:empty?)
+          packages.map { |p| PackagePresenter.new self, @api, p }.delete_if(&:empty?)
         end
       end
 
@@ -44,7 +44,7 @@ module Gapic
       def services
         @services ||= begin
           files = @api.generate_files
-          files.map(&:services).flatten.map { |s| ServicePresenter.new @api, s }
+          files.map(&:services).flatten.map { |s| ServicePresenter.new self, @api, s }
         end
       end
 
@@ -147,10 +147,36 @@ module Gapic
         gem_config(:yard_strict) != "false"
       end
 
+      def generic_endpoint?
+        gem_config(:generic_endpoint) == "true"
+      end
+
       def entrypoint_require
         packages.first.package_require
       end
 
+      def license_name
+        "MIT"
+      end
+
+      def extra_files
+        ["README.md", "LICENSE.md", ".yardopts"]
+      end
+
+      def dependencies
+        deps = { "gapic-common" => "~> 0.2" }
+        deps["grpc-google-iam-v1"] = [">= 0.6.10", "< 2.0"] if iam_dependency?
+        extra_deps = gem_config :extra_dependencies
+        deps.merge! extra_deps if extra_deps
+        deps
+      end
+
+      def dependency_list
+        dependencies.to_a
+                    .map { |name, requirements| [name, Array(requirements)] }
+                    .sort_by { |name, _requirements| name }
+      end
+
       private
 
       def gem_config key

data/lib/gapic/presenters/method_presenter.rb

@@ -27,13 +27,14 @@ module Gapic
     class MethodPresenter
       include Gapic::Helpers::NamespaceHelper
 
-      def initialize api, method
+      def initialize service_presenter, api, method
+        @service_presenter = service_presenter
         @api = api
         @method = method
       end
 
       def service
-        ServicePresenter.new @api, @method.parent
+        @service_presenter
       end
 
       def name

data/lib/gapic/presenters/package_presenter.rb

@@ -27,13 +27,14 @@ module Gapic
       include Gapic::Helpers::FilepathHelper
       include Gapic::Helpers::NamespaceHelper
 
-      def initialize api, package
+      def initialize gem_presenter, api, package
+        @gem_presenter = gem_presenter
         @api = api
         @package = package
       end
 
       def gem
-        GemPresenter.new @api
+        @gem_presenter
       end
 
       def name
@@ -63,7 +64,7 @@ module Gapic
           normal_services = services.select { |s| @api.delegate_service_for(s).nil? }
           # But include common services that delegate to normal services in this package.
           common_services = normal_services.flat_map { |s| @api.common_services_for s }
-          (normal_services + common_services).map { |s| ServicePresenter.new @api, s }
+          (normal_services + common_services).map { |s| ServicePresenter.new @gem_presenter, @api, s }
         end
       end
 

data/lib/gapic/presenters/service_presenter.rb

@@ -27,14 +27,15 @@ module Gapic
       include Gapic::Helpers::FilepathHelper
       include Gapic::Helpers::NamespaceHelper
 
-      def initialize api, service, parent_service: nil
+      def initialize gem_presenter, api, service, parent_service: nil
+        @gem_presenter = gem_presenter
         @api = api
         @service = service
         @parent_service = parent_service
       end
 
       def gem
-        GemPresenter.new @api
+        @gem_presenter
       end
 
       def file
@@ -42,12 +43,12 @@ module Gapic
       end
 
       def package
-        PackagePresenter.new @api, @service.parent.package
+        PackagePresenter.new @gem_presenter, @api, @service.parent.package
       end
 
       def methods
         @methods ||= begin
-          @service.methods.map { |m| MethodPresenter.new @api, m }
+          @service.methods.map { |m| MethodPresenter.new self, @api, m }
         end
       end
 
@@ -60,7 +61,7 @@ module Gapic
       def common_service_delegate
         unless defined? @common_service_delegate
           delegate = @api.delegate_service_for @service
-          @common_service_delegate = delegate ? ServicePresenter.new(@api, delegate) : nil
+          @common_service_delegate = delegate ? ServicePresenter.new(@gem_presenter, @api, delegate) : nil
         end
         @common_service_delegate
       end
@@ -187,6 +188,7 @@ module Gapic
       end
 
       def client_endpoint
+        return nil if generic_endpoint?
         @parent_service&.client_endpoint ||
           common_service_delegate&.client_endpoint ||
           @service.host ||
@@ -194,6 +196,10 @@ module Gapic
           "localhost"
       end
 
+      def generic_endpoint?
+        gem.generic_endpoint?
+      end
+
       def client_scopes
         common_service_delegate&.client_scopes ||
           @service.scopes ||
@@ -314,7 +320,7 @@ module Gapic
 
       def lro_service
         lro = @service.parent.parent.files.find { |file| file.name == "google/longrunning/operations.proto" }
-        return ServicePresenter.new @api, lro.services.first, parent_service: self unless lro.nil?
+        return ServicePresenter.new @gem_presenter, @api, lro.services.first, parent_service: self unless lro.nil?
       end
 
       def config_channel_args

data/templates/default/gem/gemspec.erb

@@ -12,20 +12,19 @@ Gem::Specification.new do |gem|
   gem.description   = <%= gem.description.inspect %>
   gem.summary       = <%= gem.summary.inspect %>
   gem.homepage      = <%= gem.homepage.inspect %>
-  gem.license       = "MIT"
+  gem.license       = <%= gem.license_name.inspect %>
 
   gem.platform      = Gem::Platform::RUBY
 
   gem.files         = `git ls-files -- lib/*`.split("\n") +
                       `git ls-files -- proto_docs/*`.split("\n") +
-                      ["README.md", "LICENSE.md", ".yardopts"]
+                      <%= gem.extra_files.inspect %>
   gem.require_paths = ["lib"]
 
   gem.required_ruby_version = ">= 2.4"
 
-  gem.add_dependency "gapic-common", "~> 0.2"
-  <%- if gem.iam_dependency? -%>
-  gem.add_dependency "grpc-google-iam-v1", ">= 0.6.10", "< 2.0"
+  <%- gem.dependency_list.each do |name, requirements| -%>
+  gem.add_dependency <%= name.inspect %>, <%= requirements.map { |v| v.inspect }.join ", " %>
   <%- end -%>
 
   gem.add_development_dependency "google-style", "~> 1.24.0"

data/templates/default/lib/_service.erb

@@ -6,7 +6,9 @@ require "gapic/config/method"
 
 require "<%= service.gem.version_require %>"
 
+<%- unless service.generic_endpoint? -%>
 require "<%= service.credentials_require %>"
+<%- end -%>
 <%- if service.paths? -%>
 require "<%= service.paths_require %>"
 <%- end -%>

data/templates/default/service/client/_client.erb

@@ -96,10 +96,12 @@ class <%= service.client_name %>
 
     # Create credentials
     credentials = @config.credentials
+    <%- unless service.generic_endpoint? -%>
     credentials ||= Credentials.default scope: @config.scope
     if credentials.is_a?(String) || credentials.is_a?(Hash)
       credentials = Credentials.new credentials, scope: @config.scope
     end
+    <%- end -%>
     @quota_project_id = @config.quota_project
     @quota_project_id ||= credentials.quota_project_id if credentials.respond_to? :quota_project_id
 

data/templates/default/service/client/_config.erb

@@ -115,7 +115,7 @@ class Configuration
   def rpcs
     @rpcs ||= begin
       parent_rpcs = nil
-      parent_rpcs = @parent_config.rpcs if @parent_config&.respond_to? :rpcs
+      parent_rpcs = @parent_config.rpcs if defined?(@parent_config) && @parent_config&.respond_to?(:rpcs)
       Rpcs.new parent_rpcs
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack