grpc 1.23.1-universal-darwin → 1.24.0.pre1-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ca1d504bf5ce8f0000758af2b4a09f405b632adf17e30a78a593152a9ca8c05
-  data.tar.gz: 194acf4f5e1d3d688997c625e4e93e7325b8096711f7577a647d0e102503940e
+  metadata.gz: e571cd8230f0b5f27a03b2cce4e8a1b75ead1496f7b4fac6d87463135bd43764
+  data.tar.gz: e279d9d4f1a852ca34b246b8828415d44cfd4f3af6e8d3b34bff7ae68e1d1d63
 SHA512:
-  metadata.gz: 7e3f632661e14939b9882ebfe95a39b9fa061cdf0a8a175b75c6f765563c3f9223408bb2e6539365c91e5da70736309f6d6d82fcfc844b8e04175da258e6a188
-  data.tar.gz: 3c290e58008fdc2d3e573fc552d505f9f98d4ac6e4a38ecf019a7051dbf2803a4f5e9e4eaca5ae5e24f063b1aa5b6dc7380a00e72178ca3f368b5caa3f58b35f
+  metadata.gz: 7f571d34e83e8ac9892040b7b46dd1ecfba98aba0631e9b15a2e5b1257bf47d48a920e078fc9b326f6ef7c15d0a9d00cedd8ea99e22f500c5582ca0bf0677542
+  data.tar.gz: 3fff7f27c4e86b03dfc23da1507e91d5d2fb2f206dd4abdee54c99953c05d04aab2e077feecd0162750f59e8bc88579738bddf1ff2cc61685dbb7969c8ea53de

data/src/ruby/ext/grpc/ext-export.clang

@@ -0,0 +1 @@
+_Init_grpc_c

data/src/ruby/ext/grpc/ext-export.gcc

@@ -0,0 +1,6 @@
+grpc_1.0 { 
+  global: 
+    Init_grpc_c;
+  local: 
+    *;
+};

data/src/ruby/ext/grpc/extconf.rb

@@ -60,6 +60,11 @@ unless windows
 end
 
 $CFLAGS << ' -I' + File.join(grpc_root, 'include')
+
+ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', 'ext-export')
+$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if RUBY_PLATFORM =~ /linux/
+$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if RUBY_PLATFORM =~ /darwin/
+
 $LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows
 if grpc_config == 'gcov'
   $CFLAGS << ' -O0 -fprofile-arcs -ftest-coverage'

data/src/ruby/ext/grpc/rb_enable_cpp.cc

@@ -0,0 +1,22 @@
+/*
+ *
+ * Copyright 2019 gRPC authors.
+ *
+ * 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
+ *
+ *     http://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.
+ *
+ */
+
+#include <ruby/ruby.h>
+
+// This is a dummy C++ source file to trigger ruby extension builder to
+// pick C++ rather than C linker to link with c++ library properly.

data/src/ruby/ext/grpc/rb_grpc.c

@@ -155,45 +155,6 @@ gpr_timespec grpc_rb_time_timeval(VALUE time, int interval) {
   return t;
 }
 
