diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-07-26 12:29:03 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-07-26 12:29:03 -0700 |
| commit | 032fb914e205f6a4d59097c4e27a650eb5a21c7b (patch) | |
| tree | 29ad5dbdb37192e46889041e97ad87ceba0299c2 /ruby | |
| parent | 0973822d03992fd818e5424020e6c618f3f33649 (diff) | |
| parent | ba52f2b6780fa5e6bee86cf7e8ee6f6ba617862c (diff) | |
| download | protobuf-032fb914e205f6a4d59097c4e27a650eb5a21c7b.tar.gz protobuf-032fb914e205f6a4d59097c4e27a650eb5a21c7b.tar.bz2 protobuf-032fb914e205f6a4d59097c4e27a650eb5a21c7b.zip | |
Merge branch 'master' of github.com:google/protobuf into 3.0.0-GA
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/Rakefile | 7 | ||||
| -rw-r--r-- | ruby/tests/generated_code.proto | 2 | ||||
| -rw-r--r-- | ruby/tests/generated_code_test.rb | 4 | ||||
| -rw-r--r-- | ruby/tests/test_import.proto | 5 |
4 files changed, 15 insertions, 3 deletions
diff --git a/ruby/Rakefile b/ruby/Rakefile index fa29c315..ba1cf4cf 100644 --- a/ruby/Rakefile +++ b/ruby/Rakefile @@ -31,7 +31,7 @@ genproto_output = [] unless ENV['IN_DOCKER'] == 'true' well_known_protos.each do |proto_file| input_file = "../src/" + proto_file - output_file = "lib/" + proto_file.sub(/\.proto$/, ".rb") + output_file = "lib/" + proto_file.sub(/\.proto$/, "_pb.rb") genproto_output << output_file file output_file => input_file do |file_task| sh "../src/protoc -I../src --ruby_out=lib #{input_file}" @@ -80,10 +80,15 @@ end # Proto for tests. genproto_output << "tests/generated_code.rb" +genproto_output << "tests/test_import.rb" file "tests/generated_code.rb" => "tests/generated_code.proto" do |file_task| sh "../src/protoc --ruby_out=. tests/generated_code.proto" end +file "tests/test_import.rb" => "tests/test_import.proto" do |file_task| + sh "../src/protoc --ruby_out=. tests/test_import.proto" +end + task :genproto => genproto_output task :clean do diff --git a/ruby/tests/generated_code.proto b/ruby/tests/generated_code.proto index 42d82a6b..62fd83ed 100644 --- a/ruby/tests/generated_code.proto +++ b/ruby/tests/generated_code.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package A.B.C; +package a.b.c; message TestMessage { int32 optional_int32 = 1; diff --git a/ruby/tests/generated_code_test.rb b/ruby/tests/generated_code_test.rb index daef357a..b92b0462 100644 --- a/ruby/tests/generated_code_test.rb +++ b/ruby/tests/generated_code_test.rb @@ -3,7 +3,8 @@ # generated_code.rb is in the same directory as this test. $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) -require 'generated_code' +require 'generated_code_pb' +require 'test_import_pb' require 'test/unit' class GeneratedCodeTest < Test::Unit::TestCase @@ -13,5 +14,6 @@ class GeneratedCodeTest < Test::Unit::TestCase # successfully creates message definitions and classes, not to test every # aspect of the extension (basic.rb is for that). m = A::B::C::TestMessage.new() + m2 = FooBar::TestImportedMessage.new() end end diff --git a/ruby/tests/test_import.proto b/ruby/tests/test_import.proto new file mode 100644 index 00000000..230484ee --- /dev/null +++ b/ruby/tests/test_import.proto @@ -0,0 +1,5 @@ +syntax = "proto3"; + +package foo_bar; + +message TestImportedMessage {} |