gapic-generator 0.6.15 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0b5fd921abe9618575956f3eaed4ea23ffbf578c29570934c29a76decdf6cd
-  data.tar.gz: cda02cc92c2249e60b7f1692c2b514ac672b49ff46fc52d543ba4d0e133f4308
+  metadata.gz: 0f7df8b22a84359c27f6074aee1ac25ebdddf7838b8e420a908f9381df4c3217
+  data.tar.gz: dc71fcaf60829fed44ceca3bc9d878a2d6d0787a2e01be0dfbc42d9693ebe6d1
 SHA512:
-  metadata.gz: 6c3c62bb7d3f29cff6ea57b9b959214ee81f79449d649ae87f95171aad06450f000fda15784d33231418d47729eecc4b4130a4bf16cad95b1d76bac48994fa89
-  data.tar.gz: c2500d8e7458361e6450cb661c5380075af7a24a3c5063cdc1e237bfeb7fc1c4083dcb5a6a7f7b8cef3b9242e5bc99089ba2d7a651ddd68cbf720ab91bb81478
+  metadata.gz: cf3382a6c2303247e82b69030eead4bd8f97101b95d34ce00b043d4036ad95eafcd0688e5e79fcea93264d294f530f4453dc5138c73ed76aa1a1e01d273fb666
+  data.tar.gz: 361aa578ba1afdc3fe27d7b617c36926b77458b48a080d03d0f568c9d2a60cb2410a6aa2870acb874a2c963ebed26f8c9e811ba2006473175cf83e02e6ee1ad7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release History for gapic-generator
 
+### 0.7.0 / 2021-02-27
+
+* Update minimum Ruby version to 2.5 for generated libraries.
+* Update supported Rubocop to 1.x for generated libraries.
+
 ### 0.6.15 / 2021-02-22
 
 * Really fixed encoding arguments in executable entrypoints

data/bin/protoc-gen-ruby_gapic

@@ -15,19 +15,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$LOAD_PATH.unshift ::File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift ::File.expand_path("../lib", __dir__)
 require "gapic/runner"
 require "google/protobuf/compiler/plugin.pb"
 
 # Ensure that no encoding conversions are done on STDIN and STDOUT
 # since we are passing binary data back and forth. Otherwise these
 # streams will be mangled on Windows.
-STDIN.binmode
-STDOUT.binmode
+$stdin.binmode
+$stdout.binmode
 
-request = Google::Protobuf::Compiler::CodeGeneratorRequest.decode STDIN.read
+request = Google::Protobuf::Compiler::CodeGeneratorRequest.decode $stdin.read
 
 # Run the request
 response = Gapic::Runner.run request
 
-STDOUT.print response.serialize
+$stdout.print response.serialize

data/lib/gapic/file_formatter.rb

@@ -21,7 +21,8 @@ module Gapic
   ##
   # File Formatter
   class FileFormatter
-    attr_reader :configuration, :files
+    attr_reader :configuration
+    attr_reader :files
 
     ##
     # Create a new file formatter object

data/lib/gapic/formatting_utils.rb

@@ -21,9 +21,9 @@ module Gapic
   # Various string formatting utils
   #
   module FormattingUtils
