protobuf 1.4.2 → 2.0.0.rc1

data/spec/{unit → lib/protobuf}/rpc/connectors/socket_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
+require 'protobuf/socket'
 
-shared_examples "a Protobuf Connector" do 
+shared_examples "a Protobuf Connector" do
   subject{ described_class.new({}) }
 
   context "API" do
@@ -12,17 +13,17 @@ shared_examples "a Protobuf Connector" do
   end
 end
 
-describe Protobuf::Rpc::Connectors::Socket do 
+describe Protobuf::Rpc::Connectors::Socket do
   subject{ described_class.new({}) }
 
   it_behaves_like "a Protobuf Connector"
-  
+
   specify{ described_class.include?(Protobuf::Rpc::Connectors::Common).should be_true }
 
   context "#read_response" do
     let(:data){ "New data" }
 
-    it "fills the buffer with data from the socket" do 
+    it "fills the buffer with data from the socket" do
       socket = StringIO.new("#{data.bytesize}-#{data}")
       subject.instance_variable_set(:@socket, socket)
       subject.instance_variable_set(:@stats, OpenStruct.new)
@@ -33,13 +34,13 @@ describe Protobuf::Rpc::Connectors::Socket do
     end
   end
 
-  context "#check_async" do 
-    it "raises an error when trying to execute asynchronously" do 
-      conn = described_class.new(:async => true) 
+  context "#check_async" do
+    it "raises an error when trying to execute asynchronously" do
+      conn = described_class.new(:async => true)
       expect{ conn.__send__(:check_async) }.to raise_error
     end
 
-    it "allows execution when synchronous" do 
+    it "allows execution when synchronous" do
       conn = described_class.new(:async => false)
       expect{ conn.__send__(:check_async) }.to_not raise_error
     end

data/spec/{unit → lib/protobuf}/rpc/connectors/zmq_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'protobuf/zmq'
 
 describe ::Protobuf::Rpc::Connectors::Zmq do
   let(:socket_mock) do
@@ -23,5 +24,4 @@ describe ::Protobuf::Rpc::Connectors::Zmq do
     }.to raise_error
   end
 
-
 end

data/spec/{unit → lib/protobuf}/rpc/servers/evented_server_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 require 'spec/proto/test_service_impl'
 require 'protobuf/rpc/servers/evented_runner'
+require 'protobuf/evented'
 
 describe Protobuf::Rpc::Evented::Server do
 
-  it "provides a Runner class" do 
+  it "provides a Runner class" do
     runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner")
-    expect { Protobuf::Util.constantize(runner_class) }.to_not raise_error     
+    expect { runner_class.constantize }.to_not raise_error
   end
 
   it "Runner provides a stop method" do
-    runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner")
-    runner_class = Protobuf::Util.constantize(runner_class)
+    runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner").constantize
     runner_class.respond_to?(:stop).should be_true
   end
 

data/spec/{unit → lib/protobuf}/rpc/servers/socket_server_spec.rb

@@ -1,9 +1,18 @@
 require 'spec_helper'
 require 'spec/proto/test_service_impl'
 require 'protobuf/rpc/servers/socket_runner'
+require 'protobuf/evented'
+require 'protobuf/socket'
 
 describe Protobuf::Rpc::Socket::Server do
+  before(:each) do 
+    load 'protobuf/socket.rb' 
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
+  end
+
   before(:all) do
+    load 'protobuf/socket.rb' 
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
     Thread.abort_on_exception = true
     server = OpenStruct.new(:server => "127.0.0.1", :port => 9399, :backlog => 100, :threshold => 100)
     @server_thread = Thread.new(server) { |s| Protobuf::Rpc::SocketRunner.run(s) }
@@ -16,8 +25,7 @@ describe Protobuf::Rpc::Socket::Server do
   end
 
   it "Runner provides a stop method" do
-    runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner")
-    runner_class = Protobuf::Util.constantize(runner_class)
+    runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner").constantize
     runner_class.respond_to?(:stop).should be_true
   end
 
@@ -27,31 +35,11 @@ describe Protobuf::Rpc::Socket::Server do
 
   it "provides a Runner class" do
     runner_class = described_class.to_s.gsub(/Evented::Server/, "EventedRunner")
-    expect { Protobuf::Util.constantize(runner_class) }.to_not raise_error
+    expect { runner_class.constantize }.to_not raise_error
   end
 
   it "signals the Server is running" do
     described_class.running?.should be_true
   end
 