-static void Init_grpc_status_codes() {
-  /* Constants representing the status codes or grpc_status_code in status.h */
-  VALUE grpc_rb_mStatusCodes =
-      rb_define_module_under(grpc_rb_mGrpcCore, "StatusCodes");
-  rb_define_const(grpc_rb_mStatusCodes, "OK", INT2NUM(GRPC_STATUS_OK));
-  rb_define_const(grpc_rb_mStatusCodes, "CANCELLED",
-                  INT2NUM(GRPC_STATUS_CANCELLED));
-  rb_define_const(grpc_rb_mStatusCodes, "UNKNOWN",
-                  INT2NUM(GRPC_STATUS_UNKNOWN));
-  rb_define_const(grpc_rb_mStatusCodes, "INVALID_ARGUMENT",
-                  INT2NUM(GRPC_STATUS_INVALID_ARGUMENT));
-  rb_define_const(grpc_rb_mStatusCodes, "DEADLINE_EXCEEDED",
-                  INT2NUM(GRPC_STATUS_DEADLINE_EXCEEDED));
-  rb_define_const(grpc_rb_mStatusCodes, "NOT_FOUND",
-                  INT2NUM(GRPC_STATUS_NOT_FOUND));
-  rb_define_const(grpc_rb_mStatusCodes, "ALREADY_EXISTS",
-                  INT2NUM(GRPC_STATUS_ALREADY_EXISTS));
-  rb_define_const(grpc_rb_mStatusCodes, "PERMISSION_DENIED",
-                  INT2NUM(GRPC_STATUS_PERMISSION_DENIED));
-  rb_define_const(grpc_rb_mStatusCodes, "UNAUTHENTICATED",
-                  INT2NUM(GRPC_STATUS_UNAUTHENTICATED));
-  rb_define_const(grpc_rb_mStatusCodes, "RESOURCE_EXHAUSTED",
-                  INT2NUM(GRPC_STATUS_RESOURCE_EXHAUSTED));
-  rb_define_const(grpc_rb_mStatusCodes, "FAILED_PRECONDITION",
-                  INT2NUM(GRPC_STATUS_FAILED_PRECONDITION));
-  rb_define_const(grpc_rb_mStatusCodes, "ABORTED",
-                  INT2NUM(GRPC_STATUS_ABORTED));
-  rb_define_const(grpc_rb_mStatusCodes, "OUT_OF_RANGE",
-                  INT2NUM(GRPC_STATUS_OUT_OF_RANGE));
-  rb_define_const(grpc_rb_mStatusCodes, "UNIMPLEMENTED",
-                  INT2NUM(GRPC_STATUS_UNIMPLEMENTED));
-  rb_define_const(grpc_rb_mStatusCodes, "INTERNAL",
-                  INT2NUM(GRPC_STATUS_INTERNAL));
-  rb_define_const(grpc_rb_mStatusCodes, "UNAVAILABLE",
-                  INT2NUM(GRPC_STATUS_UNAVAILABLE));
-  rb_define_const(grpc_rb_mStatusCodes, "DATA_LOSS",
-                  INT2NUM(GRPC_STATUS_DATA_LOSS));
-}
-
 /* id_at is the constructor method of the ruby standard Time class. */
 static ID id_at;
 
