protobuf 3.3.6 → 3.4.0

data/lib/protobuf/rpc/stat.rb

@@ -17,9 +17,7 @@ module Protobuf
         start
       end
 
-      def client=(client_host)
-        @client = client_host
-      end
+      attr_writer :client
 
       def client
         @client || nil
@@ -34,7 +32,7 @@ module Protobuf
       end
 
       def server=(peer)
-        @server = {:port => peer[0], :ip => peer[1]}
+        @server = { :port => peer[0], :ip => peer[1] }
       end
 
       def server
@@ -63,7 +61,7 @@ module Protobuf
       end
 
       def stopped?
-        ! end_time.nil?
+        !end_time.nil?
       end
 
       def rpc
@@ -86,7 +84,7 @@ module Protobuf
           rpc,
           sizes,
           elapsed_time,
-          @end_time.try(:iso8601)
+          @end_time.try(:iso8601),
         ].compact.join(' - ')
       end
 
@@ -97,4 +95,3 @@ module Protobuf
     end
   end
 end
-

data/lib/protobuf/socket.rb

@@ -19,4 +19,3 @@ require 'protobuf'
 
 require 'protobuf/rpc/servers/socket/server'
 require 'protobuf/rpc/connectors/socket'
-

data/lib/protobuf/tasks/compile.rake

@@ -3,7 +3,7 @@ require 'fileutils'
 namespace :protobuf do
 
   desc 'Clean & Compile the protobuf source to ruby classes. Pass PB_NO_CLEAN=1 if you do not want to force-clean first.'
-  task :compile, [ :package, :source, :destination, :plugin, :file_extension ] do |tasks, args|
+  task :compile, [:package, :source, :destination, :plugin, :file_extension] do |_tasks, args|
     args.with_defaults(:destination => 'lib')
     args.with_defaults(:source => 'definitions')
     args.with_defaults(:plugin => 'ruby')
@@ -27,7 +27,7 @@ namespace :protobuf do
   end
 
   desc 'Clean the generated *.pb.rb files from the destination package. Pass PB_FORCE_CLEAN=1 to skip confirmation step.'
-  task :clean, [ :package, :destination, :file_extension ] do |task, args|
+  task :clean, [:package, :destination, :file_extension] do |_task, args|
     args.with_defaults(:destination => 'lib')
     args.with_defaults(:file_extension => '.pb.rb')
 

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.3.6'
+  VERSION = '3.4.0'
 end

data/protobuf.gemspec

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-$:.push ::File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push ::File.expand_path("../lib", __FILE__)
 require "protobuf/version"
 
 ::Gem::Specification.new do |s|
@@ -25,11 +25,27 @@ require "protobuf/version"
   s.add_dependency 'thread_safe'
 
   s.add_development_dependency 'ffi-rzmq'
-  s.add_development_dependency 'pry-nav'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '>= 3.0'
+  s.add_development_dependency 'rubocop'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'yard'
   s.add_development_dependency 'timecop'
-  s.add_development_dependency 'perftools.rb'
+  s.add_development_dependency 'yard'
+
+  # debuggers only work in MRI
+  if RUBY_ENGINE.to_sym == :ruby
+    # we don't support MRI < 1.9.3
+    pry_debugger = if RUBY_VERSION < '2.0.0'
+      'pry-debugger'
+    else
+      'pry-byebug'
+    end
+
+    s.add_development_dependency pry_debugger
+    s.add_development_dependency 'pry-stack_explorer'
+  else
+    s.add_development_dependency 'pry'
+  end
+
+  s.add_development_dependency 'ruby-prof' if RUBY_ENGINE.to_sym == :ruby
 end

data/spec/benchmark/tasks.rb

@@ -3,11 +3,13 @@ require 'protobuf/socket'
 require 'support/all'
 require 'support/test/resource_service'
 
-begin
-  require 'perftools'
-rescue LoadError
-  $stderr.puts 'perftools must be uncommented in the gemspec before you can run this benchmark task'
-  exit(1)
+case RUBY_ENGINE.to_sym
+when :ruby
+  require 'ruby-prof'
+when :rbx
+  require 'rubinius/profiler'
+when :jruby
+  require 'jruby/profiler'
 end
 
 # Including a way to turn on debug logger for spec runs