-  context "Eventmachine client" do
-    it "calls the service in the client request" do
-      with_constants "Protobuf::ClientType" => "Evented" do
-        client = Spec::Proto::TestService.client(:async => false, :port => 9399, :host => "127.0.0.1")
-
-        client.find(:name => "Test Name", :active => true) do |c|
-          c.on_success do |succ|
-            succ.name.should eq("Test Name")
-            succ.status.should eq(Spec::Proto::StatusType::ENABLED)
-          end
-
-          c.on_failure do |err|
-            raise err.inspect
-          end
-        end
-      end
-    end
-
-  end
-
 end

data/spec/{unit → lib/protobuf}/rpc/servers/zmq/broker_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe ::Protobuf::Rpc::Zmq::Broker do
+  before(:each) do 
+    load 'protobuf/zmq.rb' 
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
+  end
+
   after(:each) do
     subject.teardown
   end

data/spec/{unit → lib/protobuf}/rpc/servers/zmq/server_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 require 'protobuf/rpc/servers/zmq/server'
 
 describe Protobuf::Rpc::Zmq::Server do
+  before(:each) do 
+    load 'protobuf/zmq.rb'
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
+  end
+
   describe '.running?' do
     it 'returns true if running' do
       described_class.instance_variable_set(:@running, true)

data/spec/{unit → lib/protobuf}/rpc/servers/zmq/util_spec.rb

@@ -5,6 +5,11 @@ class UtilTest
 end
 
 describe ::Protobuf::Rpc::Zmq::Util do
+  before(:each) do
+    load 'protobuf/zmq.rb' 
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
+  end
+
   subject { UtilTest.new }
   describe '#zmq_error_check' do
     it 'raises when the error code is less than 0' do

data/spec/{unit → lib/protobuf}/rpc/servers/zmq/worker_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 describe ::Protobuf::Rpc::Zmq::Worker do
+  before(:each) do 
+    load 'protobuf/zmq.rb'
+    ::Protobuf::Rpc::Connector.connector_for_client(true)
+  end
+
   after(:each) do
     subject.instance_variable_get(:@socket).close
     subject.instance_variable_get(:@zmq_context).terminate

data/spec/proto/test.pb.rb

@@ -1,31 +1,54 @@
-### Generated by rprotoc. DO NOT EDIT!
-require 'protobuf/message/message'
-require 'protobuf/message/enum'
-require 'protobuf/message/extend'
+##
+# This file is auto-generated. DO NOT EDIT!
+#
+require 'protobuf/message'
+require 'protobuf/rpc/service'
 
 module Spec
   module Proto
-    class StatusType < ::Protobuf::Enum
-      define :PENDING, 0
-      define :ENABLED, 1
-      define :DISABLED, 2
-      define :DELETED, 3
-    end
-    class ResourceFindRequest < ::Protobuf::Message
-      required :string, :name, 1
-      optional :bool, :active, 2
-    end
-    class Resource < ::Protobuf::Message
-      required :string, :name, 1
-      optional :int64, :date_created, 2
-      optional :StatusType, :status, 3
-      repeated :StatusType, :repeated_enum, 4
-    end
-    class Nested < ::Protobuf::Message
-      optional :string, :name, 1
-      optional :Resource, :resource, 2
-      repeated :Resource, :multiple_resources, 3
-      optional :StatusType, :status, 4
+    ##
+    # Enum Classes
+    #
+    class StatusType < ::Protobuf::Enum; end
+    
+    ##
+    # Message Classes
+    #
+    class ResourceFindRequest < ::Protobuf::Message; end
+    class Resource < ::Protobuf::Message; end
+    class Nested < ::Protobuf::Message; end
+    
+    ##
+    # Enum Values
+    #
+    ::Spec::Proto::StatusType.define :PENDING, 0
+    ::Spec::Proto::StatusType.define :ENABLED, 1
+    ::Spec::Proto::StatusType.define :DISABLED, 2
+    ::Spec::Proto::StatusType.define :DELETED, 3
+    
+    
+    ##
+    # Message Fields
+    #
+    ::Spec::Proto::ResourceFindRequest.required(::Protobuf::Field::StringField, :name, 1)
+    ::Spec::Proto::ResourceFindRequest.optional(::Protobuf::Field::BoolField, :active, 2)
+    
+    ::Spec::Proto::Resource.required(::Protobuf::Field::StringField, :name, 1)
+    ::Spec::Proto::Resource.optional(::Protobuf::Field::Int64Field, :date_created, 2)
+    ::Spec::Proto::Resource.optional(::Spec::Proto::StatusType, :status, 3)
+    ::Spec::Proto::Resource.repeated(::Spec::Proto::StatusType, :repeated_enum, 4)
+    
+    ::Spec::Proto::Nested.optional(::Protobuf::Field::StringField, :name, 1)
+    ::Spec::Proto::Nested.optional(::Spec::Proto::Resource, :resource, 2)
+    ::Spec::Proto::Nested.repeated(::Spec::Proto::Resource, :multiple_resources, 3)
+    ::Spec::Proto::Nested.optional(::Spec::Proto::StatusType, :status, 4)
+    
+    
+    ##
+    # Services
+    #
+    class TestService < ::Protobuf::Rpc::Service
+      rpc :find, ::Spec::Proto::ResourceFindRequest, ::Spec::Proto::Resource
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,29 +4,23 @@ SimpleCov.start
 require 'rubygems'
 require 'bundler'
 Bundler.setup :default, :development, :test