-    @brace_detector = /\A(?<pre>[^`]*(`[^`]*`[^`]*)*[^`\\])?\{(?<inside>[^\s][^}]*)\}(?<post>.*)\z/m
-    @xref_detector = /\A(?<pre>[^`]*(`[^`]*`[^`]*)*)?\[(?<text>[\w\. `-]+)\]\[(?<addr>[\w\.]+)\](?<post>.*)\z/m
-    @list_element_detector = /\A\s*(\*|\+|-|[0-9a-zA-Z]+\.)\s/
+    @brace_detector = /\A(?<pre>[^`]*(?:`[^`]*`[^`]*)*[^`\\])?\{(?<inside>[^\s][^}]*)\}(?<post>.*)\z/m
+    @xref_detector = /\A(?<pre>[^`]*(?:`[^`]*`[^`]*)*)?\[(?<text>[\w. `-]+)\]\[(?<addr>[\w.]+)\](?<post>.*)\z/m
+    @list_element_detector = /\A\s*(?:\*|\+|-|[0-9a-zA-Z]+\.)\s/
     @omit_lines = ["@InputOnly\n", "@OutputOnly\n"]
 
     class << self
@@ -76,7 +76,7 @@ module Gapic
       def format_number value
         return value.to_s if value.abs < 10_000
         str = value.is_a?(Integer) ? value.to_s : BigDecimal(value.to_f.to_s).to_s("F")
-        re = /^(-?\d+)(\d\d\d)([_\.][_\.\d]+)?$/
+        re = /^(-?\d+)(\d\d\d)([_.][_.\d]+)?$/
         while (m = re.match str)
           str = "#{m[1]}_#{m[2]}#{m[3]}"
         end

data/lib/gapic/generator/version.rb

@@ -16,6 +16,6 @@
 
 module Gapic
   module Generator
-    VERSION = "0.6.15"
+    VERSION = "0.7.0"
   end
 end

data/lib/gapic/grpc_service_config/method_config.rb

@@ -23,7 +23,8 @@ module Gapic
     # client-side timeout/retry policy
     #
     class MethodConfig
-      attr_reader :timeout_seconds, :retry_policy
+      attr_reader :timeout_seconds
+      attr_reader :retry_policy
 
       ##
       # Create new MethodConfig

data/lib/gapic/grpc_service_config/retry_policy.rb

@@ -21,7 +21,10 @@ module Gapic
     # for the GRPC method invocation. It is embedded into the MethodConfig
     #
     class RetryPolicy
-      attr_reader :initial_delay_seconds, :max_delay_seconds, :multiplier, :status_codes
+      attr_reader :initial_delay_seconds
+      attr_reader :max_delay_seconds
+      attr_reader :multiplier
+      attr_reader :status_codes
 
       ##
       # Create new ParsedRetryPolicy.

data/lib/gapic/grpc_service_config/service_config.rb

@@ -22,7 +22,8 @@ module Gapic
     # applied to the specific methods
     #
     class ServiceConfig
-      attr_reader :service_level_configs, :service_method_level_configs
+      attr_reader :service_level_configs
+      attr_reader :service_method_level_configs
 
       ##
       # Create new ServiceConfig.

data/lib/gapic/path_pattern/parser.rb

@@ -87,7 +87,7 @@ module Gapic
       # @private
       def self.try_capture_complex_resource_id_segment url_pattern
         complex_resource_id_regex =
-          %r/^(?<segment_pattern>{(?<name_first>[^\/}]+?)}(?:(?<separator>[_\-~\.]){(?<name_seq>[^\/}]+?)})+)(?:\/|$)/
+          %r/^(?<segment_pattern>{(?<name_first>[^\/}]+?)}(?:(?<separator>[_\-~.]){(?<name_seq>[^\/}]+?)})+)(?:\/|$)/
 
         return nil, url_pattern unless complex_resource_id_regex.match? url_pattern
 

data/lib/gapic/path_pattern/pattern.rb

@@ -29,7 +29,8 @@ module Gapic
     #   @return [Array<PositionalSegment|ResourceIdSegment|CollectionIdSegment>]
     #     The parsed segments of the path pattern
     class Pattern
-      attr_reader :path_pattern, :segments
+      attr_reader :path_pattern
+      attr_reader :segments
 
       def initialize path_pattern, segments
         @path_pattern = path_pattern

data/lib/gapic/path_pattern/segment.rb

@@ -29,7 +29,10 @@ module Gapic
     #   @return [String] The pattern of the segment, for the positional segment it is also
     #     a pattern of its resource
     class PositionalSegment
-      attr_reader :type, :position, :pattern
+      attr_reader :type
+      attr_reader :position
+      attr_reader :pattern
+
       def initialize position, pattern
         @type       = :positional
         @position   = position
@@ -117,7 +120,10 @@ module Gapic
     #   @return [Array<String>] The resource patterns associated with
     #     the resource_names of this segment
     class ResourceIdSegment
-      attr_reader :type, :pattern, :resource_names, :resource_patterns
+      attr_reader :type
+      attr_reader :pattern
+      attr_reader :resource_names
+      attr_reader :resource_patterns
 
       def initialize type, pattern, resource_names, resource_patterns = []
         @type              = type
@@ -216,7 +222,8 @@ module Gapic
     #   @return [String] The pattern of the segment, for the positional segment it is also
     #     a pattern of its resource
     class CollectionIdSegment