@@ -32,12 +34,14 @@ namespace :benchmark do
   def sock_client_sock_server(number_tests, test_length, global_bench = nil)
     load "protobuf/socket.rb"
 
-    StubServer.new(:server => Protobuf::Rpc::Socket::Server, :port => 9399) do |server|
-      client = ::Test::ResourceService.client(:port => 9399)
+    port = 1000 + Kernel.rand(2**16 - 1000)
+
+    StubServer.new(:server => Protobuf::Rpc::Socket::Server, :port => port) do
+      client = ::Test::ResourceService.client(:port => port)
 
       benchmark_wrapper(global_bench) do |bench|
         bench.report("SS / SC") do
-          (1..number_tests.to_i).each { client.find(:name => "Test Name" * test_length.to_i, :active => true) }
+          Integer(number_tests).times { client.find(:name => "Test Name" * Integer(test_length), :active => true) }
         end
       end
     end
@@ -45,28 +49,31 @@ namespace :benchmark do
 
   def zmq_client_zmq_server(number_tests, test_length, global_bench = nil)
     load "protobuf/zmq.rb"
-    StubServer.new(:port => 9399, :server => Protobuf::Rpc::Zmq::Server) do |server|
-      client = ::Test::ResourceService.client(:port => 9399)
+
+    port = 1000 + Kernel.rand(2**16 - 1000)
+
+    StubServer.new(:port => port, :server => Protobuf::Rpc::Zmq::Server) do
+      client = ::Test::ResourceService.client(:port => port)
 
       benchmark_wrapper(global_bench) do |bench|
         bench.report("ZS / ZC") do
-          (1..number_tests.to_i).each { client.find(:name => "Test Name" * test_length.to_i, :active => true) }
+          Integer(number_tests).times { client.find(:name => "Test Name" * Integer(test_length), :active => true) }
         end
       end
-      server.stop
     end
   end
 
   desc "benchmark ZMQ client with ZMQ server"
-  task :zmq_client_zmq_server, [:number, :length] do |t, args|
+  task :zmq_client_zmq_server, [:number, :length] do |_task, args|
     args.with_defaults(:number => 1000, :length => 100)
     zmq_client_zmq_server(args[:number], args[:length])
   end
 
   desc "benchmark ZMQ client with ZMQ server and profile"
-  task :zmq_profile, [:number, :length, :profile_output] do |t, args|
+  task :zmq_profile, [:number, :length, :profile_output] do |_task, args|
     args.with_defaults(:number => 1000, :length => 100, :profile_output => "/tmp/zmq_profiler_#{Time.now.to_i}")
-    ::PerfTools::CpuProfiler.start(args[:profile_output]) do
+
+    profile_code(args[:profile_output]) do
       zmq_client_zmq_server(args[:number], args[:length])
     end
 
@@ -74,35 +81,54 @@ namespace :benchmark do
   end
 
   desc "benchmark Protobuf Message #new"
-  task :profile_protobuf_new, [:number, :profile_output] do |t, args|
+  task :profile_protobuf_new, [:number, :profile_output] do |_task, args|
     args.with_defaults(:number => 1000, :profile_output => "/tmp/profiler_new_#{Time.now.to_i}")
     create_params = { :name => "The name that we set", :date_created => Time.now.to_i, :status => 2 }
-    ::PerfTools::CpuProfiler.start(args[:profile_output]) do
-      args[:number].to_i.times { Test::Resource.new(create_params) }
+    profile_code(args[:profile_output]) do
+      Integer(args[:number]).times { Test::Resource.new(create_params) }
     end
 
     puts args[:profile_output]
   end
 
   desc "benchmark Protobuf Message #serialize"
-  task :profile_protobuf_serialize, [:number, :profile_output] do |t, args|
+  task :profile_protobuf_serialize, [:number, :profile_output] do |_task, args|
     args.with_defaults(:number => 1000, :profile_output => "/tmp/profiler_new_#{Time.now.to_i}")
     create_params = { :name => "The name that we set", :date_created => Time.now.to_i, :status => 2 }
