grpc_kit 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 854c24c4b4668ac76230b5c262893ae24f66ea7c644e1b46389e2546783004f6
-  data.tar.gz: 5b3cc154a4fbed3ebabffc62611b328a26f8d4006f692b15c397ce292880171f
+  metadata.gz: de4d68a25b47aecdb39e3c3b35f7b53fe85215ababa7a18a2811069b41af3ba8
+  data.tar.gz: f330329e794c5b799d265c7c4869da26373467bb64dd6cc273b314c1aeffd509
 SHA512:
-  metadata.gz: ba44498c88cb8040c2b6cc9bbc183f7d452f72b47496cdde90c26ae3e72a60496ee47ec2c2fc5659c44ca5ab0ab32bd2f4fa9ecd727cf2ea3096b708d15eefcc
-  data.tar.gz: b9ef8c8d03788525a4927d93ed38c66afffc58eaef70865c152a04f0dbe5936d1edabde8357dfb8db8b70b38a0e31b0edc7d2321882eb2a2290f726a607cbfd7
+  metadata.gz: 38586d8ab0d0f252b0819b71b8422f8396661223f6b9014d98623abce41fba285e6975bb0e7655d10d45112f1972cdd992c3c06f7ba2557a9c3f898e429abdd1
+  data.tar.gz: 99f95947b101ceaf8994777fe425951977ec222a6fb5aba6baed9f913a701a164ccb548d80e30199bafb27cb847af1f9464c649321d5979719f545a6062b9b28

data/.github/workflows/ci.yml

@@ -1,5 +1,5 @@
 name: ci
-on: 
+on:
   push:
     branches:
       - master