-      attr_reader :type, :pattern
+      attr_reader :type
+      attr_reader :pattern
 
       def initialize pattern
         @type     = :collection_id

data/lib/gapic/presenters/package_presenter.rb

@@ -77,7 +77,7 @@ module Gapic
       end
 
       def package_file_path
-        package_require + ".rb"
+        "#{package_require}.rb"
       end
 
       def package_directory_name
@@ -89,7 +89,7 @@ module Gapic
       end
 
       def helpers_file_path
-        helpers_require + ".rb"
+        "#{helpers_require}.rb"
       end
 
       def helpers_file_name
@@ -97,7 +97,7 @@ module Gapic
       end
 
       def helpers_require
-        package_require + "/_helpers"
+        "#{package_require}/_helpers"
       end
 
       ##

data/lib/gapic/presenters/resource_presenter.rb

@@ -59,7 +59,8 @@ module Gapic
           @path_string = build_path_string
         end
 
-        attr_reader :pattern, :path_string
+        attr_reader :pattern
+        attr_reader :path_string
 
         def useful_for_helpers?
           !@parsed_pattern.positional_segments? && !@parsed_pattern.nontrivial_pattern_segments?

data/lib/gapic/presenters/sample_presenter.rb

@@ -58,7 +58,12 @@ module Gapic
       # Representation of a request field.
       #
       class RequestField
-        attr_reader :field, :value, :input_parameter, :comment, :value_is_file
+        attr_reader :field
+        attr_reader :value
+        attr_reader :input_parameter
+        attr_reader :comment
+        attr_reader :value_is_file
+
         def initialize field
           @field = field["field"]
           @value = convert field["value"]

data/lib/gapic/presenters/service_presenter.rb

@@ -144,7 +144,7 @@ module Gapic
       end
 
       def service_file_path
-        service_require + ".rb"
+        "#{service_require}.rb"
       end
 
       def service_file_name
@@ -180,7 +180,7 @@ module Gapic
       end
 
       def client_file_path
-        client_require + ".rb"
+        "#{client_require}.rb"
       end
 
       def client_file_name
@@ -220,7 +220,7 @@ module Gapic
       end
 
       def credentials_file_path
-        credentials_require + ".rb"
+        "#{credentials_require}.rb"
       end
 
       def credentials_file_name
@@ -232,7 +232,7 @@ module Gapic
       end
 
       def helpers_file_path
-        helpers_require + ".rb"
+        "#{helpers_require}.rb"
       end
 
       def helpers_file_name
@@ -260,7 +260,7 @@ module Gapic
       end
 
       def paths_file_path
-        paths_require + ".rb"
+        "#{paths_require}.rb"
       end
 
       def paths_file_name
@@ -308,7 +308,7 @@ module Gapic
       end
 
       def operations_file_path
-        operations_require + ".rb"
+        "#{operations_require}.rb"
       end
 
       def operations_file_name

data/lib/gapic/schema/api.rb

@@ -39,7 +39,8 @@ module Gapic
     #   @return [Array<Enum>] The top level enums seen across all files in
     #     this API.
     class Api
-      attr_accessor :request, :files
+      attr_accessor :request
+      attr_accessor :files
 
       # Initializes an API object with the file descriptors that represent the
       # API.
@@ -50,7 +51,7 @@ module Gapic
       #   The request parameters schema to use
       # @param error_output [IO] An IO to write any errors/warnings to.
       # @param configuration [Hash] Optional override of configuration.
-      def initialize request, parameter_schema: nil, error_output: STDERR, configuration: nil
+      def initialize request, parameter_schema: nil, error_output: $stderr, configuration: nil
         @request = request
         loader = Loader.new
         @files = request.proto_file.map do |fd|
@@ -359,7 +360,7 @@ module Gapic
       # split the string on periods, but map backslash-escaped periods to
       # literal periods.
       def parse_key str
-        str.scan(/\.|\\.|[^\.\\]+/)
+        str.scan(/\.|\\.|[^.\\]+/)
            .each_with_object([String.new]) do |tok, arr|
              if tok == "."
                arr.append String.new

data/lib/gapic/schema/parameter_schema.rb

@@ -19,7 +19,10 @@ module Gapic
     # Contains information about known parameter names
     # and the types expected to be parsed from the request options string
     class ParameterSchema
