jrpc 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7ff3b918c137543a58deef9ec59a2afc0c3ed043
-  data.tar.gz: a681f3ef3aece2d7f4f8ec2f5c2ff73819330577
+SHA256:
+  metadata.gz: 67534bff4d06dfed8a49ddf71bb56356d65f9c119731b220e6490394a187f720
+  data.tar.gz: fd53da1804ddc60f54d549811b7d866541601dc4b3f58dc15de2a112c10039cf
 SHA512:
-  metadata.gz: 94a89c191c1570bd1ae1ff5a1685cddd6ec989a03b9bcde127effffeb6dce2ee65d94bef3de5e73d6789c557c482750b79d667ae4c713330e91e3759acf8875a
-  data.tar.gz: 32c10ccc3af98101f5dee9ec190e491ea8d3afd2ca44846c923ed8ec4fcf435a2273a111f628bd952acc19a86fd696094ce4b26a1eb19ab9635180a93e47295b
+  metadata.gz: c99a86b3b5a59ff431d5356604d4cfcd1803212a8e3be22819de4bbab9d826d985a47bec9fed72cc82f8adfa80f208b1823ab85566325fe3f7965db52d631911
+  data.tar.gz: d565e6cf0cd0afa20b935d1ca6e554d2aa6142dd46bfbefd1468f4910175f326656a6015fae7a160ef5ad8da41574e0c8c9d000ea8d624e5e989e5f8683ca262

data/lib/jrpc/transport/socket_tcp.rb

@@ -67,16 +67,25 @@ module JRPC
       def build_socket
         host = @server.split(':').first
         addr = Socket.getaddrinfo(host, nil)
-        sock = Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
-        set_timeout_to(sock, Socket::SO_RCVTIMEO, @connect_timeout) if @connect_timeout
-        sock
+        Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0)
       end
 
       def connect_socket
         host, port = @server.split(':')
         addr = Socket.getaddrinfo(host, nil)
         full_addr = Socket.pack_sockaddr_in(port, addr[0][3])
-        socket.connect(full_addr)
+
+        begin
+          socket.connect_nonblock(full_addr)
+        rescue IO::WaitWritable => _
+          if IO.select(nil, [socket], nil, @connect_timeout)
+            socket.connect_nonblock(full_addr)
+          else
+            clear_socket!
+            raise ConnectionFailedError, "Can't connect during #{@connect_timeout}"
+          end
+        end
+
       rescue Errno::EISCONN => _
         # already connected
       rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::EPIPE => e

data/lib/jrpc/version.rb

@@ -1,3 +1,3 @@
 module JRPC
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrpc
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netstring
@@ -132,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: JSON RPC client