Merge Lookout protobuffy to ruby-protobuf/protobuf v3.6.9

.rubocop.yml

@@ -0,0 +1,58 @@
+inherit_from: .rubocop_todo.yml
+
+Lint/EndAlignment:
+  AlignWith: keyword
+
+Lint/Loop:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Style/CaseIndentation:
+  IndentWhenRelativeTo: end
+
+Style/ClassAndModuleChildren:
+  Exclude:
+    - '**/*.pb.rb'
+
+Style/ClassAndModuleCamelCase:
+  Exclude:
+    - '**/*.pb.rb'
+
+Style/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
+Style/EmptyLines:
+  Exclude:
+    - '**/*.pb.rb'
+
+Style/FileName:
+  Exclude:
+    - '**/protoc-gen-ruby*'
+
+Style/GuardClause:
+  MinBodyLength: 4
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/IndentHash:
+  EnforcedStyle: consistent
+
+Style/Semicolon:
+  AllowAsExpressionSeparator: true
+
+Style/TrailingBlankLines:
+  Exclude:
+    - '**/*.pb.rb'
+
+Style/TrailingComma:
+  EnforcedStyleForMultiline: comma
+
+Style/TrivialAccessors:
+  AllowDSLWriters: true
+  AllowPredicates: true

.rubocop_todo.yml

@@ -0,0 +1,139 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-09-25 12:31:31 -0700 using RuboCop version 0.34.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 31
+Metrics/AbcSize:
+  Max: 59
+
+# Offense count: 1
+Metrics/BlockNesting:
+  Max: 5
+
+# Offense count: 6
+Metrics/CyclomaticComplexity:
+  Max: 10
+
+# Offense count: 493
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 196
+
+# Offense count: 44
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 38
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 6
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Performance/StringReplacement:
+  Exclude:
+    - 'lib/protobuf/rpc/buffer.rb'
+
+# Offense count: 127
+# Configuration parameters: Exclude.
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 12
+Style/DoubleNegation:
+  Exclude:
+    - 'lib/protobuf.rb'
+    - 'lib/protobuf/cli.rb'
+    - 'lib/protobuf/rpc/connectors/zmq.rb'
+    - 'lib/protobuf/rpc/servers/zmq/broker.rb'
+    - 'lib/protobuf/rpc/servers/zmq/server.rb'
+    - 'lib/protobuf/rpc/servers/zmq/worker.rb'
+    - 'lib/protobuf/rpc/service_directory.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyElse:
+  Exclude:
+    - 'lib/protobuf/enum.rb'
+    - 'lib/protobuf/message/fields.rb'
+
+# Offense count: 77
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundBlockBody:
+  Enabled: false
+
+# Offense count: 90
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundClassBody:
+  Enabled: false
+
+# Offense count: 50
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+# Offense count: 2
+Style/IndentationWidth:
+  Exclude:
+    - 'protobuf.gemspec'
+    - 'lib/protobuf/cli.rb'
+
+# Offense count: 3
+Style/ElseAlignment:
+  Exclude:
+    - 'protobuf.gemspec'
+    - 'lib/protobuf/cli.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Style/ExtraSpacing:
+  Exclude:
+    - 'lib/protobuf/rpc/connectors/common.rb'
+    - 'lib/protobuf/rpc/connectors/socket.rb'
+    - 'lib/protobuf/rpc/connectors/zmq.rb'
+    - 'lib/protobuf/rpc/servers/socket/server.rb'
+    - 'spec/lib/protobuf/rpc/service_directory_spec.rb'
+
+# Offense count: 46
+# Cop supports --auto-correct.
+Style/NumericLiterals:
+  MinDigits: 21
+
+# Offense count: 473
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/StringLiterals:
+  Enabled: false
+
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+Style/SymbolProc:
+  Exclude:
+    - 'lib/protobuf/generators/printable.rb'
+    - 'lib/protobuf/rpc/servers/socket/server.rb'
+    - 'spec/encoding/all_types_spec.rb'
+    - 'spec/encoding/extreme_values_spec.rb'
+    - 'spec/functional/socket_server_spec.rb'
+    - 'spec/functional/zmq_server_spec.rb'
+    - 'spec/lib/protobuf/rpc/servers/socket_server_spec.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: WordRegex.
+Style/WordArray:
+  MinSize: 2