-    ::PerfTools::CpuProfiler.start(args[:profile_output]) do
-      args[:number].to_i.times { Test::Resource.new(create_params).serialize }
+    profile_code(args[:profile_output]) do
+      Integer(args[:number]).times { Test::Resource.new(create_params).serialize }
     end
 
     puts args[:profile_output]
   end
 
+  def profile_code(output, &block)
+    case RUBY_ENGINE.to_sym
+    when :ruby
+      profile_data = RubyProf.profile(&block)
+      RubyProf::FlatPrinter.new(profile_data).print(:path => output)
+    when :rbx
+      profiler = Rubinius::Profiler::Instrumenter.new
+      profiler.profile(false, &block)
+      File.open(output, 'w') do |f|
+        profiler.show(f)
+      end
+    when :jruby
+      profile_data = JRuby::Profiler.profile(&block)
+      File.open(output, 'w') do |f|
+        JRuby::Profiler::FlatProfilePrinter.new(profile_data).printProfile(f)
+      end
+    end
+  end
+
   desc "benchmark Socket client with Socket server"
-  task :sock_client_sock_server, [:number, :length] do |t, args|
+  task :sock_client_sock_server, [:number, :length] do |_task, args|
     args.with_defaults(:number => 1000, :length => 100)
     sock_client_sock_server(args[:number], args[:length])
   end
 
   desc "benchmark server performance"
-  task :servers, [:number, :length] do |t, args|
+  task :servers, [:number, :length] do |_task, args|
     args.with_defaults(:number => 1000, :length => 100)
 
     Benchmark.bm(10) do |bench|

data/spec/bin/protoc-gen-ruby_spec.rb

@@ -2,17 +2,22 @@ require 'spec_helper'
 
 require 'protobuf/code_generator'
 
-describe 'protoc-gen-ruby' do
+RSpec.describe 'protoc-gen-ruby' do
   let(:binpath) { ::File.expand_path('../../../bin/protoc-gen-ruby', __FILE__) }
-  let(:request_bytes) { ::Google::Protobuf::Compiler::CodeGeneratorRequest.new(:file_to_generate => [ "test/foo.proto" ]) }
-  let(:expected_file) { ::Google::Protobuf::Compiler::CodeGeneratorResponse::File.new(:name => 'test/foo.pb.rb') }
-  let(:expected_response_bytes) { ::Google::Protobuf::Compiler::CodeGeneratorRequest.encode(:files => [ expected_file ]) }
+  let(:package) { 'test' }
+  let(:request_bytes) do
+    ::Google::Protobuf::Compiler::CodeGeneratorRequest.encode(
+      :proto_file => [{ :package => package }],
+    )
+  end
 
   it 'reads the serialized request bytes and outputs serialized response bytes' do
     ::IO.popen(binpath, 'w+') do |pipe|
       pipe.write(request_bytes)
-      expect(pipe.read(expected_response_bytes.size)).to eq expected_response_bytes
+      pipe.close_write # needed so we can implicitly read until EOF
+      response_bytes = pipe.read
+      response = ::Google::Protobuf::Compiler::CodeGeneratorResponse.decode(response_bytes)
+      expect(response.file.first.content).to include("module #{package.titleize}")
     end
   end
 end
-

data/spec/encoding/all_types_spec.rb

@@ -1,84 +1,98 @@
 require 'spec_helper'
 
