protobuf 2.2.3 → 2.2.4

data/Rakefile

@@ -1,20 +1,30 @@
 $:.push File.expand_path("./", File.dirname(__FILE__))
 $:.push File.expand_path("./spec", File.dirname(__FILE__))
 
+require "rubygems"
+require "rubygems/package_task"
 require "bundler/gem_tasks"
 # require "benchmark/tasks"
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 
-desc 'Default: run specs.'
+desc "Default: run specs."
 task :default => :spec
 
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec)
 
 ##
-# Rake-compiler
+# rake-compiler
 #
-# require 'rake/extensiontask'
-#
-# Rake::ExtensionTask.new("ruby_generator")
+spec = Gem::Specification.load("protobuf.gemspec")
+
+Gem::PackageTask.new(spec) do |pkg|
+end
+
+if RUBY_PLATFORM =~ /java/
+  require "rake/javaextensiontask"
+else
+  require "rake/extensiontask"
+  Rake::ExtensionTask.new("ruby_generator", spec)
+end

data/ext/ruby_generator/extconf.rb

@@ -1,17 +1,29 @@
-begin
-  require 'mkmf'
+unless defined?(JRUBY_VERSION)
+  begin
+    require 'mkmf'
 
-  include_directory = File.expand_path(File.join(File.dirname(__FILE__), "..", "protobuf-2.4.1", "src"))
+    include_directory = File.expand_path(File.join(File.dirname(__FILE__), "..", "protobuf-2.4.1", "src"))
 
-  $CPPFLAGS << " -I#{include_directory}"
-  $CPPFLAGS << " -Wall "
+    $CPPFLAGS << " -I#{include_directory}"
+    $CPPFLAGS << " -Wall "
 
-  have_library("pthread")
-  have_library("protoc")
-  have_library("protobuf")
+    have_library("pthread")
+    have_library("protoc")
+    have_library("protobuf")
 
-  create_makefile('ruby_generator')
-rescue 
+    create_makefile('ruby_generator')
+  rescue ::Gem::Installer::ExtensionBuildError => ex
+    $stdout << <<-WARNING
+      Cannot compile native extension.
+
+      If you are running on Jruby or Windows you should compile protocol buffer
+      definitions on another computer and then use those definitions locally.
+
+      Only the compiler is restricted by this.  The definitions should work without issue.
+    WARNING
+    $stdout << $/
+  end
+else
   $stdout << <<-WARNING
     Cannot compile native extension.
 

data/lib/protobuf/enum_value.rb

@@ -13,7 +13,6 @@ module Protobuf
       @parent_class = parent_class
       @name = name
       @value = value
-      super(@value)
     end
 
     ## 

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
   PROTOC_VERSION = '2.4.1'
 end

data/protobuf.gemspec

@@ -19,7 +19,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   unless ENV['WITHOUT_PROTO_COMPILER']
-    s.extensions << File.join('ext', 'ruby_generator', 'extconf.rb')
+    if defined?(JRUBY_VERSION)
+      s.platform = 'java'
+    else
+      s.extensions << File.join('ext', 'ruby_generator', 'extconf.rb')
+    end
   end
 
   s.add_dependency 'activesupport'
@@ -33,7 +37,7 @@ Gem::Specification.new do |s|
   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/support/test/resource.pb.rb

@@ -15,7 +15,6 @@ module Test
   #
   class ResourceFindRequest < ::Protobuf::Message; end
   class Resource < ::Protobuf::Message; end
-  class Extended < ::Protobuf::Message; end
   class Nested < ::Protobuf::Message; end
   
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -156,6 +156,22 @@ 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
@@ -485,7 +501,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 878827377950165717
+      hash: 3450676123486449758
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -494,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 878827377950165717
+      hash: 3450676123486449758
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24