grpc 1.15.0-universal-darwin → 1.16.0.pre1-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c907ae957a690995ac283ded3c5cebedc1b5fc4f1ac6e225d0d2e124b5af43
-  data.tar.gz: a147a4023192ee1284301ce6bc4b481e7d5e8b3acec87d7d3ed8928f6b7c5d98
+  metadata.gz: dff9c31874e701fc9bb56c8fbad242c5945f0440ef57a5b81d96d35acf6f410f
+  data.tar.gz: a66df395b35e53c15b48dbb104c76dfa0f59171b75bc8ece14060f3d99df3d1b
 SHA512:
-  metadata.gz: 0dd948095cb0d13a4709caa2a21f4021b6dc8ee8d080a3758230fdfb8d425393120a54935c41686e0ed457ca227a244f52135bf2ca9f72ef5e720e87e7dae621
-  data.tar.gz: 8d3f8220e7f7abd8a0ed70eab0f40803712507242d3c7a60798737404b4b3d8ac8d9e47dfb1e19ff67b8a9bde0a375d47ccd364bb2931572ccc8d9775c5724e0
+  metadata.gz: c6157d587fa1186ba32ab0a1c444089e0d7292c4095b1501a0899b826182e17cfc397aacfd049e19e72297fbc3354c48d3658f7cad5b4a45ff94facf934e4813
+  data.tar.gz: 4c744dd2f3f6f6b761122e6b82d9c260122ee14f25fb3cdfd6468de93a64c34c72310234bcde1666ad7f3558bd315ffe58c809cdb5c44a3ced45fc140a12c367

data/etc/roots.pem

@@ -4317,3 +4317,26 @@ JJUEeKgDu+6B5dpffItKoZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R
 8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+tJDfLRVpOoERIyNiwmcUVhAn21klJwGW4
 5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
 -----END CERTIFICATE-----
+
+# Issuer: CN=OISTE WISeKey Global Root GC CA O=WISeKey OU=OISTE Foundation Endorsed
+# Subject: CN=OISTE WISeKey Global Root GC CA O=WISeKey OU=OISTE Foundation Endorsed
+# Label: "OISTE WISeKey Global Root GC CA"
+# Serial: 44084345621038548146064804565436152554
+# MD5 Fingerprint: a9:d6:b9:2d:2f:93:64:f8:a5:69:ca:91:e9:68:07:23
+# SHA1 Fingerprint: e0:11:84:5e:34:de:be:88:81:b9:9c:f6:16:26:d1:96:1f:c3:b9:31
+# SHA256 Fingerprint: 85:60:f9:1c:36:24:da:ba:95:70:b5:fe:a0:db:e3:6f:f1:1a:83:23:be:94:86:85:4f:b3:f3:4a:55:71:19:8d
+-----BEGIN CERTIFICATE-----
+MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQsw
+CQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91
+bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwg
+Um9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRaFw00MjA1MDkwOTU4MzNaMG0xCzAJ
+BgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQLExlPSVNURSBGb3Vu
+ZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2JhbCBS
+b290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4ni
+eUqjFqdrVCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4W
+p2OQ0jnUsYd4XxiWD1AbNTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7T
+rYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0EAwMDaAAwZQIwJsdpW9zV
+57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtkAjEA2zQg
+Mgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
+-----END CERTIFICATE-----

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