+require 'pry'
 
-$:.push File.expand_path('..', File.dirname(__FILE__))
-$:.push File.expand_path('../lib', File.dirname(__FILE__))
+$: << ::File.expand_path('..', File.dirname(__FILE__))
+#$: << ::File.expand_path('../lib', File.dirname(__FILE__))
 
 require 'protobuf'
-require 'protobuf/rpc/client'
-require File.dirname(__FILE__) + '/helper/all'
-require 'pry'
-
-# these aren't explicitly required in lib/protobuf.rb. We require them here for
-# testing purposes
-require 'ffi-rzmq'
-require 'protobuf/rpc/connectors/zmq'
+require ::File.dirname(__FILE__) + '/support/all'
 
 # Including a way to turn on debug logger for spec runs
 if ENV["DEBUG"]
-  debug_log = File.expand_path('../debug_specs.log', File.dirname(__FILE__) )
-  Protobuf::Logger.configure(:file => debug_log, :level => ::Logger::DEBUG)
+  debug_log = ::File.expand_path('../debug_specs.log', File.dirname(__FILE__) )
+  ::Protobuf::Logger.configure(:file => debug_log, :level => ::Logger::DEBUG)
 end
 
-RSpec.configure do |c|
-  c.include(SilentConstants)
-  c.include(Sander6::CustomMatchers)
+::RSpec.configure do |c|
+  c.include(::SilentConstants)
+  c.include(::Sander6::CustomMatchers)
   c.mock_with :rspec
 end
 

data/spec/support/all.rb

@@ -0,0 +1,7 @@
+require 'support/tolerance_matcher'
+require 'support/server'
+require 'support/silent_constants'
+
+def now
+  Time.new.to_f
+end

data/spec/{helper → support}/server.rb

@@ -39,12 +39,10 @@ class StubServer
 
   def initialize(opts = {})
     @running = true
-    @options = OpenStruct.new({
-        :host => "127.0.0.1", 
-        :port => 9399, 
-        :delay => 0, 
-        :server => Protobuf::Rpc::Evented::Server
-      }.merge(opts))
+    @options = OpenStruct.new({ :host => "127.0.0.1",
+                                :port => 9399,
+                                :delay => 0,
+                                :server => Protobuf::Rpc::Evented::Server }.merge(opts))
 
     start
     yield self
@@ -78,7 +76,7 @@ class StubServer
   end
 
   def start_zmq_server
-    @zmq_server = Thread.new(@options) { |opt| Protobuf::Rpc::ZmqRunner.run(opt) }    
+    @zmq_server = Thread.new(@options) { |opt| Protobuf::Rpc::ZmqRunner.run(opt) }
     Thread.pass until Protobuf::Rpc::Zmq::Server.running?
   end
 

data/spec/{helper → support}/silent_constants.rb

@@ -1,4 +1,5 @@
 # Just a way to keep warnings from being flagged in rename of constants during tests
+=begin
 module Kernel
   def silence_warnings
     orig_verbosity = $VERBOSE
@@ -7,8 +8,10 @@ module Kernel
     $VERBOSE = orig_verbosity
   end
 end
+=end
 
 module SilentConstants
+=begin
   def parse(constant)
     source, _, constant_name = constant.to_s.rpartition('::')
     [Object.const_get(source.to_sym), constant_name.to_sym]
