diff options
| author |  Joshua Haberman <jhaberman@gmail.com> | 2016-07-25 14:58:41 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-25 14:58:41 -0700 |
| commit | b1cecb676226233036fb66fe4f3267d95c41c2aa (patch) | |
| tree | 0b615fe87623639c44c2b28284a20a8e9ac44cd6 /ruby | |
| parent | 868ea59256b999175ba04c1b9cfe74ff1fbae13d (diff) | |
| parent | 4f19797baf1c874c3aa03202908178ec66d7b45c (diff) | |
Merge pull request #1837 from haberman/rubygencodename
Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/Rakefile | 2 | ||||
| -rw-r--r-- | ruby/tests/generated_code_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ruby/Rakefile b/ruby/Rakefile index fa29c315..f6354e1e 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}" diff --git a/ruby/tests/generated_code_test.rb b/ruby/tests/generated_code_test.rb index daef357a..26bafdd6 100644 --- a/ruby/tests/generated_code_test.rb +++ b/ruby/tests/generated_code_test.rb @@ -3,7 +3,7 @@ # 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/unit' class GeneratedCodeTest < Test::Unit::TestCase |