-describe ::Protobuf do
+RSpec.describe ::Protobuf do
   it "correctly encodes all types" do
     message = GoogleUnittest::TestAllTypes.new(
-      optional_int32:    101,
-      optional_int64:    102,
-      optional_uint32:   103,
-      optional_uint64:   104,
-      optional_sint32:   105,
-      optional_sint64:   106,
-      optional_fixed32:  107,
-      optional_fixed64:  108,
-      optional_sfixed32: 109,
-      optional_sfixed64: 110,
-      optional_float:    111,
-      optional_double:   112,
-      optional_bool:     true,
-      optional_string:   "115",
-      optional_bytes:    "116",
-      optional_nested_message: GoogleUnittest::TestAllTypes::NestedMessage.new(bb: 118),
-      optional_foreign_message: GoogleUnittest::ForeignMessage.new(c: 119),
-      optional_import_message: GoogleUnittestImport::ImportMessage.new(d: 120),
-      optional_nested_enum: GoogleUnittest::TestAllTypes::NestedEnum::BAZ,
-      optional_foreign_enum: GoogleUnittest::ForeignEnum::FOREIGN_BAZ,
-      optional_import_enum: GoogleUnittestImport::ImportEnum::IMPORT_BAZ,
-      optional_string_piece: "124",
-      optional_cord: "125",
-      optional_public_import_message: GoogleUnittestImport::PublicImportMessage.new(e: 126),
-      optional_lazy_message: GoogleUnittest::TestAllTypes::NestedMessage.new(bb: 127),
-      repeated_int32:    [201, 301],
-      repeated_int64:    [202, 302],
-      repeated_uint32:   [203, 303],
-      repeated_uint64:   [204, 304],
-      repeated_sint32:   [205, 305],
-      repeated_sint64:   [206, 306],
-      repeated_fixed32:  [207, 307],
-      repeated_fixed64:  [208, 308],
-      repeated_sfixed32: [209, 309],
-      repeated_sfixed64: [210, 310],
-      repeated_float:    [211, 311],
-      repeated_double:   [212, 312],
-      repeated_bool:     [true, false],
-      repeated_string:   ["215", "315"],
-      repeated_bytes:    ["216", "316"],
-      repeated_nested_message: [::GoogleUnittest::TestAllTypes::NestedMessage.new(bb: 218),
-                                ::GoogleUnittest::TestAllTypes::NestedMessage.new(bb: 318)],
-      repeated_foreign_message: [::GoogleUnittest::ForeignMessage.new(c: 219),
-                                 ::GoogleUnittest::ForeignMessage.new(c: 319)],
-      repeated_import_message: [::GoogleUnittestImport::ImportMessage.new(d: 220),
-                                ::GoogleUnittestImport::ImportMessage.new(d: 320)],
-      repeated_nested_enum: [::GoogleUnittest::TestAllTypes::NestedEnum::BAR,
-                             ::GoogleUnittest::TestAllTypes::NestedEnum::BAZ],
-      repeated_foreign_enum: [::GoogleUnittest::ForeignEnum::FOREIGN_BAR,
-                              ::GoogleUnittest::ForeignEnum::FOREIGN_BAZ],
-      repeated_import_enum: [::GoogleUnittestImport::ImportEnum::IMPORT_BAR,
-                             ::GoogleUnittestImport::ImportEnum::IMPORT_BAZ],
-      repeated_string_piece: ["224", "324"],
-      repeated_cord: ["225", "325"],
-      repeated_lazy_message: [::GoogleUnittest::TestAllTypes::NestedMessage.new(bb:227),
-                              ::GoogleUnittest::TestAllTypes::NestedMessage.new(bb:327)],
-      default_int32: 401,
-      default_int64: 402,
-      default_uint32: 403,
-      default_uint64: 404,
-      default_sint32: 405,
-      default_sint64: 406,
-      default_fixed32: 407,
-      default_fixed64: 408,
-      default_sfixed32: 409,
-      default_sfixed64: 410,
-      default_float: 411,
-      default_double: 412,
-      default_bool: false,
-      default_string: "415",
-      default_bytes: "416",
-      default_nested_enum: ::GoogleUnittest::TestAllTypes::NestedEnum::FOO,
-      default_foreign_enum: ::GoogleUnittest::ForeignEnum::FOREIGN_FOO,
-      default_import_enum: ::GoogleUnittestImport::ImportEnum::IMPORT_FOO,
-      default_string_piece: "424",
-      default_cord: "425",
+      :optional_int32 => 101,
+      :optional_int64 => 102,
+      :optional_uint32 => 103,
+      :optional_uint64 => 104,
+      :optional_sint32 => 105,
+      :optional_sint64 => 106,
+      :optional_fixed32 => 107,
+      :optional_fixed64 => 108,
+      :optional_sfixed32 => 109,
+      :optional_sfixed64 => 110,
+      :optional_float => 111,
+      :optional_double => 112,
+      :optional_bool => true,
+      :optional_string => "115",
+      :optional_bytes => "116",
+      :optional_nested_message => GoogleUnittest::TestAllTypes::NestedMessage.new(:bb => 118),
+      :optional_foreign_message => GoogleUnittest::ForeignMessage.new(:c => 119),
+      :optional_import_message => GoogleUnittestImport::ImportMessage.new(:d => 120),
+      :optional_nested_enum => GoogleUnittest::TestAllTypes::NestedEnum::BAZ,
+      :optional_foreign_enum => GoogleUnittest::ForeignEnum::FOREIGN_BAZ,
+      :optional_import_enum => GoogleUnittestImport::ImportEnum::IMPORT_BAZ,
+      :optional_string_piece => "124",
+      :optional_cord => "125",
+      :optional_public_import_message => GoogleUnittestImport::PublicImportMessage.new(:e => 126),
+      :optional_lazy_message => GoogleUnittest::TestAllTypes::NestedMessage.new(:bb => 127),
+      :repeated_int32 => [201, 301],
+      :repeated_int64 => [202, 302],
+      :repeated_uint32 => [203, 303],
+      :repeated_uint64 => [204, 304],
+      :repeated_sint32 => [205, 305],
+      :repeated_sint64 => [206, 306],
+      :repeated_fixed32 => [207, 307],
+      :repeated_fixed64 => [208, 308],
+      :repeated_sfixed32 => [209, 309],
+      :repeated_sfixed64 => [210, 310],
+      :repeated_float => [211, 311],
+      :repeated_double => [212, 312],
+      :repeated_bool => [true, false],
+      :repeated_string => ["215", "315"],
+      :repeated_bytes => ["216", "316"],
+      :repeated_nested_message => [
+        ::GoogleUnittest::TestAllTypes::NestedMessage.new(:bb => 218),
+        ::GoogleUnittest::TestAllTypes::NestedMessage.new(:bb => 318),
+      ],
+      :repeated_foreign_message => [
+        ::GoogleUnittest::ForeignMessage.new(:c => 219),
+        ::GoogleUnittest::ForeignMessage.new(:c => 319),
+      ],
+      :repeated_import_message => [
+        ::GoogleUnittestImport::ImportMessage.new(:d => 220),
+        ::GoogleUnittestImport::ImportMessage.new(:d => 320),
+      ],
+      :repeated_nested_enum => [
+        ::GoogleUnittest::TestAllTypes::NestedEnum::BAR,
+        ::GoogleUnittest::TestAllTypes::NestedEnum::BAZ,
+      ],
+      :repeated_foreign_enum => [
+        ::GoogleUnittest::ForeignEnum::FOREIGN_BAR,
+        ::GoogleUnittest::ForeignEnum::FOREIGN_BAZ,
+      ],
+      :repeated_import_enum => [
+        ::GoogleUnittestImport::ImportEnum::IMPORT_BAR,
+        ::GoogleUnittestImport::ImportEnum::IMPORT_BAZ,
+      ],
+      :repeated_string_piece => ["224", "324"],
+      :repeated_cord => ["225", "325"],
+      :repeated_lazy_message => [
+        ::GoogleUnittest::TestAllTypes::NestedMessage.new(:bb => 227),
+        ::GoogleUnittest::TestAllTypes::NestedMessage.new(:bb => 327),
+      ],
+      :default_int32 => 401,
+      :default_int64 => 402,
+      :default_uint32 => 403,
+      :default_uint64 => 404,
+      :default_sint32 => 405,
+      :default_sint64 => 406,
+      :default_fixed32 => 407,
+      :default_fixed64 => 408,
+      :default_sfixed32 => 409,
+      :default_sfixed64 => 410,
+      :default_float => 411,
+      :default_double => 412,
+      :default_bool => false,
+      :default_string => "415",
+      :default_bytes => "416",
+      :default_nested_enum => ::GoogleUnittest::TestAllTypes::NestedEnum::FOO,
+      :default_foreign_enum => ::GoogleUnittest::ForeignEnum::FOREIGN_FOO,
+      :default_import_enum => ::GoogleUnittestImport::ImportEnum::IMPORT_FOO,
+      :default_string_piece => "424",
+      :default_cord => "425",
     )
 
     data_file_path = File.expand_path('../../support/test/all_types.data.bin', __FILE__)