@@ -37,4 +40,5 @@ module SilentConstants
     end
   end
 
+=end
 end

data/spec/support/test_app_file.rb

@@ -0,0 +1,2 @@
+# For use in testing the rpc_server
+ENV['TEST_APP_FILE_LOADED'] = 'true'

data/test/proto/types.pb.rb

@@ -81,4 +81,4 @@ module Test
       repeated :sfixed64, :type15, 15
     end
   end
-end
+end

data/test/test_addressbook.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'protobuf/message/message'
-require 'protobuf/message/enum'
+require 'protobuf/enum'
 require 'test/proto/addressbook.pb'
 
 class AddressbookTest < Test::Unit::TestCase

data/test/test_enum_value.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'protobuf/message/message'
-require 'protobuf/message/enum'
+require 'protobuf/enum'
 require 'test/proto/addressbook.pb'
 require 'test/proto/addressbook_base.pb'
 

data/test/test_standard_message.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'protobuf/message/message'
-require 'protobuf/message/enum'
+require 'protobuf/enum'
 require 'test/proto/addressbook.pb'
 
 class StandardMessageTest < Test::Unit::TestCase

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 1.4.2
-  prerelease: 
+  version: 2.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - BJ Neilsen
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000Z
+date: 2012-10-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &2156303880 !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: &2152737880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156303880
+  version_requirements: *2152737880
 - !ruby/object:Gem::Dependency
-  name: eventually
-  requirement: &2156292740 !ruby/object:Gem::Requirement
+  name: ffi
+  requirement: &2152736420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156292740
+  version_requirements: *2152736420
 - !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: &2156290600 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &2152734540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156290600
+  version_requirements: *2152734540
 - !ruby/object:Gem::Dependency
-  name: ffi-rzmq
-  requirement: &2156289760 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &2152733360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156289760
+  version_requirements: *2152733360
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2156288320 !ruby/object:Gem::Requirement
+  name: eventmachine
+  requirement: &2152732220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156288320
+  version_requirements: *2152732220
+- !ruby/object:Gem::Dependency
+  name: ffi-rzmq
+  requirement: &2152731220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152731220
+- !ruby/object:Gem::Dependency
+  name: perftools.rb
+  requirement: &2152730060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152730060
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2156284840 !ruby/object:Gem::Requirement
+  requirement: &2152729260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156284840
+  version_requirements: *2152729260
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2156283540 !ruby/object:Gem::Requirement
+  requirement: &2152728380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156283540
+  version_requirements: *2152728380
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2156282220 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &2152727340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +121,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156282220
+  version_requirements: *2152727340
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2156281060 !ruby/object:Gem::Requirement
+  name: rake-compiler
+  requirement: &2152726380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152726380
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152725620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156281060
+  version_requirements: *2152725620
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156280200 !ruby/object:Gem::Requirement
+  requirement: &2152724560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +154,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156280200
+  version_requirements: *2152724560
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2152723720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152723720
 description: ! 'Ruby implementation for Protocol Buffers. Works with other protobuf
   rpc implementations (e.g. Java, Python, C++).
 
@@ -137,7 +181,8 @@ email:
 executables:
 - rpc_server
 - rprotoc
-extensions: []
+extensions:
+- ext/ruby_generator/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -152,33 +197,132 @@ files:
 - examples/addressbook.proto
 - examples/reading_a_message.rb
 - examples/writing_a_message.rb