@@ -819,6 +819,7 @@ static VALUE grpc_rb_call_run_batch(VALUE self, VALUE ops_hash) {
   unsigned write_flag = 0;
   void* tag = (void*)&st;
 
+  grpc_ruby_fork_guard();
   if (RTYPEDDATA_DATA(self) == NULL) {
     rb_raise(grpc_rb_eCallError, "Cannot run batch on closed call");
     return Qnil;

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

@@ -217,6 +217,7 @@ static VALUE grpc_rb_channel_init(int argc, VALUE* argv, VALUE self) {
   MEMZERO(&args, grpc_channel_args, 1);
 
   grpc_ruby_once_init();
+  grpc_ruby_fork_guard();
   rb_thread_call_without_gvl(
       wait_until_channel_polling_thread_started_no_gil,
       &stop_waiting_for_thread_start,
@@ -374,6 +375,7 @@ static VALUE grpc_rb_channel_watch_connectivity_state(VALUE self,
   watch_state_stack stack;
   void* op_success = 0;
 
+  grpc_ruby_fork_guard();
   TypedData_Get_Struct(self, grpc_rb_channel, &grpc_channel_data_type, wrapper);
 
   if (wrapper->bg_wrapped == NULL) {
@@ -415,6 +417,7 @@ static VALUE grpc_rb_channel_create_call(VALUE self, VALUE parent, VALUE mask,
   grpc_slice* host_slice_ptr = NULL;
   char* tmp_str = NULL;
 
+  grpc_ruby_fork_guard();
   if (host != Qnil) {
     host_slice =
         grpc_slice_from_copied_buffer(RSTRING_PTR(host), RSTRING_LEN(host));

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

@@ -23,9 +23,13 @@
 
 #include <math.h>
 #include <ruby/vm.h>
+#include <stdbool.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include <grpc/grpc.h>
+#include <grpc/support/log.h>
 #include <grpc/support/time.h>
 #include "rb_call.h"
 #include "rb_call_credentials.h"
@@ -255,7 +259,26 @@ static void Init_grpc_time_consts() {
   id_tv_nsec = rb_intern("tv_nsec");
 }
 
-static void grpc_rb_shutdown(void) { grpc_shutdown(); }
+#if GPR_WINDOWS
+static void grpc_ruby_set_init_pid(void) {}
+static bool grpc_ruby_forked_after_init(void) { return false; }
+#else
+static pid_t grpc_init_pid;
+
+static void grpc_ruby_set_init_pid(void) {
+  GPR_ASSERT(grpc_init_pid == 0);
+  grpc_init_pid = getpid();
+}
+
+static bool grpc_ruby_forked_after_init(void) {
+  GPR_ASSERT(grpc_init_pid != 0);
+  return grpc_init_pid != getpid();
+}
+#endif
+
+static void grpc_rb_shutdown(void) {
+  if (!grpc_ruby_forked_after_init()) grpc_shutdown();
+}
 
 /* Initialize the GRPC module structs */
 
@@ -276,10 +299,17 @@ VALUE sym_metadata = Qundef;
 static gpr_once g_once_init = GPR_ONCE_INIT;
 
 static void grpc_ruby_once_init_internal() {
+  grpc_ruby_set_init_pid();
   grpc_init();
   atexit(grpc_rb_shutdown);
 }
 
+void grpc_ruby_fork_guard() {
+  if (grpc_ruby_forked_after_init()) {
+    rb_raise(rb_eRuntimeError, "grpc cannot be used before and after forking");
+  }
+}
+
 static VALUE bg_thread_init_rb_mu = Qundef;
 static int bg_thread_init_done = 0;
 

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

@@ -69,4 +69,6 @@ gpr_timespec grpc_rb_time_timeval(VALUE time, int interval);
 
 void grpc_ruby_once_init();
 
+void grpc_ruby_fork_guard();
+
 #endif /* GRPC_RB_H_ */

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

@@ -97,7 +97,10 @@ grpc_resource_quota_resize_type grpc_resource_quota_resize_import;
 grpc_resource_quota_set_max_threads_type grpc_resource_quota_set_max_threads_import;
 grpc_resource_quota_arg_vtable_type grpc_resource_quota_arg_vtable_import;
 grpc_channelz_get_top_channels_type grpc_channelz_get_top_channels_import;
+grpc_channelz_get_servers_type grpc_channelz_get_servers_import;
 grpc_channelz_get_channel_type grpc_channelz_get_channel_import;
+grpc_channelz_get_subchannel_type grpc_channelz_get_subchannel_import;
+grpc_channelz_get_socket_type grpc_channelz_get_socket_import;
 grpc_insecure_channel_create_from_fd_type grpc_insecure_channel_create_from_fd_import;
 grpc_server_add_insecure_channel_from_fd_type grpc_server_add_insecure_channel_from_fd_import;
 grpc_use_signal_type grpc_use_signal_import;
@@ -351,7 +354,10 @@ void grpc_rb_load_imports(HMODULE library) {
   grpc_resource_quota_set_max_threads_import = (grpc_resource_quota_set_max_threads_type) GetProcAddress(library, "grpc_resource_quota_set_max_threads");
   grpc_resource_quota_arg_vtable_import = (grpc_resource_quota_arg_vtable_type) GetProcAddress(library, "grpc_resource_quota_arg_vtable");
   grpc_channelz_get_top_channels_import = (grpc_channelz_get_top_channels_type) GetProcAddress(library, "grpc_channelz_get_top_channels");
+  grpc_channelz_get_servers_import = (grpc_channelz_get_servers_type) GetProcAddress(library, "grpc_channelz_get_servers");
   grpc_channelz_get_channel_import = (grpc_channelz_get_channel_type) GetProcAddress(library, "grpc_channelz_get_channel");
+  grpc_channelz_get_subchannel_import = (grpc_channelz_get_subchannel_type) GetProcAddress(library, "grpc_channelz_get_subchannel");
+  grpc_channelz_get_socket_import = (grpc_channelz_get_socket_type) GetProcAddress(library, "grpc_channelz_get_socket");
   grpc_insecure_channel_create_from_fd_import = (grpc_insecure_channel_create_from_fd_type) GetProcAddress(library, "grpc_insecure_channel_create_from_fd");
   grpc_server_add_insecure_channel_from_fd_import = (grpc_server_add_insecure_channel_from_fd_type) GetProcAddress(library, "grpc_server_add_insecure_channel_from_fd");
   grpc_use_signal_import = (grpc_use_signal_type) GetProcAddress(library, "grpc_use_signal");

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

@@ -107,7 +107,7 @@ extern grpc_completion_queue_create_for_next_type grpc_completion_queue_create_f
 typedef grpc_completion_queue*(*grpc_completion_queue_create_for_pluck_type)(void* reserved);
 extern grpc_completion_queue_create_for_pluck_type grpc_completion_queue_create_for_pluck_import;
 #define grpc_completion_queue_create_for_pluck grpc_completion_queue_create_for_pluck_import
-typedef grpc_completion_queue*(*grpc_completion_queue_create_for_callback_type)(void* shutdown_callback, void* reserved);
+typedef grpc_completion_queue*(*grpc_completion_queue_create_for_callback_type)(grpc_experimental_completion_queue_functor* shutdown_callback, void* reserved);
 extern grpc_completion_queue_create_for_callback_type grpc_completion_queue_create_for_callback_import;
 #define grpc_completion_queue_create_for_callback grpc_completion_queue_create_for_callback_import
 typedef grpc_completion_queue*(*grpc_completion_queue_create_type)(const grpc_completion_queue_factory* factory, const grpc_completion_queue_attributes* attributes, void* reserved);
@@ -266,9 +266,18 @@ extern grpc_resource_quota_arg_vtable_type grpc_resource_quota_arg_vtable_import
 typedef char*(*grpc_channelz_get_top_channels_type)(intptr_t start_channel_id);
 extern grpc_channelz_get_top_channels_type grpc_channelz_get_top_channels_import;
 #define grpc_channelz_get_top_channels grpc_channelz_get_top_channels_import
+typedef char*(*grpc_channelz_get_servers_type)(intptr_t start_server_id);
+extern grpc_channelz_get_servers_type grpc_channelz_get_servers_import;
+#define grpc_channelz_get_servers grpc_channelz_get_servers_import
 typedef char*(*grpc_channelz_get_channel_type)(intptr_t channel_id);
 extern grpc_channelz_get_channel_type grpc_channelz_get_channel_import;
 #define grpc_channelz_get_channel grpc_channelz_get_channel_import
+typedef char*(*grpc_channelz_get_subchannel_type)(intptr_t subchannel_id);
+extern grpc_channelz_get_subchannel_type grpc_channelz_get_subchannel_import;
+#define grpc_channelz_get_subchannel grpc_channelz_get_subchannel_import
+typedef char*(*grpc_channelz_get_socket_type)(intptr_t socket_id);
+extern grpc_channelz_get_socket_type grpc_channelz_get_socket_import;
+#define grpc_channelz_get_socket grpc_channelz_get_socket_import
 typedef grpc_channel*(*grpc_insecure_channel_create_from_fd_type)(const char* target, int fd, const grpc_channel_args* args);
 extern grpc_insecure_channel_create_from_fd_type grpc_insecure_channel_create_from_fd_import;
 #define grpc_insecure_channel_create_from_fd grpc_insecure_channel_create_from_fd_import
@@ -401,10 +410,10 @@ extern grpc_call_set_credentials_type grpc_call_set_credentials_import;
 typedef void(*grpc_server_credentials_set_auth_metadata_processor_type)(grpc_server_credentials* creds, grpc_auth_metadata_processor processor);
 extern grpc_server_credentials_set_auth_metadata_processor_type grpc_server_credentials_set_auth_metadata_processor_import;
 #define grpc_server_credentials_set_auth_metadata_processor grpc_server_credentials_set_auth_metadata_processor_import
-typedef grpc_alts_credentials_options*(*grpc_alts_credentials_client_options_create_type)();
+typedef grpc_alts_credentials_options*(*grpc_alts_credentials_client_options_create_type)(void);
 extern grpc_alts_credentials_client_options_create_type grpc_alts_credentials_client_options_create_import;
 #define grpc_alts_credentials_client_options_create grpc_alts_credentials_client_options_create_import
-typedef grpc_alts_credentials_options*(*grpc_alts_credentials_server_options_create_type)();
+typedef grpc_alts_credentials_options*(*grpc_alts_credentials_server_options_create_type)(void);
 extern grpc_alts_credentials_server_options_create_type grpc_alts_credentials_server_options_create_import;
 #define grpc_alts_credentials_server_options_create grpc_alts_credentials_server_options_create_import
 typedef void(*grpc_alts_credentials_client_options_add_target_service_account_type)(grpc_alts_credentials_options* options, const char* service_account);

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

@@ -243,6 +243,8 @@ static VALUE grpc_rb_server_request_call(VALUE self) {
 static VALUE grpc_rb_server_start(VALUE self) {
   grpc_rb_server* s = NULL;
   TypedData_Get_Struct(self, grpc_rb_server, &grpc_rb_server_data_type, s);
+
+  grpc_ruby_fork_guard();
   if (s->wrapped == NULL) {
     rb_raise(rb_eRuntimeError, "destroyed!");
   } else {

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

@@ -68,7 +68,6 @@ module GRPC
       codes[OUT_OF_RANGE] = OutOfRange
       codes[UNIMPLEMENTED] = Unimplemented
       codes[INTERNAL] = Internal
-      codes[UNIMPLEMENTED] = Unimplemented
       codes[UNAVAILABLE] = Unavailable
       codes[DATA_LOSS] = DataLoss
 

data/src/ruby/lib/grpc/generic/rpc_desc.rb

@@ -32,7 +32,7 @@ module GRPC
 
     # @return [Proc] { |instance| marshalled(instance) }
     def marshal_proc
-      proc { |o| o.class.method(marshal_method).call(o).to_s }
+      proc { |o| o.class.send(marshal_method, o).to_s }
     end
 
     # @param [:input, :output] target determines whether to produce the an
@@ -42,9 +42,9 @@ module GRPC
     # @return [Proc] An unmarshal proc { |marshalled(instance)| instance }
     def unmarshal_proc(target)
       fail ArgumentError unless [:input, :output].include?(target)
-      unmarshal_class = method(target).call
+      unmarshal_class = send(target)
       unmarshal_class = unmarshal_class.type if unmarshal_class.is_a? Stream
-      proc { |o| unmarshal_class.method(unmarshal_method).call(o) }
+      proc { |o| unmarshal_class.send(unmarshal_method, o) }
     end
 
     def handle_request_response(active_call, mth, inter_ctx)

data/src/ruby/lib/grpc/generic/rpc_server.rb

@@ -136,7 +136,7 @@ module GRPC
         begin
           blk, args = worker_queue.pop
           blk.call(*args)
-        rescue StandardError => e
+        rescue StandardError, GRPC::Core::CallError => e
           GRPC.logger.warn('Error in worker thread')
           GRPC.logger.warn(e)
         end

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

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

data/src/ruby/pb/test/client.rb

@@ -95,7 +95,7 @@ end
 
 # creates a test stub that accesses host:port securely.
 def create_stub(opts)
-  address = "#{opts.host}:#{opts.port}"
+  address = "#{opts.server_host}:#{opts.server_port}"
 
   # Provide channel args that request compression by default
   # for compression interop tests
@@ -112,7 +112,7 @@ def create_stub(opts)
     creds = ssl_creds(opts.use_test_ca)
     stub_opts = {
       channel_args: {
-        GRPC::Core::Channel::SSL_TARGET => opts.host_override
+        GRPC::Core::Channel::SSL_TARGET => opts.server_host_override
       }
     }
 
@@ -703,19 +703,19 @@ class NamedTests
 end
 
 # Args is used to hold the command line info.
-Args = Struct.new(:default_service_account, :host, :host_override,
-                  :oauth_scope, :port, :secure, :test_case,
+Args = Struct.new(:default_service_account, :server_host, :server_host_override,
+                  :oauth_scope, :server_port, :secure, :test_case,
                   :use_test_ca)
 
 # validates the command line options, returning them as a Hash.
 def parse_args
   args = Args.new
-  args.host_override = 'foo.test.google.fr'
+  args.server_host_override = 'foo.test.google.fr'
   OptionParser.new do |opts|
     opts.on('--oauth_scope scope',
             'Scope for OAuth tokens') { |v| args['oauth_scope'] = v }
     opts.on('--server_host SERVER_HOST', 'server hostname') do |v|
-      args['host'] = v
+      args['server_host'] = v
     end
     opts.on('--default_service_account email_address',
             'email address of the default service account') do |v|
@@ -723,9 +723,11 @@ def parse_args
     end
     opts.on('--server_host_override HOST_OVERRIDE',
             'override host via a HTTP header') do |v|
-      args['host_override'] = v
+      args['server_host_override'] = v
+    end
+    opts.on('--server_port SERVER_PORT', 'server port') do |v|
+      args['server_port'] = v
     end
-    opts.on('--server_port SERVER_PORT', 'server port') { |v| args['port'] = v }
     # instance_methods(false) gives only the methods defined in that class
     test_cases = NamedTests.instance_methods(false).map(&:to_s)
     test_case_list = test_cases.join(',')
@@ -744,7 +746,7 @@ def parse_args
 end
 
 def _check_args(args)
-  %w(host port test_case).each do |a|
+  %w(server_host server_port test_case).each do |a|
     if args[a].nil?
       fail(OptionParser::MissingArgument, "please specify --#{a}")
     end

data/src/ruby/spec/channel_spec.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'spec_helper'
+require 'English'
 
 def load_test_certs
   test_root = File.join(File.dirname(__FILE__), 'testdata')
@@ -27,6 +28,28 @@ describe GRPC::Core::Channel do
     GRPC::Core::ChannelCredentials.new(load_test_certs[0])
   end
 
+  def fork_with_propagated_error_message
+    pipe_read, pipe_write = IO.pipe
+    pid = fork do
+      pipe_read.close
+      begin
+        yield
+      rescue => exc
+        pipe_write.syswrite(exc.message)
+      end
+      pipe_write.close
+    end
+    pipe_write.close
+
+    exc_message = pipe_read.read
+    Process.wait(pid)
+
+    unless $CHILD_STATUS.success?
+      raise "forked process failed with #{$CHILD_STATUS}"
+    end
+    raise exc_message unless exc_message.empty?
+  end
+
   shared_examples '#new' do
     it 'take a host name without channel args' do
       blk = proc do
@@ -79,6 +102,14 @@ describe GRPC::Core::Channel do
       blk = construct_with_args(args)
       expect(&blk).to_not raise_error
     end
+
+    it 'raises if grpc was initialized in another process' do
+      blk = construct_with_args({})
+      expect(&blk).not_to raise_error
+      expect do
+        fork_with_propagated_error_message(&blk)
+      end.to raise_error(RuntimeError, 'grpc cannot be used before and after forking')
+    end
   end
 
   describe '#new for secure channels' do
@@ -121,6 +152,19 @@ describe GRPC::Core::Channel do
       end
       expect(&blk).to raise_error(RuntimeError)
     end
+
+    it 'raises if grpc was initialized in another process' do
+      ch = GRPC::Core::Channel.new(fake_host, nil, :this_channel_is_insecure)
+
+      deadline = Time.now + 5
+
+      blk = proc do
+        fork_with_propagated_error_message do
+          ch.create_call(nil, nil, 'dummy_method', nil, deadline)
+        end
+      end
+      expect(&blk).to raise_error(RuntimeError, 'grpc cannot be used before and after forking')
+    end
   end
 
   describe '#destroy' do

data/src/ruby/spec/client_auth_spec.rb

@@ -30,7 +30,7 @@ end
 
 def create_server_creds
   test_root = File.join(File.dirname(__FILE__), 'testdata')
-  p "test root: #{test_root}"
+  GRPC.logger.info("test root: #{test_root}")
   files = ['ca.pem', 'server1.key', 'server1.pem']
   creds = files.map { |f| File.open(File.join(test_root, f)).read }
   GRPC::Core::ServerCredentials.new(
@@ -59,7 +59,7 @@ class SslTestService
 
   def a_client_streaming_rpc(call)
     check_peer_cert(call)
-    call.each_remote_read.each { |r| p r }
+    call.each_remote_read.each { |r| GRPC.logger.info(r) }
     EchoMsg.new
   end
 
@@ -70,7 +70,7 @@ class SslTestService
 
   def a_bidi_rpc(requests, call)
     check_peer_cert(call)
-    requests.each { |r| p r }
+    requests.each { |r| GRPC.logger.info(r) }
     [EchoMsg.new, EchoMsg.new]
   end
 end
@@ -116,11 +116,11 @@ describe 'client-server auth' do
 
   it 'client-server auth with server streaming RPCs' do
     responses = @stub.a_server_streaming_rpc(EchoMsg.new)
-    responses.each { |r| p r }
+    responses.each { |r| GRPC.logger.info(r) }
   end
 
   it 'client-server auth with bidi RPCs' do
     responses = @stub.a_bidi_rpc([EchoMsg.new, EchoMsg.new])
-    responses.each { |r| p r }
+    responses.each { |r| GRPC.logger.info(r) }
   end
 end

data/src/ruby/spec/generic/client_stub_spec.rb

@@ -293,7 +293,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
 
     describe 'without a call operation' do
       def get_response(stub, credentials: nil)
-        puts credentials.inspect
+        GRPC.logger.info(credentials.inspect)
         stub.request_response(@method, @sent_msg, noop, noop,
                               metadata: @metadata,
                               credentials: credentials)
@@ -342,13 +342,15 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
       it 'sends metadata to the server ok when running start_call first' do
         run_op_view_metadata_test(true)
         check_op_view_of_finished_client_call(
-          @op, @server_initial_md, @server_trailing_md) { |r| p r }
+          @op, @server_initial_md, @server_trailing_md
+        ) { |r| GRPC.logger.info(r) }
       end
 
       it 'does not crash when used after the call has been finished' do
         run_op_view_metadata_test(false)
         check_op_view_of_finished_client_call(
-          @op, @server_initial_md, @server_trailing_md) { |r| p r }
+          @op, @server_initial_md, @server_trailing_md
+        ) { |r| GRPC.logger.info(r) }
       end
     end
   end
@@ -435,13 +437,15 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
       it 'sends metadata to the server ok when running start_call first' do
         run_op_view_metadata_test(true)
         check_op_view_of_finished_client_call(
-          @op, @server_initial_md, @server_trailing_md) { |r| p r }
+          @op, @server_initial_md, @server_trailing_md
+        ) { |r| GRPC.logger.info(r) }
       end
 
       it 'does not crash when used after the call has been finished' do
         run_op_view_metadata_test(false)
         check_op_view_of_finished_client_call(
-          @op, @server_initial_md, @server_trailing_md) { |r| p r }
+          @op, @server_initial_md, @server_trailing_md
+        ) { |r| GRPC.logger.info(r) }
       end
     end
   end
@@ -578,7 +582,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
         run_op_view_metadata_test(true)
         check_op_view_of_finished_client_call(
           @op, @server_initial_md, @server_trailing_md) do |responses|
-          responses.each { |r| p r }
+          responses.each { |r| GRPC.logger.info(r) }
         end
       end
 
@@ -586,7 +590,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
         run_op_view_metadata_test(false)
         check_op_view_of_finished_client_call(
           @op, @server_initial_md, @server_trailing_md) do |responses|
-          responses.each { |r| p r }
+          responses.each { |r| GRPC.logger.info(r) }
         end
       end
 
@@ -895,7 +899,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
         run_op_view_metadata_test(true)
         check_op_view_of_finished_client_call(
           @op, @server_initial_md, @server_trailing_md) do |responses|
-          responses.each { |r| p r }
+          responses.each { |r| GRPC.logger.info(r) }
         end
       end
 
@@ -903,7 +907,7 @@ describe 'ClientStub' do  # rubocop:disable Metrics/BlockLength
         run_op_view_metadata_test(false)
         check_op_view_of_finished_client_call(
           @op, @server_initial_md, @server_trailing_md) do |responses|
-          responses.each { |r| p r }
+          responses.each { |r| GRPC.logger.info(r) }
         end
       end
 

data/src/ruby/spec/generic/rpc_server_spec.rb

@@ -125,7 +125,7 @@ class CheckCallAfterFinishedService
     fail 'shouldnt reuse service' unless @server_side_call.nil?
     @server_side_call = call
     # iterate through requests so call can complete
-    call.each_remote_read.each { |r| p r }
+    call.each_remote_read.each { |r| GRPC.logger.info(r) }
     EchoMsg.new
   end
 
@@ -138,7 +138,7 @@ class CheckCallAfterFinishedService
   def a_bidi_rpc(requests, call)
     fail 'shouldnt reuse service' unless @server_side_call.nil?
     @server_side_call = call
-    requests.each { |r| p r }
+    requests.each { |r| GRPC.logger.info(r) }
     [EchoMsg.new, EchoMsg.new]
   end
 end
@@ -560,7 +560,7 @@ describe GRPC::RpcServer do
           'connect_k1' => 'connect_v1'
         }
         wanted_md.each do |key, value|
-          puts "key: #{key}"
+          GRPC.logger.info("key: #{key}")
           expect(op.metadata[key]).to eq(value)
         end
         @srv.stop

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

@@ -0,0 +1,53 @@
+# Copyright 2018 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.
+
+require 'spec_helper'
+require 'open3'
+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']
+
+    src_dir = File.join(File.dirname(__FILE__), '..', '..', '..', '..')
+    pb_dir = File.join(src_dir, 'proto')
+    bins_dir = File.join(src_dir, '..', '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
+    end
+  end
+end

data/src/ruby/spec/support/services.rb

@@ -50,7 +50,9 @@ class EchoService
   def a_client_streaming_rpc(call)
     # iterate through requests so call can complete
     call.output_metadata.update(@trailing_metadata)
-    call.each_remote_read.each { |r| p r }
+    call.each_remote_read.each do |r|
+      GRPC.logger.info(r)
+    end
     EchoMsg.new
   end
 
@@ -61,7 +63,9 @@ class EchoService
 
   def a_bidi_rpc(requests, call)
     call.output_metadata.update(@trailing_metadata)
-    requests.each { |r| p r }
+    requests.each do |r|
+      GRPC.logger.info(r)
+    end
     [EchoMsg.new, EchoMsg.new]
   end
 end
@@ -71,35 +75,37 @@ EchoStub = EchoService.rpc_stub_class
 # For testing server interceptors
 class TestServerInterceptor < GRPC::ServerInterceptor
   def request_response(request:, call:, method:)
-    p "Received request/response call at method #{method}" \
-      " with request #{request} for call #{call}"
+    GRPC.logger.info("Received request/response call at method #{method}" \
+      " with request #{request} for call #{call}")
     call.output_metadata[:interc] = 'from_request_response'
-    p "[GRPC::Ok] (#{method.owner.name}.#{method.name})"
+    GRPC.logger.info("[GRPC::Ok] (#{method.owner.name}.#{method.name})")
     yield
   end
 
   def client_streamer(call:, method:)
     call.output_metadata[:interc] = 'from_client_streamer'
     call.each_remote_read.each do |r|
-      p "In interceptor: #{r}"
+      GRPC.logger.info("In interceptor: #{r}")
     end
-    p "Received client streamer call at method #{method} for call #{call}"
+    GRPC.logger.info(
+      "Received client streamer call at method #{method} for call #{call}"
+    )
     yield
   end
 
   def server_streamer(request:, call:, method:)
-    p "Received server streamer call at method #{method} with request" \
-      " #{request} for call #{call}"
+    GRPC.logger.info("Received server streamer call at method #{method} with request" \
+      " #{request} for call #{call}")
     call.output_metadata[:interc] = 'from_server_streamer'
     yield
   end
 
   def bidi_streamer(requests:, call:, method:)
     requests.each do |r|
-      p "Bidi request: #{r}"
+      GRPC.logger.info("Bidi request: #{r}")
     end
-    p "Received bidi streamer call at method #{method} with requests" \
-      " #{requests} for call #{call}"
+    GRPC.logger.info("Received bidi streamer call at method #{method} with requests" \
+      " #{requests} for call #{call}")
     call.output_metadata[:interc] = 'from_bidi_streamer'
     yield
   end
@@ -108,38 +114,38 @@ end
 # For testing client interceptors
 class TestClientInterceptor < GRPC::ClientInterceptor
   def request_response(request:, call:, method:, metadata: {})
-    p "Intercepted request/response call at method #{method}" \
+    GRPC.logger.info("Intercepted request/response call at method #{method}" \
       " with request #{request} for call #{call}" \
-      " and metadata: #{metadata}"
+      " and metadata: #{metadata}")
     metadata['foo'] = 'bar_from_request_response'
     yield
   end
 
   def client_streamer(requests:, call:, method:, metadata: {})
-    p "Received client streamer call at method #{method}" \
+    GRPC.logger.info("Received client streamer call at method #{method}" \
       " with requests #{requests} for call #{call}" \
-      " and metadata: #{metadata}"
+      " and metadata: #{metadata}")
     requests.each do |r|
-      p "In client interceptor: #{r}"
+      GRPC.logger.info("In client interceptor: #{r}")
     end
     metadata['foo'] = 'bar_from_client_streamer'
     yield
   end
 
   def server_streamer(request:, call:, method:, metadata: {})
-    p "Received server streamer call at method #{method}" \
+    GRPC.logger.info("Received server streamer call at method #{method}" \
       " with request #{request} for call #{call}" \
-      " and metadata: #{metadata}"
+      " and metadata: #{metadata}")
     metadata['foo'] = 'bar_from_server_streamer'
     yield
   end
 
   def bidi_streamer(requests:, call:, method:, metadata: {})
-    p "Received bidi streamer call at method #{method}" \
+    GRPC.logger.info("Received bidi streamer call at method #{method}" \
       "with requests #{requests} for call #{call}" \
-      " and metadata: #{metadata}"
+      " and metadata: #{metadata}")
     requests.each do |r|
-      p "In client interceptor: #{r}"
+      GRPC.logger.info("In client interceptor: #{r}")
     end
     metadata['foo'] = 'bar_from_bidi_streamer'
     yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0.pre1
 platform: universal-darwin
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -297,6 +297,7 @@ files:
 - src/ruby/spec/generic/server_interceptors_spec.rb
 - src/ruby/spec/generic/service_spec.rb
 - src/ruby/spec/google_rpc_status_utils_spec.rb
+- 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
 - src/ruby/spec/server_credentials_spec.rb
@@ -331,9 +332,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7
@@ -360,6 +361,7 @@ test_files:
 - src/ruby/spec/generic/server_interceptors_spec.rb
 - src/ruby/spec/generic/service_spec.rb
 - src/ruby/spec/google_rpc_status_utils_spec.rb
+- 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
 - src/ruby/spec/server_credentials_spec.rb