protobuf 2.2.1 → 2.2.2

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - jruby-19mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+script: NO_COMPILE_TEST_PROTOS=1 bundle exec rake spec

data/README.md

@@ -1,6 +1,8 @@
 # protobuf
 
-***IMPORTANT: Those upgrading from version 1.4.2 to 2.0 should read the [UPGRADING.md](https://github.com/localshred/protobuf/blob/master/UPGRADING.md) notes***
+[![Build Status](https://secure.travis-ci.org/localshred/protobuf.png?branch=master)](https://travis-ci.org/localshred/protobuf)
+
+***IMPORTANT: Those upgrading from version 1.4.2 to 2.X should read the [UPGRADING.md](https://github.com/localshred/protobuf/blob/master/UPGRADING.md) notes***
 
 Protobuf is an implementation of [Google's protocol buffers][google-pb] in ruby. We currently support version 2.4.0. It's a gem for managing 3 things:
 

data/Rakefile

@@ -2,7 +2,7 @@ $:.push File.expand_path("./", File.dirname(__FILE__))
 $:.push File.expand_path("./spec", File.dirname(__FILE__))
 
 require "bundler/gem_tasks"
-require "benchmark/tasks"
+# require "benchmark/tasks"
 
 require 'rspec/core/rake_task'
 
@@ -12,9 +12,9 @@ task :default => :spec
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec)
 
-## 
+##
 # Rake-compiler
 #
-require 'rake/extensiontask'
-
-Rake::ExtensionTask.new("ruby_generator")
+# require 'rake/extensiontask'
+#
+# Rake::ExtensionTask.new("ruby_generator")

data/lib/protobuf/enum_value.rb

@@ -26,8 +26,15 @@ module Protobuf
       self.to_i
     end
 
-    def to_s
-      to_hash_value.to_s
+    def to_s(format = :value_string)
+      case format
+      when :value_string then
+        self.to_i.to_s
+      when :name then
+        name.to_s
+      else
+        self.to_i.to_s
+      end
     end
   end
 end

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
   PROTOC_VERSION = '2.4.1'
 end

data/protobuf.gemspec

@@ -29,11 +29,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'eventmachine'
   s.add_development_dependency 'ffi-rzmq'
-  s.add_development_dependency 'perftools.rb'
+  # s.add_development_dependency 'perftools.rb'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-nav'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rake-compiler'
+  # s.add_development_dependency 'rake-compiler'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'yard'

data/spec/benchmark/tasks.rb

@@ -1,7 +1,13 @@
 require 'benchmark'
 require 'support/all'
 require 'support/test/resource_service'
-require 'perftools'
+
+begin
+  require 'perftools'
+rescue LoadError
+  $stderr.puts 'perftools must be uncommented in the gemspec before you can run this benchmark task'
+  exit(1)
+end
 
 # Including a way to turn on debug logger for spec runs
 if ENV["DEBUG"]

data/spec/lib/protobuf/enum_value_spec.rb

@@ -10,5 +10,6 @@ describe Protobuf::EnumValue do
 	its(:to_hash_value) { should eq 1 }
 	its(:to_s) { should eq "1" }
 	its(:inspect) { should eq '#<Protobuf::EnumValue Test::EnumTestType::ONE=1>' }
+  specify { subject.to_s(:name).should eq("ONE") }
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -108,22 +108,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: perftools.rb
-  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
   requirement: !ruby/object:Gem::Requirement
@@ -172,22 +156,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  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
@@ -249,6 +217,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - Gemfile
 - README.md
@@ -516,7 +485,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 379065993395849020
+      hash: 659886342819533463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -525,7 +494,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 379065993395849020
+      hash: 659886342819533463
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24