+- ext/Makefile
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/code_generator.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/command_line_interface.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_enum.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_enum_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_extension.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_file.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_generator.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_helpers.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_message.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_message_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_primitive_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_service.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_string_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/importer.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_enum.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_enum_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_extension.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_file.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_generator.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_helpers.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_message.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_message_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_primitive_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_service.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/java/java_string_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/mock_code_generator.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/package_info.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/parser.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/plugin.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/plugin.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/python/python_generator.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/subprocess.h
+- ext/protobuf-2.4.1/src/google/protobuf/compiler/zip_writer.h
+- ext/protobuf-2.4.1/src/google/protobuf/descriptor.h
+- ext/protobuf-2.4.1/src/google/protobuf/descriptor.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/descriptor_database.h
+- ext/protobuf-2.4.1/src/google/protobuf/dynamic_message.h
+- ext/protobuf-2.4.1/src/google/protobuf/extension_set.h
+- ext/protobuf-2.4.1/src/google/protobuf/generated_message_reflection.h
+- ext/protobuf-2.4.1/src/google/protobuf/generated_message_util.h
+- ext/protobuf-2.4.1/src/google/protobuf/io/coded_stream.h
+- ext/protobuf-2.4.1/src/google/protobuf/io/coded_stream_inl.h
+- ext/protobuf-2.4.1/src/google/protobuf/io/gzip_stream.h
+- ext/protobuf-2.4.1/src/google/protobuf/io/package_info.h
+- ext/protobuf-2.4.1/src/google/protobuf/io/printer.h
+- ext/protobuf-2.4.1/src/google/protobuf/io/tokenizer.h
+- ext/protobuf-2.4.1/src/google/protobuf/io/zero_copy_stream.h
+- ext/protobuf-2.4.1/src/google/protobuf/io/zero_copy_stream_impl.h
+- ext/protobuf-2.4.1/src/google/protobuf/io/zero_copy_stream_impl_lite.h
+- ext/protobuf-2.4.1/src/google/protobuf/message.h
+- ext/protobuf-2.4.1/src/google/protobuf/message_lite.h
+- ext/protobuf-2.4.1/src/google/protobuf/package_info.h
+- ext/protobuf-2.4.1/src/google/protobuf/reflection_ops.h
+- ext/protobuf-2.4.1/src/google/protobuf/repeated_field.h
+- ext/protobuf-2.4.1/src/google/protobuf/service.h
+- ext/protobuf-2.4.1/src/google/protobuf/stubs/common.h
+- ext/protobuf-2.4.1/src/google/protobuf/stubs/hash.h
+- ext/protobuf-2.4.1/src/google/protobuf/stubs/map-util.h
+- ext/protobuf-2.4.1/src/google/protobuf/stubs/once.h
+- ext/protobuf-2.4.1/src/google/protobuf/stubs/stl_util-inl.h
+- ext/protobuf-2.4.1/src/google/protobuf/stubs/strutil.h
+- ext/protobuf-2.4.1/src/google/protobuf/stubs/substitute.h
+- ext/protobuf-2.4.1/src/google/protobuf/test_util.h
+- ext/protobuf-2.4.1/src/google/protobuf/test_util_lite.h
+- ext/protobuf-2.4.1/src/google/protobuf/testing/file.h
+- ext/protobuf-2.4.1/src/google/protobuf/testing/googletest.h
+- ext/protobuf-2.4.1/src/google/protobuf/text_format.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_custom_options.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_embed_optimize_for.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_empty.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_import.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_import_lite.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_lite.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_lite_imports_nonlite.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_mset.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_no_generic_services.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unittest_optimize_for.pb.h
+- ext/protobuf-2.4.1/src/google/protobuf/unknown_field_set.h
+- ext/protobuf-2.4.1/src/google/protobuf/wire_format.h
+- ext/protobuf-2.4.1/src/google/protobuf/wire_format_lite.h
+- ext/protobuf-2.4.1/src/google/protobuf/wire_format_lite_inl.h
+- ext/ruby_generator/RubyGenerator.cpp
+- ext/ruby_generator/RubyGenerator.h
+- ext/ruby_generator/extconf.rb
 - lib/protobuf.rb
+- lib/protobuf/cli.rb
 - lib/protobuf/common/exceptions.rb
 - lib/protobuf/common/logger.rb
-- lib/protobuf/common/util.rb
 - lib/protobuf/common/wire_type.rb
-- lib/protobuf/compiler/compiler.rb
-- lib/protobuf/compiler/nodes.rb
-- lib/protobuf/compiler/proto.y
-- lib/protobuf/compiler/proto2.ebnf
-- lib/protobuf/compiler/proto_parser.rb
-- lib/protobuf/compiler/template/rpc_service_implementation.erb
-- lib/protobuf/compiler/visitors.rb
-- lib/protobuf/descriptor/descriptor.proto
-- lib/protobuf/descriptor/descriptor.rb
-- lib/protobuf/descriptor/descriptor_builder.rb
-- lib/protobuf/descriptor/descriptor_proto.rb
-- lib/protobuf/descriptor/enum_descriptor.rb
-- lib/protobuf/descriptor/field_descriptor.rb
-- lib/protobuf/descriptor/file_descriptor.rb
+- lib/protobuf/enum.rb
+- lib/protobuf/evented.rb
 - lib/protobuf/ext/eventmachine.rb