@@ -351,8 +312,7 @@ void Init_grpc_c() {
   grpc_rb_mGrpcCore = rb_define_module_under(grpc_rb_mGRPC, "Core");
   grpc_rb_sNewServerRpc = rb_struct_define(
       "NewServerRpc", "method", "host", "deadline", "metadata", "call", NULL);
-  grpc_rb_sStatus =
-      rb_struct_define("Status", "code", "details", "metadata", NULL);
+  grpc_rb_sStatus = rb_const_get(rb_cStruct, rb_intern("Status"));
   sym_code = ID2SYM(rb_intern("code"));
   sym_details = ID2SYM(rb_intern("details"));
   sym_metadata = ID2SYM(rb_intern("metadata"));
@@ -363,7 +323,6 @@ void Init_grpc_c() {
   Init_grpc_channel_credentials();
   Init_grpc_server();
   Init_grpc_server_credentials();
-  Init_grpc_status_codes();
   Init_grpc_time_consts();
   Init_grpc_compression_options();
 }

data/src/ruby/ext/grpc/rb_grpc_imports.generated.c

@@ -164,6 +164,8 @@ grpc_tls_credentials_options_set_credential_reload_config_type grpc_tls_credenti
 grpc_tls_credentials_options_set_server_authorization_check_config_type grpc_tls_credentials_options_set_server_authorization_check_config_import;
 grpc_tls_key_materials_config_create_type grpc_tls_key_materials_config_create_import;
 grpc_tls_key_materials_config_set_key_materials_type grpc_tls_key_materials_config_set_key_materials_import;
+grpc_tls_key_materials_config_set_version_type grpc_tls_key_materials_config_set_version_import;
+grpc_tls_key_materials_config_get_version_type grpc_tls_key_materials_config_get_version_import;
 grpc_tls_credential_reload_config_create_type grpc_tls_credential_reload_config_create_import;
 grpc_tls_server_authorization_check_config_create_type grpc_tls_server_authorization_check_config_create_import;
 grpc_raw_byte_buffer_create_type grpc_raw_byte_buffer_create_import;
@@ -435,6 +437,8 @@ void grpc_rb_load_imports(HMODULE library) {
   grpc_tls_credentials_options_set_server_authorization_check_config_import = (grpc_tls_credentials_options_set_server_authorization_check_config_type) GetProcAddress(library, "grpc_tls_credentials_options_set_server_authorization_check_config");
   grpc_tls_key_materials_config_create_import = (grpc_tls_key_materials_config_create_type) GetProcAddress(library, "grpc_tls_key_materials_config_create");
   grpc_tls_key_materials_config_set_key_materials_import = (grpc_tls_key_materials_config_set_key_materials_type) GetProcAddress(library, "grpc_tls_key_materials_config_set_key_materials");
+  grpc_tls_key_materials_config_set_version_import = (grpc_tls_key_materials_config_set_version_type) GetProcAddress(library, "grpc_tls_key_materials_config_set_version");
+  grpc_tls_key_materials_config_get_version_import = (grpc_tls_key_materials_config_get_version_type) GetProcAddress(library, "grpc_tls_key_materials_config_get_version");
   grpc_tls_credential_reload_config_create_import = (grpc_tls_credential_reload_config_create_type) GetProcAddress(library, "grpc_tls_credential_reload_config_create");
   grpc_tls_server_authorization_check_config_create_import = (grpc_tls_server_authorization_check_config_create_type) GetProcAddress(library, "grpc_tls_server_authorization_check_config_create");
   grpc_raw_byte_buffer_create_import = (grpc_raw_byte_buffer_create_type) GetProcAddress(library, "grpc_raw_byte_buffer_create");

data/src/ruby/ext/grpc/rb_grpc_imports.generated.h

@@ -467,6 +467,12 @@ extern grpc_tls_key_materials_config_create_type grpc_tls_key_materials_config_c
 typedef int(*grpc_tls_key_materials_config_set_key_materials_type)(grpc_tls_key_materials_config* config, const char* pem_root_certs, const grpc_ssl_pem_key_cert_pair** pem_key_cert_pairs, size_t num_key_cert_pairs);
 extern grpc_tls_key_materials_config_set_key_materials_type grpc_tls_key_materials_config_set_key_materials_import;
 #define grpc_tls_key_materials_config_set_key_materials grpc_tls_key_materials_config_set_key_materials_import
+typedef int(*grpc_tls_key_materials_config_set_version_type)(grpc_tls_key_materials_config* config, int version);
+extern grpc_tls_key_materials_config_set_version_type grpc_tls_key_materials_config_set_version_import;
+#define grpc_tls_key_materials_config_set_version grpc_tls_key_materials_config_set_version_import
+typedef int(*grpc_tls_key_materials_config_get_version_type)(grpc_tls_key_materials_config* config);
+extern grpc_tls_key_materials_config_get_version_type grpc_tls_key_materials_config_get_version_import;
+#define grpc_tls_key_materials_config_get_version grpc_tls_key_materials_config_get_version_import
 typedef grpc_tls_credential_reload_config*(*grpc_tls_credential_reload_config_create_type)(const void* config_user_data, int (*schedule)(void* config_user_data, grpc_tls_credential_reload_arg* arg), void (*cancel)(void* config_user_data, grpc_tls_credential_reload_arg* arg), void (*destruct)(void* config_user_data));
 extern grpc_tls_credential_reload_config_create_type grpc_tls_credential_reload_config_create_import;
 #define grpc_tls_credential_reload_config_create grpc_tls_credential_reload_config_create_import

data/src/ruby/lib/grpc.rb

@@ -15,10 +15,12 @@
 ssl_roots_path = File.expand_path('../../../../etc/roots.pem', __FILE__)
 
 require_relative 'grpc/errors'
+require_relative 'grpc/structs'
 require_relative 'grpc/grpc'
 require_relative 'grpc/logconfig'
 require_relative 'grpc/notifier'
 require_relative 'grpc/version'
+require_relative 'grpc/core/status_codes'
 require_relative 'grpc/core/time_consts'
 require_relative 'grpc/generic/active_call'
 require_relative 'grpc/generic/client_stub'

data/src/ruby/lib/grpc/core/status_codes.rb

@@ -0,0 +1,135 @@
+# Copyright 2015 gRPC authors.
+#
+# 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
+#
+#     http://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.
+
+# GRPC contains the General RPC module.
+module GRPC
+  module Core
+    # StatusCodes defines the canonical error codes used by gRPC for the RPC
+    # API.
+    module StatusCodes
+      # OK is returned on success.
+      OK = 0
+
+      # Canceled indicates the operation was canceled (typically by the caller).
+      CANCELLED = 1
+
+      # Unknown error. An example of where this error may be returned is if a
+      # Status value received from another address space belongs to an
+      # error-space that is not known in this address space. Also errors raised
+      # by APIs that do not return enough error information may be converted to
+      # this error.
+      UNKNOWN = 2
+
+      # InvalidArgument indicates client specified an invalid argument. Note
+      # that this differs from FailedPrecondition. It indicates arguments that
+      # are problematic regardless of the state of the system (e.g., a malformed
+      # file name).
+      INVALID_ARGUMENT = 3
+
+      # DeadlineExceeded means operation expired before completion. For
+      # operations that change the state of the system, this error may be
+      # returned even if the operation has completed successfully. For example,
+      # a successful response from a server could have been delayed long enough
+      # for the deadline to expire.
+      DEADLINE_EXCEEDED = 4
+
+      # NotFound means some requested entity (e.g., file or directory) was not
+      # found.
+      NOT_FOUND = 5
+
+      # AlreadyExists means an attempt to create an entity failed because one
+      # already exists.
+      ALREADY_EXISTS = 6
+
+      # PermissionDenied indicates the caller does not have permission to
+      # execute the specified operation. It must not be used for rejections
+      # caused by exhausting some resource (use ResourceExhausted instead for
+      # those errors). It must not be used if the caller cannot be identified
+      # (use Unauthenticated instead for those errors).
+      PERMISSION_DENIED = 7
+
+      # ResourceExhausted indicates some resource has been exhausted, perhaps a
+      # per-user quota, or perhaps the entire file system is out of space.
+      RESOURCE_EXHAUSTED = 8
+
+      # FailedPrecondition indicates operation was rejected because the system
+      # is not in a state required for the operation's execution. For example,
+      # directory to be deleted may be non-empty, an rmdir operation is applied
+      # to a non-directory, etc.
+      #
+      # A litmus test that may help a service implementor in deciding between
+      # FailedPrecondition, Aborted, and Unavailable:
+      #  (a) Use Unavailable if the client can retry just the failing call.
+      #  (b) Use Aborted if the client should retry at a higher-level (e.g.,
+      #      restarting a read-modify-write sequence).
+      #  (c) Use FailedPrecondition if the client should not retry until the
+      #      system state has been explicitly fixed. E.g., if an "rmdir" fails
+      #      because the directory is non-empty, FailedPrecondition should be
+      #      returned since the client should not retry unless they have first
+      #      fixed up the directory by deleting files from it.
+      #  (d) Use FailedPrecondition if the client performs conditional REST
+      #      Get/Update/Delete on a resource and the resource on the server does
+      #      not match the condition. E.g., conflicting read-modify-write on the
+      #      same resource.
+      FAILED_PRECONDITION = 9
+
+      # Aborted indicates the operation was aborted, typically due to a
+      # concurrency issue like sequencer check failures, transaction aborts,
+      # etc.
+      #
+      # See litmus test above for deciding between FailedPrecondition, Aborted,
+      # and Unavailable.
+      ABORTED = 10
+
+      # OutOfRange means operation was attempted past the valid range. E.g.,
+      # seeking or reading past end of file.
+      #
+      # Unlike InvalidArgument, this error indicates a problem that may be fixed
+      # if the system state changes. For example, a 32-bit file system will
+      # generate InvalidArgument if asked to read at an offset that is not in
+      # the range [0,2^32-1], but it will generate OutOfRange if asked to read
+      # from an offset past the current file size.
+      #
+      # There is a fair bit of overlap between FailedPrecondition and
+      # OutOfRange. We recommend using OutOfRange (the more specific error) when
+      # it applies so that callers who are iterating through a space can easily
+      # look for an OutOfRange error to detect when they are done.
+      OUT_OF_RANGE = 11
+
+      # Unimplemented indicates operation is not implemented or not
+      # supported/enabled in this service.
+      UNIMPLEMENTED = 12
+
+      # Internal errors. Means some invariants expected by underlying system has
+      # been broken. If you see one of these errors, something is very broken.
+      INTERNAL = 13
+
+      # Unavailable indicates the service is currently unavailable. This is a
+      # most likely a transient condition and may be corrected by retrying with
+      # a backoff. Note that it is not always safe to retry non-idempotent
+      # operations.
+      #
+      # See litmus test above for deciding between FailedPrecondition, Aborted,
+      # and Unavailable.
+      UNAVAILABLE = 14
+
+      # DataLoss indicates unrecoverable data loss or corruption.
+      DATA_LOSS = 15
+
+      # Unauthenticated indicates the request does not have valid authentication
+      # credentials for the operation.
+      UNAUTHENTICATED = 16
+    end
+  end
+end

data/src/ruby/lib/grpc/errors.rb

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative './grpc'
+require_relative './structs'
+require_relative './core/status_codes'
+require_relative './google_rpc_status_utils'
 
 # GRPC contains the General RPC module.
 module GRPC
@@ -57,12 +59,7 @@ module GRPC
     #
     # @return [Google::Rpc::Status, nil]
     def to_rpc_status
-      # Lazily require google_rpc_status_utils to scope
-      # loading protobuf_c.so to the users of this method.
-      require_relative './google_rpc_status_utils'
-      status = to_status
-      return if status.nil?
-      GoogleRpcStatusUtils.extract_google_rpc_status(status)
+      GoogleRpcStatusUtils.extract_google_rpc_status(to_status)
     rescue Google::Protobuf::ParseError => parse_error
       GRPC.logger.warn('parse error: to_rpc_status failed')
       GRPC.logger.warn(parse_error)

data/src/ruby/lib/grpc/google_rpc_status_utils.rb

@@ -12,8 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require_relative './grpc'
-require 'google/rpc/status_pb'
+require_relative './structs'
 
 # GRPC contains the General RPC module.
 module GRPC
@@ -28,8 +27,14 @@ module GRPC
     def self.extract_google_rpc_status(status)
       fail ArgumentError, 'bad type' unless status.is_a? Struct::Status
       grpc_status_details_bin_trailer = 'grpc-status-details-bin'
-      return nil if status.metadata[grpc_status_details_bin_trailer].nil?
-      Google::Rpc::Status.decode(status.metadata[grpc_status_details_bin_trailer])
+      binstatus = status.metadata[grpc_status_details_bin_trailer]
+      return nil if binstatus.nil?
+
+      # Lazily load grpc_c and protobuf_c.so for users of this method.
+      require_relative './grpc'
+      require 'google/rpc/status_pb'
+
+      Google::Rpc::Status.decode(binstatus)
     end
   end
 end

data/src/ruby/lib/grpc/structs.rb

@@ -0,0 +1,15 @@
+# Copyright 2015 gRPC authors.
+#
+# 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
+#
+#     http://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.
+
+Struct.new('Status', :code, :details, :metadata)

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.23.1'
+  VERSION = '1.24.0.pre1'
 end

data/src/ruby/spec/errors_spec.rb

@@ -14,6 +14,7 @@
 
 require 'spec_helper'
 require 'google/protobuf/well_known_types'
+require 'google/rpc/status_pb'
 require_relative '../pb/src/proto/grpc/testing/messages_pb'
 
 describe GRPC::BadStatus do

data/src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto

@@ -0,0 +1,22 @@
+// Copyright 2019 gRPC authors.
+//
+// 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
+//
+//     http://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.
+
+syntax = "proto3";
+
+package grpc.testing;
+
+// For sanity checking package definitions
+option ruby_package = "A::Other";
+
+message Thing { }

data/src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto

@@ -0,0 +1,34 @@
+// Copyright 2019 gRPC authors.
+//
+// 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
+//
+//     http://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.
+
+syntax = "proto3";
+
+package grpc.testing;
+
+import "grpc/testing/package_options_import.proto";
+
+// For sanity checking package definitions
+option ruby_package = "RPC::Test::New::Package::Options";
+
+message AnotherTestRequest { }
+
+message AnotherTestResponse { }
+
+message Foo { }
+
+service AnotherTestService {
+  rpc GetTest(AnotherTestRequest) returns (AnotherTestResponse) { }
+  rpc OtherTest(Thing) returns (Thing) { }
+  rpc FooTest(Foo) returns (Foo) { }
+}

data/src/ruby/spec/pb/codegen/package_option_spec.rb

@@ -18,35 +18,59 @@ require 'tmpdir'
 
 describe 'Code Generation Options' do
   it 'should generate and respect package options' do
-    fail 'CONFIG env variable unexpectedly unset' unless ENV['CONFIG']
-    bins_sub_dir = ENV['CONFIG']
-
-    pb_dir = File.dirname(__FILE__)
-    bins_dir = File.join('..', '..', '..', '..', '..', 'bins', bins_sub_dir)
-
-    plugin = File.join(bins_dir, 'grpc_ruby_plugin')
-    protoc = File.join(bins_dir, 'protobuf', 'protoc')
-
-    # Generate the service from the proto
-    Dir.mktmpdir(nil, File.dirname(__FILE__)) do |tmp_dir|
-      gen_file = system(protoc,
-                        '-I.',
-                        'grpc/testing/package_options.proto',
-                        "--grpc_out=#{tmp_dir}", # generate the service
-                        "--ruby_out=#{tmp_dir}", # generate the definitions
-                        "--plugin=protoc-gen-grpc=#{plugin}",
-                        chdir: pb_dir,
-                        out: File::NULL)
-
-      expect(gen_file).to be_truthy
-      begin
-        $LOAD_PATH.push(tmp_dir)
-        expect { Grpc::Testing::Package::Options::TestService::Service }.to raise_error(NameError)
-        expect(require('grpc/testing/package_options_services_pb')).to be_truthy
-        expect { Grpc::Testing::Package::Options::TestService::Service }.to_not raise_error
-      ensure
-        $LOAD_PATH.delete(tmp_dir)
-      end
+    with_protos(%w[grpc/testing/package_options.proto]) do
+      expect { Grpc::Testing::Package::Options::TestService::Service }.to raise_error(NameError)
+      expect(require('grpc/testing/package_options_services_pb')).to be_truthy
+      expect { Grpc::Testing::Package::Options::TestService::Service }.to_not raise_error
+      expect { Grpc::Testing::TestService::Service }.to raise_error(NameError)
+    end
+  end
+
+  it 'should generate and respect Ruby style package options' do
+    with_protos(%w[grpc/testing/package_options_ruby_style.proto grpc/testing/package_options_import.proto]) do
+      expect { RPC::Test::New::Package::Options::AnotherTestService::Service }.to raise_error(NameError)
+      expect(require('grpc/testing/package_options_ruby_style_services_pb')).to be_truthy
+      expect { RPC::Test::New::Package::Options::AnotherTestService::Service }.to_not raise_error
+      expect { Grpc::Testing::AnotherTestService::Service }.to raise_error(NameError)
+
+      services = RPC::Test::New::Package::Options::AnotherTestService::Service.rpc_descs
+      expect(services[:GetTest].input).to eq(RPC::Test::New::Package::Options::AnotherTestRequest)
+      expect(services[:GetTest].output).to eq(RPC::Test::New::Package::Options::AnotherTestResponse)
+      expect(services[:OtherTest].input).to eq(A::Other::Thing)
+      expect(services[:OtherTest].output).to eq(A::Other::Thing)
+      expect(services[:FooTest].input).to eq(RPC::Test::New::Package::Options::Foo)
+      expect(services[:FooTest].output).to eq(RPC::Test::New::Package::Options::Foo)
+    end
+  end
+end
+
+def with_protos(file_paths)
+  fail 'CONFIG env variable unexpectedly unset' unless ENV['CONFIG']
+  bins_sub_dir = ENV['CONFIG']
+
+  pb_dir = File.dirname(__FILE__)
+  bins_dir = File.join('..', '..', '..', '..', '..', 'bins', bins_sub_dir)
+
+  plugin = File.join(bins_dir, 'grpc_ruby_plugin')
+  protoc = File.join(bins_dir, 'protobuf', 'protoc')
+
+  # Generate the service from the proto
+  Dir.mktmpdir(nil, File.dirname(__FILE__)) do |tmp_dir|
+    gen_file = system(protoc,
+                      '-I.',
+                      *file_paths,
+                      "--grpc_out=#{tmp_dir}", # generate the service
+                      "--ruby_out=#{tmp_dir}", # generate the definitions
+                      "--plugin=protoc-gen-grpc=#{plugin}",
+                      chdir: pb_dir,
+                      out: File::NULL)
+
+    expect(gen_file).to be_truthy
+    begin
+      $LOAD_PATH.push(tmp_dir)
+      yield
+    ensure
+      $LOAD_PATH.delete(tmp_dir)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.23.1
+  version: 1.24.0.pre1
 platform: universal-darwin
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -213,6 +213,8 @@ files:
 - src/ruby/bin/math_services_pb.rb
 - src/ruby/bin/noproto_client.rb
 - src/ruby/bin/noproto_server.rb
+- src/ruby/ext/grpc/ext-export.clang
+- src/ruby/ext/grpc/ext-export.gcc
 - src/ruby/ext/grpc/extconf.rb
 - src/ruby/ext/grpc/rb_byte_buffer.c
 - src/ruby/ext/grpc/rb_byte_buffer.h
@@ -230,6 +232,7 @@ files:
 - src/ruby/ext/grpc/rb_completion_queue.h
 - src/ruby/ext/grpc/rb_compression_options.c
 - src/ruby/ext/grpc/rb_compression_options.h
+- src/ruby/ext/grpc/rb_enable_cpp.cc
 - src/ruby/ext/grpc/rb_event_thread.c
 - src/ruby/ext/grpc/rb_event_thread.h
 - src/ruby/ext/grpc/rb_grpc.c
@@ -247,6 +250,7 @@ files:
 - src/ruby/lib/grpc/2.4/grpc_c.bundle
 - src/ruby/lib/grpc/2.5/grpc_c.bundle
 - src/ruby/lib/grpc/2.6/grpc_c.bundle
+- src/ruby/lib/grpc/core/status_codes.rb
 - src/ruby/lib/grpc/core/time_consts.rb
 - src/ruby/lib/grpc/errors.rb
 - src/ruby/lib/grpc/generic/active_call.rb
@@ -261,6 +265,7 @@ files:
 - src/ruby/lib/grpc/grpc.rb
 - src/ruby/lib/grpc/logconfig.rb
 - src/ruby/lib/grpc/notifier.rb
+- src/ruby/lib/grpc/structs.rb
 - src/ruby/lib/grpc/version.rb
 - src/ruby/pb/README.md
 - src/ruby/pb/generate_proto_ruby.sh
@@ -297,6 +302,8 @@ files:
 - src/ruby/spec/generic/service_spec.rb
 - src/ruby/spec/google_rpc_status_utils_spec.rb
 - src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto
 - src/ruby/spec/pb/codegen/package_option_spec.rb
 - src/ruby/spec/pb/duplicate/codegen_spec.rb
 - src/ruby/spec/pb/health/checker_spec.rb
@@ -332,9 +339,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 
@@ -362,6 +369,8 @@ test_files:
 - src/ruby/spec/generic/service_spec.rb
 - src/ruby/spec/google_rpc_status_utils_spec.rb
 - src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_import.proto
+- src/ruby/spec/pb/codegen/grpc/testing/package_options_ruby_style.proto
 - src/ruby/spec/pb/codegen/package_option_spec.rb
 - src/ruby/spec/pb/duplicate/codegen_spec.rb
 - src/ruby/spec/pb/health/checker_spec.rb