.travis.yml

@@ -1,14 +1,21 @@
 language: ruby
 rvm:
-- 1.9.3
-- 2.3.1
+  - 1.9.3
+  - 2.3.1
+  - jruby
+env:
+  - PROTOBUF_VERSION=2.6.1
+  - PROTOBUF_VERSION=3.0.0-alpha-2
+matrix:
+  allow_failures:
+    - env: PROTOBUF_VERSION=3.0.0-alpha-2
 before_install:
-- gem install bundler
+  - gem install bundler -v 1.12.5
 script: NO_COMPILE_TEST_PROTOS=1 bundle _1.12.5_ exec rake spec/lib
 notifications:
   webhooks:
     urls:
-    - https://webhooks.gitter.im/e/51a956bcd2b1854d6756
+      - https://webhooks.gitter.im/e/51a956bcd2b1854d6756
     on_success: change
     on_failure: always
     on_start: false

CHANGES.md

@@ -1,5 +1,31 @@
 # Stable (3.x)
 
+3.6.9
+--------
+- Make protobuf serivce directory pluggable.
+
+3.5.5
+--------
+- Add native Varint for MRI.
+
+3.5.4
+--------
+- Ensures ActiveSupport::Deprecation does not get a stack trace when deprecations are disabled.
+
+3.5.3
+--------
+- Optimized get_extension_field and get_field calls.
+
+3.5.2
+--------
+- Optimized valid_tag?, enums_for_tag and enums_for_tags
+
+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.2.0
 --------
 

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.
 

LICENSE.txt

@@ -1,14 +1,22 @@
-           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                   Version 2, December 2004
+The MIT License (MIT)
 
-Copyright (C) 2004 Sam Hocevar <[email protected]>
+Copyright (c) 2014 BJ Neilsen
 
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document, and changing it is allowed as long
-as the name is changed.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
- 0. You just DO WHAT THE FUCK YOU WANT TO.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 

README.md

@@ -2,9 +2,10 @@
 
 (the JSON slayer)
 