-      attr_accessor :bool_params, :string_params, :array_params, :map_params
+      attr_accessor :bool_params
+      attr_accessor :string_params
+      attr_accessor :array_params
+      attr_accessor :map_params
 
       # Creates a schema with given alias-parameter maps
       # @param bool_params [Hash{String => String}]

data/lib/gapic/schema/request_parameter.rb

@@ -19,7 +19,11 @@ module Gapic
     # Encapsulates information that is parsed from a single command line parameter
     # from the plugin_opt command line
     class RequestParameter
-      attr_reader :input_str, :input_name, :input_value, :config_name, :config_value
+      attr_reader :input_str
+      attr_reader :input_name
+      attr_reader :input_value
+      attr_reader :config_name
+      attr_reader :config_value
 
       # @param input_str [String] the input string containing parameter and value
       #   that the parameter and value were parsed from

data/lib/gapic/schema/wrappers.rb

@@ -80,7 +80,11 @@ module Gapic
     #       of locations could be recorded in the future.
     class Proto
       extend Forwardable
-      attr_reader :descriptor, :address, :docs
+
+      attr_reader :descriptor
+      attr_reader :address
+      attr_reader :docs
+
       attr_accessor :parent
 
       # Initializes a Proto object.
@@ -228,6 +232,7 @@ module Gapic
     #   @ return [Enumerable<Method>] The methods of this service.
     class Service < Proto
       extend Forwardable
+
       attr_reader :methods
 
       # Initializes a Service object.
@@ -292,7 +297,9 @@ module Gapic
     #   @ return [Message] The output message of this method.
     class Method < Proto
       extend Forwardable
-      attr_reader :input, :output
+
+      attr_reader :input
+      attr_reader :output
 
       # Initializes a method object.
       # @param descriptor [Google::Protobuf::MethodDescriptorProto] the
@@ -370,7 +377,12 @@ module Gapic
     #     this file.
     class File < Proto
       extend Forwardable
-      attr_reader :messages, :enums, :services, :resources, :registry
+
+      attr_reader :messages
+      attr_reader :enums
+      attr_reader :services
+      attr_reader :resources
+      attr_reader :registry
 
       # Initializes a message object.
       # @param descriptor [Google::Protobuf::DescriptorProto] the protobuf
@@ -447,6 +459,7 @@ module Gapic
     #   @ return [EnumValue] the EnumValues contained in this file.
     class Enum < Proto
       extend Forwardable
+
       attr_reader :values
 
       # Initializes a message object.
@@ -479,17 +492,6 @@ module Gapic
     class EnumValue < Proto
       extend Forwardable
 
-      # Initializes a message object.
-      # @param descriptor [Google::Protobuf::DescriptorProto] the protobuf
-      #   representation of this service.
-      # @param address [Enumerable<String>] The address of the proto. See
-      #   #address for more info.
-      # @param docs [Google::Protobuf::SourceCodeInfo::Location] The docs
-      #   of the proto. See #docs for more info.
-      def initialize descriptor, address, docs
-        super descriptor, address, docs
-      end
-
       # @!method name
       #   @return [String] the unqualified name of the EnumValue
       # @!method number
@@ -520,7 +522,12 @@ module Gapic
     #   @ return [Enumerable<Enum>] The nested enum declarations of a message.
     class Message < Proto
       extend Forwardable
-      attr_reader :fields, :extensions, :resource, :nested_messages, :nested_enums
+
+      attr_reader :fields
+      attr_reader :extensions
+      attr_reader :resource
+      attr_reader :nested_messages
+      attr_reader :nested_enums
 
       # Initializes a message object.
       # @param descriptor [Google::Protobuf::DescriptorProto] the protobuf
@@ -583,8 +590,9 @@ module Gapic
     #      otherwise.
     class Field < Proto
       extend Forwardable
-      attr_reader :message, :enum
-      attr_writer :message, :enum
+
+      attr_accessor :message
+      attr_accessor :enum
 
       # Initializes a message object.
       # @param descriptor [Google::Protobuf::FieldDescriptorProto] the
@@ -784,7 +792,12 @@ module Gapic
     #   @return [Array<Gapic::Schema::Resource>] Parent resources
     class Resource
       extend Forwardable
