Merge branch 'master' of https://github.com/grpc/grpc into channelz

3 files changed, 100 insertions, 0 deletions

diff --git a/src/ruby/end2end/package_with_underscore_checker.rb b/src/ruby/end2end/package_with_underscore_checker.rb
new file mode 100644
index 0000000000..27ea00ffa7
--- /dev/null
+++ b/src/ruby/end2end/package_with_underscore_checker.rb
@@ -0,0 +1,54 @@
+# 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 'open3'
+require 'tmpdir'
+
+def main
+  root_dir = File.join(File.dirname(__FILE__), '..', '..', '..')
+  pb_dir = File.join(root_dir, 'src', 'ruby', 'end2end', 'protos')
+
+  fail 'CONFIG env variable unexpectedly unset' unless ENV['CONFIG']
+  bins_sub_dir = ENV['CONFIG']
+  bins_dir = File.join(root_dir, 'bins', bins_sub_dir)
+
+  plugin = File.join(bins_dir, 'grpc_ruby_plugin')
+  protoc = File.join(bins_dir, 'protobuf', 'protoc')
+
+  got = nil
+
+  Dir.mktmpdir do |tmp_dir|
+    gen_out = File.join(tmp_dir, 'package_with_underscore', 'service_services_pb.rb')
+
+    pid = spawn(
+      protoc,
+      "--proto_path=#{pb_dir}",
+      'package_with_underscore/service.proto',
+      "--grpc_out=#{tmp_dir}",
+      "--plugin=protoc-gen-grpc=#{plugin}"
+    )
+    Process.waitpid2(pid)
+    File.open(gen_out) { |f| got = f.read }
+  end
+
+  correct_modularized_rpc = 'rpc :TestOne, ' \
+                            'Grpc::Testing::PackageWithUnderscore::Data::Request, ' \
+                            'Grpc::Testing::PackageWithUnderscore::Data::Response'
+
+  return if got.include?(correct_modularized_rpc)
+
+  fail 'generated file does not match with correct_modularized_rpc'
+end
+
+main
diff --git a/src/ruby/end2end/protos/package_with_underscore/data.proto b/src/ruby/end2end/protos/package_with_underscore/data.proto
new file mode 100644
index 0000000000..2706f1d7be
--- /dev/null
+++ b/src/ruby/end2end/protos/package_with_underscore/data.proto
@@ -0,0 +1,23 @@
+// 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.
+
+syntax = "proto3";
+
+package grpc.testing.package_with_underscore.data;
+
+message Request {
+}
+
+message Response {
+}
diff --git a/src/ruby/end2end/protos/package_with_underscore/service.proto b/src/ruby/end2end/protos/package_with_underscore/service.proto
new file mode 100644
index 0000000000..814c7898cd
--- /dev/null
+++ b/src/ruby/end2end/protos/package_with_underscore/service.proto
@@ -0,0 +1,23 @@
+// 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.
+
+syntax = "proto3";
+
+package grpc.testing.package_with_underscore.service;
+
+import "package_with_underscore/data.proto";
+
+service MyService {
+  rpc TestOne(data.Request) returns (data.Response) {}
+}