-[![Gem Version](https://badge.fury.io/rb/protobuf.png)](http://badge.fury.io/rb/protobuf)
-[![Build Status](https://secure.travis-ci.org/localshred/protobuf.png?branch=master)](https://travis-ci.org/localshred/protobuf)
-[![Gitter chat](https://badges.gitter.im/localshred/protobuf.png)](https://gitter.im/localshred/protobuf)
+[![Gem Version](https://badge.fury.io/rb/protobuf.svg)](http://badge.fury.io/rb/protobuf)
+[![Build Status](https://secure.travis-ci.org/ruby-protobuf/protobuf.svg?branch=master)](https://travis-ci.org/ruby-protobuf/protobuf)
+[![Gitter chat](https://badges.gitter.im/ruby-protobuf/protobuf.svg)](https://gitter.im/ruby-protobuf/protobuf)
+[![protobuf API Documentation](https://www.omniref.com/ruby/gems/protobuf.png)](https://www.omniref.com/ruby/gems/protobuf)
 
 Protobuffy is an implementation of [Google's protocol buffers][google-pb] in
 ruby, version 2.5.0 is currently supported.
@@ -47,12 +48,12 @@ Alternatively, start the server as a Rack app using a `rackup` and a standard `c
 See recent changes in the [release notes][] or the [changelog][].
 
   [google-pb]:             http://code.google.com/p/protobuf "Google Protocol Buffers"
-  [wiki]:                  https://github.com/localshred/protobuf/wiki "Wiki home page"
-  [Installation Guide]:    https://github.com/localshred/protobuf/wiki/Installation "Installation guide"
-  [compiling definitions]: https://github.com/localshred/protobuf/wiki/Compiling-Definitions "Compiling guide"
-  [object APIs]:           https://github.com/localshred/protobuf/wiki/Messages-&-Enums "Message & Enum object APIs guide"
-  [services]:              https://github.com/localshred/protobuf/wiki/Services "Services object API guide"
-  [clients]:               https://github.com/localshred/protobuf/wiki/Clients "Client object API guide"
-  [API roadmap]:           https://github.com/localshred/protobuf/wiki/API-Roadmap "API Roadmap guide"
-  [release notes]:         https://github.com/localshred/protobuf/releases "Release notes"
-  [changelog]:             https://github.com/localshred/protobuf/blob/master/CHANGES.md "CHANGES.md"
+  [wiki]:                  https://github.com/ruby-protobuf/protobuf/wiki "Wiki home page"
+  [Installation Guide]:    https://github.com/ruby-protobuf/protobuf/wiki/Installation "Installation guide"
+  [compiling definitions]: https://github.com/ruby-protobuf/protobuf/wiki/Compiling-Definitions "Compiling guide"
+  [object APIs]:           https://github.com/ruby-protobuf/protobuf/wiki/Messages-&-Enums "Message & Enum object APIs guide"
+  [services]:              https://github.com/ruby-protobuf/protobuf/wiki/Services "Services object API guide"
+  [clients]:               https://github.com/ruby-protobuf/protobuf/wiki/Clients "Client object API guide"
+  [API roadmap]:           https://github.com/ruby-protobuf/protobuf/wiki/API-Roadmap "API Roadmap guide"
+  [release notes]:         https://github.com/ruby-protobuf/protobuf/releases "Release notes"
+  [changelog]:             https://github.com/ruby-protobuf/protobuf/blob/master/CHANGES.md "CHANGES.md"

Rakefile

@@ -1,5 +1,5 @@
-$: << ::File.expand_path('../', __FILE__)
-$: << ::File.expand_path('../spec', __FILE__)
+$LOAD_PATH << ::File.expand_path('../', __FILE__)
+$LOAD_PATH << ::File.expand_path('../spec', __FILE__)
 
 require 'fileutils'
 require 'rubygems'
@@ -8,31 +8,34 @@ require 'bundler/gem_tasks'
 require 'benchmark/tasks'
 
 require 'rspec/core/rake_task'
-
-desc 'Default: run specs.'
-task :default => :spec
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
+
+task :default => ['compile:spec', 'compile:rpc', :spec, :rubocop]
 
 desc 'Run specs'
 namespace :compile do
 
   desc 'Compile spec protos in spec/supprt/ directory'
-  task :spec do |task, args|
+  task :spec do
     proto_path = ::File.expand_path('../spec/support/', __FILE__)
-    cmd = %Q{protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{proto_path} -I #{proto_path} #{File.join(proto_path, '**', '*.proto')}}
+    proto_files = Dir[File.join(proto_path, '**', '*.proto')]
+    cmd = %(protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{proto_path} -I #{proto_path} #{proto_files.join(' ')})
 
     puts cmd
-    exec(cmd)
+    system(cmd)
   end
 
   desc 'Compile rpc protos in protos/ directory'
-  task :rpc do |task, args|
+  task :rpc do
     proto_path = ::File.expand_path('../proto', __FILE__)
+    proto_files = Dir[File.join(proto_path, '**', '*.proto')]
     output_dir = ::File.expand_path('../tmp/rpc', __FILE__)
     ::FileUtils.mkdir_p(output_dir)
 
-    cmd = %Q{protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{output_dir} -I #{proto_path} #{File.join(proto_path, '**', '*.proto')}}
+    cmd = %(protoc --plugin=./bin/protoc-gen-ruby --ruby_out=#{output_dir} -I #{proto_path} #{proto_files.join(' ')})
 
     puts cmd
     system(cmd)
@@ -41,7 +44,7 @@ namespace :compile do
       'tmp/rpc/dynamic_discovery.pb.rb'               => 'lib/protobuf/rpc',
       'tmp/rpc/rpc.pb.rb'                             => 'lib/protobuf/rpc',
       'tmp/rpc/google/protobuf/descriptor.pb.rb'      => 'lib/protobuf/descriptors/google/protobuf',
-      'tmp/rpc/google/protobuf/compiler/plugin.pb.rb' => 'lib/protobuf/descriptors/google/protobuf/compiler'
+      'tmp/rpc/google/protobuf/compiler/plugin.pb.rb' => 'lib/protobuf/descriptors/google/protobuf/compiler',
     }
 
     files.each_pair do |source_file, destination_dir|

bin/protoc-gen-ruby

@@ -14,4 +14,3 @@ request_bytes = STDIN.read
 code_generator = ::Protobuf::CodeGenerator.new(request_bytes)
 response_bytes = code_generator.response_bytes
 STDOUT.print(response_bytes)
-