-      attr_reader :descriptor, :parsed_patterns, :parsed_parent_patterns, :parent_resources
+
+      attr_reader :descriptor
+      attr_reader :parsed_patterns
+      attr_reader :parsed_parent_patterns
+      attr_reader :parent_resources
+
       attr_accessor :parent
 
       # Initializes a resource object.

data/lib/gapic/uri_template/parser.rb

@@ -25,13 +25,11 @@ module Gapic
     #   @return [Array<Segment|String>] The segments of the parsed path pattern.
     module Parser
       # @private
-      # /((?<positional>\*\*?)|{(?<name>[^\/]+?)(?:=(?<template>.+?))?})/
+      # `/(?<positional>\*\*?)|{(?<name>[^\/]+?)(?:=(?<template>.+?))?}/`
       URI_TEMPLATE = %r{
-        (
-          (?<positional>\*\*?)
-          |
-          {(?<name>[^\/]+?)(?:=(?<template>.+?))?}
-        )
+        (?<positional>\*\*?)
+        |
+        {(?<name>[^/]+?)(?:=(?<template>.+?))?}
       }x.freeze
 
       def self.parse_arguments uri_template

data/templates/default/gem/gemspec.erb

@@ -21,13 +21,13 @@ Gem::Specification.new do |gem|
                       <%= gem.extra_files.inspect %>
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = ">= 2.4"
+  gem.required_ruby_version = ">= 2.5"
 
   <%- 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"
+  gem.add_development_dependency "google-style", "~> 1.25.1"
   gem.add_development_dependency "minitest", "~> 5.14"
   gem.add_development_dependency "minitest-focus", "~> 1.1"
   gem.add_development_dependency "minitest-rg", "~> 5.2"

data/templates/default/gem/rubocop.erb

@@ -8,14 +8,14 @@ AllCops:
     - "proto_docs/**/*"
     - "test/**/*"
 
+Layout/LineLength:
+  Enabled: false
 Metrics/AbcSize:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
 Metrics/CyclomaticComplexity:
   Enabled: false
-Metrics/LineLength:
-  Enabled: false
 Metrics/MethodLength:
   Enabled: false
 Metrics/ModuleLength:
@@ -25,13 +25,3 @@ Metrics/PerceivedComplexity:
 Naming/FileName:
   Exclude:
     - "lib/<%= gem.name %>.rb"
-Naming/PredicateName:
-  Enabled: false
-Style/AsciiComments:
-  Enabled: false
-Style/CaseEquality:
-  Enabled: false
-Style/IfUnlessModifier:
-  Enabled: false
-Style/ModuleFunction:
-  Enabled: false

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 defined?(@parent_config) && @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
@@ -149,7 +149,7 @@ class Configuration
     # @private
     def initialize parent_rpcs = nil
       <%- method_service.methods.each do |method| -%>
-      <%= method.name %>_config = parent_rpcs&.<%= method.name %> if parent_rpcs&.respond_to? :<%= method.name %>
+      <%= method.name %>_config = parent_rpcs.<%= method.name %> if parent_rpcs.respond_to? :<%= method.name %>
       @<%= method.name %> = ::Gapic::Config::Method.new <%= method.name %>_config
       <%- end -%>
 

data/templates/default/service/test/method/_normal.erb

@@ -65,7 +65,7 @@ def test_<%= method.name %>
     end
 
     # Use protobuf object with options
-    client.<%= method.name %> <%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>), grpc_options do |response, operation|
+    client.<%= method.name %>(<%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>), grpc_options) do |response, operation|
       <%= indent_tail render(partial: "service/test/method/assert_response", locals: { method: method }), 6 %>
     end
 

data/templates/default/service/test/method/_server.erb

@@ -79,7 +79,7 @@ def test_<%= method.name %>
     end
 
     # Use protobuf object with options
-    client.<%= method.name %> <%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>), grpc_options do |response, operation|
+    client.<%= method.name %>(<%= method.request_type %>.new(<%= fields.map(&:as_kwarg).join ", " %>), grpc_options) do |response, operation|
       assert_kind_of Enumerable, response
       response.to_a.each do |r|
         assert_kind_of <%= method.return_type %>, r

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gapic-generator
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.7.0
 platform: ruby
 authors:
 - Ernest Landrito
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -46,28 +46,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: 1.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: 1.36.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -341,14 +341,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.11
 signing_key: 
 specification_version: 4
 summary: An API Client Generator for Ruby in Ruby!