protobuf 3.5.0 → 3.5.1

data/.rubocop.yml

@@ -9,6 +9,9 @@ Lint/Loop:
 Metrics/ClassLength:
   Enabled: false
 
+Metrics/ModuleLength:
+  Enabled: false
+
 Style/CaseIndentation:
   IndentWhenRelativeTo: end
 

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Stable (3.x)
 
+3.5.1
+--------
+- Adds compatibility for Rails 4.2+ as CLI options were broken
+- Fixes bug with MRI and "dead" thread in zmq broker
+- Fixes Rubocop compatability with new version
+
 3.0.4
 --------
 

data/CONTRIBUTING.md

@@ -6,7 +6,7 @@ your code merged.
 
 1. Use GitHub Issues or Pull Requests over sending an email. It's much easier for me to keep track of your issue through GitHub.
 2. For __compiler issues__, please provide both a gist for the __source definition(s)__ as well as the __generated output__ (if any).
-3. For __existing issues or functionality__, please use __`2-8-stable`__ as the base branch for the pull request. This helps us maintain a stable gem release strategy. All commits merged to `2-8-stable` will also be merged down to `master`.
+3. For __existing issues or functionality__, please use the latest stable branch (currently __`3-5-stable`__) as the base branch for the pull request. This helps us maintain a stable gem release strategy. All commits merged to stable will also be merged down to `master`.
 4. For __new functionality__, please use __`master`__ as the base branch for the pull request. The `master` branch is used to stage all "next iteration" work.
 5. Be patient with me as I work on your issue.
 

data/README.md

@@ -1,7 +1,7 @@
 # protobuf
 
 [![Gem Version](https://badge.fury.io/rb/protobuf.svg)](http://badge.fury.io/rb/protobuf)
-[![Build Status](https://secure.travis-ci.org/localshred/protobuf.svg?branch=master)](https://travis-ci.org/localshred/protobuf)
+[![Build Status](https://secure.travis-ci.org/ruby-protobuf/protobuf.svg?branch=master)](https://travis-ci.org/localshred/protobuf)
 [![Gitter chat](https://badges.gitter.im/localshred/protobuf.svg)](https://gitter.im/localshred/protobuf)
 [![protobuf API Documentation](https://www.omniref.com/ruby/gems/protobuf.png)](https://www.omniref.com/ruby/gems/protobuf)
 

data/lib/protobuf/cli.rb

@@ -118,8 +118,7 @@ module Protobuf
           :socket
         elsif options.zmq?
           :zmq
-        else # rubocop:disable Style/ElseAlignment
-          # above: https://github.com/bbatsov/rubocop/pull/1470/files
+        else
           case server_type = ENV["PB_SERVER_TYPE"]
           when nil, /socket/i
             :socket
@@ -182,7 +181,7 @@ module Protobuf
       end
 
       def runner_options
-        opt = options.symbolize_keys
+        opt = options.to_hash.symbolize_keys
 
         opt[:workers_only] = (!!ENV['PB_WORKERS_ONLY']) || options.workers_only
 

data/lib/protobuf/message/fields.rb

@@ -11,13 +11,12 @@ module Protobuf
           :get_field_by_name => :get_field,
           :get_field_by_tag => :get_field,
         )
+      end
 
+      module ClassMethods
         def inherited(subclass)
           inherit_fields!(subclass)
         end
-      end
-
-      module ClassMethods
 
         ##
         # Field Definition Methods

data/lib/protobuf/rpc/servers/socket_runner.rb

@@ -12,10 +12,8 @@ module Protobuf
         options = case
                    when options.is_a?(OpenStruct) then
                      options.marshal_dump
-                   when options.is_a?(Hash) then
-                     options
                    when options.respond_to?(:to_hash) then
-                     options.to_hash
+                     options.to_hash.symbolize_keys
                    else
                      fail "Cannot parser Socket Server - server options"
                    end

data/lib/protobuf/rpc/servers/zmq/server.rb

@@ -284,7 +284,7 @@ module Protobuf
         end
 
         def start_broker
-          return if @broker && @broker.running? && !@broker_thread.stop?
+          return if @broker && @broker.running? && @broker_thread.alive?
           if @broker && !@broker.running?
             broadcast_flatline if broadcast_busy?
             @broker_thread.join if @broker_thread

data/lib/protobuf/rpc/servers/zmq_runner.rb

@@ -11,7 +11,7 @@ module Protobuf
                    when options.is_a?(OpenStruct) then
                      options.marshal_dump
                    when options.respond_to?(:to_hash) then
-                     options.to_hash
+                     options.to_hash.symbolize_keys
                    else
                      fail "Cannot parser Zmq Server - server options"
                    end

data/lib/protobuf/rpc/service.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class'
+
 require 'protobuf/logging'
 require 'protobuf/rpc/client'
 require 'protobuf/rpc/error'

data/lib/protobuf/tasks/compile.rake

@@ -18,8 +18,7 @@ namespace :protobuf do
     command << "protoc"
     command << "--#{args[:plugin]}_out=#{args[:destination]}"
     command << "-I #{args[:source]}"
-    command << "#{args[:source]}/#{args[:package]}/*.proto"
-    command << "#{args[:source]}/#{args[:package]}/**/*.proto"
+    command << Dir["#{args[:source]}/#{args[:package]}/**/*.proto"].join(" ")
     full_command = command.join(' ')
 
     puts full_command

data/lib/protobuf/version.rb

@@ -1,3 +1,3 @@
 module Protobuf
-  VERSION = '3.5.0'
+  VERSION = '3.5.1'
 end

data/spec/functional/zmq_server_spec.rb

@@ -7,12 +7,12 @@ RSpec.describe 'Functional ZMQ Client' do
   before(:all) do
     load "protobuf/zmq.rb"
     @runner = ::Protobuf::Rpc::ZmqRunner.new(
-      :host => "127.0.0.1",
-      :port => 9399,
-      :worker_port => 9408,
-      :backlog => 100,
-      :threshold => 100,
-      :threads => 5,
+      'host' => '127.0.0.1',
+      'port' => 9399,
+      'worker_port' => 9408,
+      'backlog' => 100,
+      'threshold' => 100,
+      'threads' => 5,
     )
     @server_thread = Thread.new(@runner) { |runner| runner.run }
     Thread.pass until @runner.running?

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
+  prerelease: 
 platform: ruby
 authors:
 - BJ Neilsen
@@ -11,202 +12,230 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thread_safe
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Google Protocol Buffers serialization and RPC implementation for Ruby.
@@ -221,11 +250,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
+- .travis.yml
+- .yardopts
 - CHANGES.md
 - CONTRIBUTING.md
 - Gemfile
@@ -404,26 +433,33 @@ files:
 homepage: https://github.com/localshred/protobuf
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1619440131010607599
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1619440131010607599
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Google Protocol Buffers serialization and RPC implementation for Ruby.
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 556fc7a33947258f727c68a829cda7f010c17a4a
-  data.tar.gz: 7c2844002d64904f5ba995c16704704966a53296
-SHA512:
-  metadata.gz: a68b0800fe406544487ec2f2ae1cccc81c21e5f9a59c3f970ef84a0a5023f057a523ad5c6f598b9dfe7ad57acf47a22aa12a4a73c218ec0443149d0ff5a7fc7f
-  data.tar.gz: 0832c9afbfc335acf6fd8517a0713efa4d347e48f6eaa00ea0575134b17e19e3d1648fe1936aabfc9b5422ceed63394b449426018d22a6616849148e5f0ebf44