@@ -11,12 +11,24 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby_version:
-          - 2.5
-          - 2.6
-          - 2.7
+        ruby_version: ['3.3', '3.4', '4.0']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v7
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '${{ matrix.ruby_version }}'
+          bundler-cache: true
+
+      - run: 'bundle exec rake'
+
+  truffleruby:
+    name: truffleruby
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby_version: [truffleruby-head]
+    steps:
+      - uses: actions/checkout@v7
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '${{ matrix.ruby_version }}'

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.6.0 (2026-09-09)
+
+- breaking change: Drop Ruby 2.5, 2.6, 2.7, 3.0, 3.1, and 3.2 from CI ([db918cb](https://github.com/cookpad/grpc_kit/commit/db918cbe0ceadf263ff528ace82c90983ee989f2) & [#42](https://github.com/cookpad/grpc_kit/pull/42))
+- bug: Fix tests for Ruby 3+ ([#36](https://github.com/cookpad/grpc_kit/pull/36))
+- bug: Fix exceptions in an auto-trimmer thread in CI build with TruffleRuby ([#38](https://github.com/cookpad/grpc_kit/pull/38))
+- bug: Drain the waker pipe in Session::IO#select ([#41](https://github.com/cookpad/grpc_kit/pull/41))
+- improve: Add TruffleRuby in CI ([#37](https://github.com/cookpad/grpc_kit/pull/37))
+- improve: Add Ruby 3.3, 3.4, 4.0 in CI ([#42](https://github.com/cookpad/grpc_kit/pull/42))
+
 ## v0.5.1 (2021-05-19)
 
 - improve: Set END_STREAM flag on the last DATA frame on request stream ([#34](https://github.com/cookpad/grpc_kit/pull/34))

data/examples/helloworld/helloworld_pb.rb

@@ -1,18 +1,16 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: helloworld.proto
 
 require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "helloworld.HelloRequest" do
-    optional :name, :string, 1
-  end
-  add_message "helloworld.HelloReply" do
-    optional :message, :string, 1
-  end
-end
+
+descriptor_data = "\n\x10helloworld.proto\x12\nhelloworld\"\x1c\n\x0cHelloRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1d\n\nHelloReply\x12\x0f\n\x07message\x18\x01 \x01(\t2I\n\x07Greeter\x12>\n\x08SayHello\x12\x18.helloworld.HelloRequest\x1a\x16.helloworld.HelloReply\"\x00\x42\x30\n\x1bio.grpc.examples.helloworldB\x0fHelloWorldProtoP\x01\x62\x06proto3"
+
+pool = ::Google::Protobuf::DescriptorPool.generated_pool
+pool.add_serialized_file(descriptor_data)
 
 module Helloworld
-  HelloRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("helloworld.HelloRequest").msgclass
-  HelloReply = Google::Protobuf::DescriptorPool.generated_pool.lookup("helloworld.HelloReply").msgclass
+  HelloRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("helloworld.HelloRequest").msgclass
+  HelloReply = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("helloworld.HelloReply").msgclass
 end

data/examples/helloworld/helloworld_services_pb.rb

@@ -1,20 +1,37 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # Source: helloworld.proto for package 'helloworld'
+# Original file comments:
+# Copyright 2015 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 require 'grpc'
 require 'helloworld_pb'
 
 module Helloworld
   module Greeter
+    # The greeting service definition.
     class Service
 
-      include GRPC::GenericService
+      include ::GRPC::GenericService
 
       self.marshal_class_method = :encode
       self.unmarshal_class_method = :decode
       self.service_name = 'helloworld.Greeter'
 
-      rpc :SayHello, HelloRequest, HelloReply
+      # Sends a greeting
+      rpc :SayHello, ::Helloworld::HelloRequest, ::Helloworld::HelloReply
     end
 
     Stub = Service.rpc_stub_class

data/examples/helloworld_client.rb

@@ -4,7 +4,6 @@ $LOAD_PATH.unshift File.expand_path('./examples/helloworld')
 
 require 'grpc_kit'
 require 'socket'
-require 'pry'
 require 'helloworld_services_pb'
 
 HOST = 'localhost'

data/examples/helloworld_server.rb

@@ -4,7 +4,6 @@ $LOAD_PATH.unshift File.expand_path('./examples/helloworld')
 
 require 'grpc_kit'
 require 'socket'
-require 'pry'
 require 'helloworld_services_pb'
 
 class GreeterServer < Helloworld::Greeter::Service

data/examples/routeguide/routeguide_pb.rb

@@ -1,37 +1,19 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: routeguide.proto
 
 require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "routeguide.Point" do
-    optional :latitude, :int32, 1
-    optional :longitude, :int32, 2
-  end
-  add_message "routeguide.Rectangle" do
-    optional :lo, :message, 1, "routeguide.Point"
-    optional :hi, :message, 2, "routeguide.Point"
-  end
-  add_message "routeguide.Feature" do
-    optional :name, :string, 1
-    optional :location, :message, 2, "routeguide.Point"
-  end
-  add_message "routeguide.RouteNote" do
-    optional :location, :message, 1, "routeguide.Point"
-    optional :message, :string, 2
-  end
-  add_message "routeguide.RouteSummary" do
-    optional :point_count, :int32, 1
-    optional :feature_count, :int32, 2
-    optional :distance, :int32, 3
-    optional :elapsed_time, :int32, 4
-  end
-end
+
+descriptor_data = "\n\x10routeguide.proto\x12\nrouteguide\",\n\x05Point\x12\x10\n\x08latitude\x18\x01 \x01(\x05\x12\x11\n\tlongitude\x18\x02 \x01(\x05\"I\n\tRectangle\x12\x1d\n\x02lo\x18\x01 \x01(\x0b\x32\x11.routeguide.Point\x12\x1d\n\x02hi\x18\x02 \x01(\x0b\x32\x11.routeguide.Point\"<\n\x07\x46\x65\x61ture\x12\x0c\n\x04name\x18\x01 \x01(\t\x12#\n\x08location\x18\x02 \x01(\x0b\x32\x11.routeguide.Point\"A\n\tRouteNote\x12#\n\x08location\x18\x01 \x01(\x0b\x32\x11.routeguide.Point\x12\x0f\n\x07message\x18\x02 \x01(\t\"b\n\x0cRouteSummary\x12\x13\n\x0bpoint_count\x18\x01 \x01(\x05\x12\x15\n\rfeature_count\x18\x02 \x01(\x05\x12\x10\n\x08\x64istance\x18\x03 \x01(\x05\x12\x14\n\x0c\x65lapsed_time\x18\x04 \x01(\x05\x32\x85\x02\n\nRouteGuide\x12\x36\n\nGetFeature\x12\x11.routeguide.Point\x1a\x13.routeguide.Feature\"\x00\x12>\n\x0cListFeatures\x12\x15.routeguide.Rectangle\x1a\x13.routeguide.Feature\"\x00\x30\x01\x12>\n\x0bRecordRoute\x12\x11.routeguide.Point\x1a\x18.routeguide.RouteSummary\"\x00(\x01\x12?\n\tRouteChat\x12\x15.routeguide.RouteNote\x1a\x15.routeguide.RouteNote\"\x00(\x01\x30\x01\x42\x30\n\x1bio.grpc.examples.routeguideB\x0fRouteGuideProtoP\x01\x62\x06proto3"
+
+pool = ::Google::Protobuf::DescriptorPool.generated_pool
+pool.add_serialized_file(descriptor_data)
 
 module Routeguide
-  Point = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.Point").msgclass
-  Rectangle = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.Rectangle").msgclass
-  Feature = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.Feature").msgclass
-  RouteNote = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.RouteNote").msgclass
-  RouteSummary = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.RouteSummary").msgclass
+  Point = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.Point").msgclass
+  Rectangle = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.Rectangle").msgclass
+  Feature = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.Feature").msgclass
+  RouteNote = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.RouteNote").msgclass
+  RouteSummary = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.RouteSummary").msgclass
 end

data/examples/routeguide/routeguide_services_pb.rb

@@ -24,7 +24,7 @@ module Routeguide
     # Interface exported by the server.
     class Service
 
-      include GRPC::GenericService
+      include ::GRPC::GenericService
 
       self.marshal_class_method = :encode
       self.unmarshal_class_method = :decode
@@ -36,24 +36,24 @@ module Routeguide
       #
       # A feature with an empty name is returned if there's no feature at the given
       # position.
-      rpc :GetFeature, Point, Feature
+      rpc :GetFeature, ::Routeguide::Point, ::Routeguide::Feature
       # A server-to-client streaming RPC.
       #
       # Obtains the Features available within the given Rectangle.  Results are
       # streamed rather than returned at once (e.g. in a response message with a
       # repeated field), as the rectangle may cover a large area and contain a
       # huge number of features.
-      rpc :ListFeatures, Rectangle, stream(Feature)
+      rpc :ListFeatures, ::Routeguide::Rectangle, stream(::Routeguide::Feature)
       # A client-to-server streaming RPC.
       #
       # Accepts a stream of Points on a route being traversed, returning a
       # RouteSummary when traversal is completed.
-      rpc :RecordRoute, stream(Point), RouteSummary
+      rpc :RecordRoute, stream(::Routeguide::Point), ::Routeguide::RouteSummary
       # A Bidirectional streaming RPC.
       #
       # Accepts a stream of RouteNotes sent while a route is being traversed,
       # while receiving other RouteNotes (e.g. from other users).
-      rpc :RouteChat, stream(RouteNote), stream(RouteNote)
+      rpc :RouteChat, stream(::Routeguide::RouteNote), stream(::Routeguide::RouteNote)
     end
 
     Stub = Service.rpc_stub_class

data/examples/routeguide_client.rb

@@ -3,8 +3,8 @@
 $LOAD_PATH.unshift File.expand_path('./examples/routeguide')
 
 require 'grpc_kit'
-require 'pry'
 require 'json'
+require 'socket'
 require 'routeguide_services_pb'
 
 RESOURCE_PATH = './examples/routeguide/routeguide.json'
@@ -48,7 +48,7 @@ def record_route(stub, size)
     JSON.parse(f.read)
   end
 
-  stream = stub.record_route({})
+  stream = stub.record_route
 
   size.times do
     location = features.sample['location']

data/examples/routeguide_server.rb

@@ -3,8 +3,8 @@
 $LOAD_PATH.unshift File.expand_path('./examples/routeguide')
 
 require 'grpc_kit'
-require 'pry'
 require 'json'
+require 'socket'
 require 'routeguide_services_pb'
 
 class Server < Routeguide::RouteGuide::Service

data/grpc_kit.gemspec

@@ -25,10 +25,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ds9', '>= 1.4.0'
   spec.add_dependency 'google-protobuf', '>= 3.7.0'
   spec.add_dependency 'googleapis-common-protos-types', '>= 1.0.2'
+  spec.add_dependency 'logger'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'grpc-tools', '~> 1.18.0'
-  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'irb'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'

data/lib/grpc_kit/rpc_dispatcher.rb

@@ -17,9 +17,6 @@ module GrpcKit
       @rpcs = rpcs
       @max_pool_size = max
       @min_pool_size = min
-      unless max == min
-        @auto_trimmer = AutoTrimmer.new(self, interval: interval).tap(&:start!)
-      end
 
       @shutdown = false
       @tasks = Queue.new
@@ -28,6 +25,10 @@ module GrpcKit
       @mutex = Mutex.new
 
       @min_pool_size.times { spawn_thread }
+
+      unless max == min
+        @auto_trimmer = AutoTrimmer.new(self, interval: interval).tap(&:start!)
+      end
     end
 
     # @param task [Object] task to dispatch

data/lib/grpc_kit/session/io.rb

@@ -45,7 +45,7 @@ module GrpcKit
       end
 
       # Blocking until io object is readable
-      # @return [void]
+      # @return [Boolean] false when the io object is already closed
       def wait_readable
         ::IO.select([@io], [], [])
         true
@@ -54,10 +54,12 @@ module GrpcKit
       end
 
       # Blocking until io object is readable or writable
-      # @return [void]
+      # @param timeout [Integer, Float, nil] seconds to wait, or nil to block forever
+      # @param write [Boolean] whether to wait for writability as well
+      # @return [Array(Array<::IO>, Array<::IO>)] readable ios and writable ios, both empty on timeout.
       def select(timeout: 1, write: true)
         rs, ws = ::IO.select([@io, @wake_o], write ? [@io] : [], [], timeout)
-        @wake_o.read(@wake_o.stat.size) if rs&.delete(@wake_o) && !@wake_o.closed?
+        drain_waker if rs&.delete(@wake_o)
         [rs || [], ws || []]
       end
 
@@ -74,6 +76,18 @@ module GrpcKit
       def flush
         @io.flush
       end
+
+      private
+
+      # @return [void]
+      def drain_waker
+        return if @wake_o.closed?
+
+        loop do
+          data = @wake_o.read_nonblock(4096, exception: false)
+          break if [:wait_readable, nil].include?(data) # EAGAIN, EWOULDBLOCK, or EOF
+        end
+      end
     end
   end
 end

data/lib/grpc_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrpcKit
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: grpc_kit
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Yuta Iwama
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ds9
@@ -52,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.18.0
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -237,7 +250,6 @@ homepage: https://github.com/ganmacs/grpc_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -252,8 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 4.0.19
 specification_version: 4
 summary: A kit for creating gRPC server/client
 test_files: []