+- lib/protobuf/field.rb
+- lib/protobuf/field/base_field.rb
+- lib/protobuf/field/bool_field.rb
+- lib/protobuf/field/bytes_field.rb
+- lib/protobuf/field/double_field.rb
+- lib/protobuf/field/enum_field.rb
+- lib/protobuf/field/extension_fields.rb
+- lib/protobuf/field/field_array.rb
+- lib/protobuf/field/fixed32_field.rb
+- lib/protobuf/field/fixed64_field.rb
+- lib/protobuf/field/float_field.rb
+- lib/protobuf/field/int32_field.rb
+- lib/protobuf/field/int64_field.rb
+- lib/protobuf/field/integer_field.rb
+- lib/protobuf/field/message_field.rb
+- lib/protobuf/field/sfixed32_field.rb
+- lib/protobuf/field/sfixed64_field.rb
+- lib/protobuf/field/signed_integer_field.rb
+- lib/protobuf/field/sint32_field.rb
+- lib/protobuf/field/sint64_field.rb
+- lib/protobuf/field/string_field.rb
+- lib/protobuf/field/uint32_field.rb
+- lib/protobuf/field/uint64_field.rb
+- lib/protobuf/field/varint_field.rb
+- lib/protobuf/message.rb
 - lib/protobuf/message/decoder.rb
 - lib/protobuf/message/encoder.rb
-- lib/protobuf/message/enum.rb
 - lib/protobuf/message/extend.rb
-- lib/protobuf/message/field.rb
 - lib/protobuf/message/message.rb
-- lib/protobuf/message/protoable.rb
 - lib/protobuf/rpc/buffer.rb
 - lib/protobuf/rpc/client.rb
 - lib/protobuf/rpc/connector.rb
@@ -205,7 +349,10 @@ files:
 - lib/protobuf/rpc/servers/zmq_runner.rb
 - lib/protobuf/rpc/service.rb
 - lib/protobuf/rpc/stat.rb
+- lib/protobuf/socket.rb
 - lib/protobuf/version.rb
+- lib/protobuf/zmq.rb
+- proto/rpc.pb.rb
 - proto/rpc.proto
 - protobuf.gemspec
 - script/mk_parser
@@ -214,36 +361,34 @@ files:
 - spec/functional/evented_server_spec.rb
 - spec/functional/socket_server_spec.rb
 - spec/functional/zmq_server_spec.rb
-- spec/helper/all.rb
-- spec/helper/server.rb
-- spec/helper/silent_constants.rb
-- spec/helper/tolerance_matcher.rb
+- spec/lib/protobuf/cli_spec.rb
+- spec/lib/protobuf/common/logger_spec.rb
 - spec/lib/protobuf/message/encoder_spec.rb
+- spec/lib/protobuf/message/enum_spec.rb
+- spec/lib/protobuf/message/message_spec.rb
+- spec/lib/protobuf/rpc/client_spec.rb
+- spec/lib/protobuf/rpc/connector_spec.rb
+- spec/lib/protobuf/rpc/connectors/base_spec.rb
+- spec/lib/protobuf/rpc/connectors/common_spec.rb
+- spec/lib/protobuf/rpc/connectors/socket_spec.rb
+- spec/lib/protobuf/rpc/connectors/zmq_spec.rb
+- spec/lib/protobuf/rpc/servers/evented_server_spec.rb
+- spec/lib/protobuf/rpc/servers/socket_server_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/broker_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/server_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
+- spec/lib/protobuf/rpc/service_spec.rb
 - spec/proto/test.pb.rb
 - spec/proto/test.proto
 - spec/proto/test_service.rb
 - spec/proto/test_service_impl.rb
 - spec/spec_helper.rb
-- spec/unit/common/logger_spec.rb
-- spec/unit/common/util_spec.rb
-- spec/unit/enum_spec.rb
-- spec/unit/message_spec.rb
-- spec/unit/rpc/client_spec.rb
-- spec/unit/rpc/connector_spec.rb
-- spec/unit/rpc/connectors/base_spec.rb
-- spec/unit/rpc/connectors/common_spec.rb
-- spec/unit/rpc/connectors/eventmachine_client_spec.rb
-- spec/unit/rpc/connectors/eventmachine_spec.rb
-- spec/unit/rpc/connectors/socket_spec.rb
-- spec/unit/rpc/connectors/zmq_spec.rb
-- spec/unit/rpc/servers/evented_server_spec.rb
-- spec/unit/rpc/servers/socket_server_spec.rb
-- spec/unit/rpc/servers/zmq/broker_spec.rb
-- spec/unit/rpc/servers/zmq/server_spec.rb
-- spec/unit/rpc/servers/zmq/util_spec.rb
-- spec/unit/rpc/servers/zmq/worker_spec.rb
-- spec/unit/rpc/service_spec.rb
-- test/check_unbuild.rb
+- spec/support/all.rb
+- spec/support/server.rb
+- spec/support/silent_constants.rb
+- spec/support/test_app_file.rb
+- spec/support/tolerance_matcher.rb
 - test/data/data.bin
 - test/data/data_source.py
 - test/data/types.bin
