cucumber-messages: Use pure-Ruby protobuf implementation (experimental)

cucumber-messages/ruby/Gemfile

@@ -1,7 +1,4 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-# Use an older protobuf on JRuby
-gem 'google-protobuf', '~> 3.2.0.2' if RUBY_PLATFORM == 'java'
-
 gemspec

cucumber-messages/ruby/Makefile

@@ -1,9 +1,9 @@
 include default.mk
 
-.deps: lib/cucumber/messages_pb.rb
+.deps: lib/cucumber/messages.pb.rb
 
-lib/cucumber/messages_pb.rb: messages.proto
-	protoc -I. --ruby_out lib/cucumber $<
+lib/cucumber/messages.pb.rb: messages.proto
+	bundle exec rake protobuf:compile[.,.,lib/cucumber]
 
 clean:
-	rm -f lib/cucumber/messages_pb.rb
+	rm -f lib/cucumber/messages.pb.rb

cucumber-messages/ruby/Rakefile

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'rubygems'
 require 'bundler'
+load 'protobuf/tasks/compile.rake'
 Bundler::GemHelper.install_tasks
 
 $:.unshift File.expand_path("../lib", __FILE__)

cucumber-messages/ruby/cucumber-messages.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |s|
                     'source_code_uri'   => 'https://github.com/cucumber/cucumber/blob/master/cucumber-messages/ruby',
                   }
 
-  # Users of JRuby should use google-protobuf 3.2.0.2 (later versions don't work)
-  s.add_dependency('google-protobuf', ['>= 3.2', '<= 3.8'])
+  s.add_dependency 'protobuf', '~> 3.10'
   s.add_dependency 'json', '~> 2.2', '>= 2.2.0'
   s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
   s.add_development_dependency 'rspec', '~> 3.9', '>= 3.9.0'

cucumber-messages/ruby/lib/cucumber/.gitignore

@@ -1,2 +1,2 @@
 # protoc-generated file
-messages_pb.rb
+messages.pb.rb

cucumber-messages/ruby/lib/cucumber/messages.rb

@@ -1,4 +1,4 @@
-require 'cucumber/messages_pb'
+require 'cucumber/messages.pb'
 require 'cucumber/messages/binary_to_message_enumerator'
 require 'cucumber/messages/ndjson_to_message_enumerator'
 require 'cucumber/messages/protobuf_delimited'

cucumber-messages/ruby/lib/cucumber/messages/ndjson_to_message_enumerator.rb

@@ -6,7 +6,8 @@ class NdjsonToMessageEnumerator < Enumerator
       def initialize(io)
         super() do |yielder|
           io.each_line do |json|
-            yielder.yield(Cucumber::Messages::Envelope.decode_json(json))
+            args = JSON.parse(json)
+            yielder.yield(Cucumber::Messages::Envelope.new(args))
           end
         end
       end

cucumber-messages/ruby/lib/cucumber/messages/protobuf_ndjson.rb

@@ -4,7 +4,7 @@ module Cucumber
   module Messages
     module WriteNdjson
       def write_ndjson_to(io)
-        json = self.class.encode_json(self)
+        json = self.to_json
         ob = JSON.parse(json)
         remove_empties(ob)
         io.puts(JSON.generate(ob))
@@ -27,4 +27,4 @@ def remove_empties(ob)
       end
     end
   end
-end
+end

cucumber-messages/ruby/messages.proto

@@ -1,7 +1,5 @@
 syntax = "proto3";
-package io.cucumber.messages;
-option ruby_package = "Cucumber.Messages";
-option go_package = "messages";
+package cucumber.messages;
 
 // When removing a field, replace it with reserved, rather than deleting the line.
 // When adding a field, add it to the end and increment the number by one.