@@ -276,8 +421,6 @@ files:
 - test/proto/types.pb.rb
 - test/proto/types.proto
 - test/test_addressbook.rb
-- test/test_compiler.rb
-- test/test_descriptor.rb
 - test/test_enum_value.rb
 - test/test_extension.rb
 - test/test_lowercase.rb
@@ -303,16 +446,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -754579198838868280
+      hash: -931034432633802178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -754579198838868280
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -326,36 +466,34 @@ test_files:
 - spec/functional/evented_server_spec.rb
 - spec/functional/socket_server_spec.rb
 - spec/functional/zmq_server_spec.rb
-- spec/helper/all.rb
-- spec/helper/server.rb
-- spec/helper/silent_constants.rb
-- spec/helper/tolerance_matcher.rb
+- spec/lib/protobuf/cli_spec.rb
+- spec/lib/protobuf/common/logger_spec.rb
 - spec/lib/protobuf/message/encoder_spec.rb
+- spec/lib/protobuf/message/enum_spec.rb
+- spec/lib/protobuf/message/message_spec.rb
+- spec/lib/protobuf/rpc/client_spec.rb
+- spec/lib/protobuf/rpc/connector_spec.rb
+- spec/lib/protobuf/rpc/connectors/base_spec.rb
+- spec/lib/protobuf/rpc/connectors/common_spec.rb
+- spec/lib/protobuf/rpc/connectors/socket_spec.rb
+- spec/lib/protobuf/rpc/connectors/zmq_spec.rb
+- spec/lib/protobuf/rpc/servers/evented_server_spec.rb
+- spec/lib/protobuf/rpc/servers/socket_server_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/broker_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/server_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
+- spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
+- spec/lib/protobuf/rpc/service_spec.rb
 - spec/proto/test.pb.rb
 - spec/proto/test.proto
 - spec/proto/test_service.rb
 - spec/proto/test_service_impl.rb
 - spec/spec_helper.rb
-- spec/unit/common/logger_spec.rb
-- spec/unit/common/util_spec.rb
-- spec/unit/enum_spec.rb
-- spec/unit/message_spec.rb
-- spec/unit/rpc/client_spec.rb
-- spec/unit/rpc/connector_spec.rb
-- spec/unit/rpc/connectors/base_spec.rb
-- spec/unit/rpc/connectors/common_spec.rb
-- spec/unit/rpc/connectors/eventmachine_client_spec.rb
-- spec/unit/rpc/connectors/eventmachine_spec.rb
-- spec/unit/rpc/connectors/socket_spec.rb
-- spec/unit/rpc/connectors/zmq_spec.rb
-- spec/unit/rpc/servers/evented_server_spec.rb
-- spec/unit/rpc/servers/socket_server_spec.rb
-- spec/unit/rpc/servers/zmq/broker_spec.rb
-- spec/unit/rpc/servers/zmq/server_spec.rb
-- spec/unit/rpc/servers/zmq/util_spec.rb
-- spec/unit/rpc/servers/zmq/worker_spec.rb
-- spec/unit/rpc/service_spec.rb
-- test/check_unbuild.rb
+- spec/support/all.rb
+- spec/support/server.rb
+- spec/support/silent_constants.rb
+- spec/support/test_app_file.rb
+- spec/support/tolerance_matcher.rb
 - test/data/data.bin
 - test/data/data_source.py
 - test/data/types.bin
@@ -388,8 +526,6 @@ test_files:
 - test/proto/types.pb.rb
 - test/proto/types.proto
 - test/test_addressbook.rb
-- test/test_compiler.rb
-- test/test_descriptor.rb
 - test/test_enum_value.rb
 - test/test_extension.rb
 - test/test_lowercase.rb