digital-transport 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc66bca4fa184489e9e3150ffe00fcc1cc14d26
-  data.tar.gz: 43e9b5b2de33c6fc647a300e1a6228386b824684
+  metadata.gz: 7bef42589885904d645a4292752810953782d877
+  data.tar.gz: 7e305bfc77044fae5f8d66e9ab9887482f0fb4cd
 SHA512:
-  metadata.gz: 395e76d6e3d347c611c798b4078481b18e52f4971ef3cb582a237933f970a0c7b6330e7e05abea3ca234511f1ae490bfeab7577232ad08d2a86f2d0853cd2459
-  data.tar.gz: fb9c67b12c6cb9a2a5ee19a9c586a7bb30e01d50c0b1d35938fda3b71f8787b21c1503cdcb09a7898038b897fb0b58605dbcea2e9ba5dd13ca8cca34be291785
+  metadata.gz: 864d29f9043ce4032dcbda34aac41f473b8377723ddad72ac74d504e2a0942b8be5793db7cffd40cb0b6bb05b0d68abbae4f83c90bbebd599f3383804f2fc64f
+  data.tar.gz: 4e38dd77510f9e3e0f236638727913fad7f2e7de361e103af7265768fb5713b333897aeae8fdd3dcc9daae88da12031f8bb6de4c26cbc5f22c730c0ad2ba43bd

data/lib/digital/transport/adapters/tcp.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'timeout'
 require 'functional'
 
 module Digital
@@ -30,9 +31,9 @@ module Digital
           Socket.new(AF_INET, SOCK_STREAM, 0).tap do |socket|
             socket.setsockopt(IPPROTO_TCP, TCP_NODELAY, (@opts[:tcp_nodelay] || DEFAULTS[:tcp_no_delay]).to_i)
             return connect_nonblock(
-              socket,
-              Socket.pack_sockaddr_in(@port, @ip),
-              @opts[:timeout].to_i.nonzero? || DEFAULTS[:timeout]
+                socket,
+                Socket.pack_sockaddr_in(@port, @ip),
+                @opts[:timeout].to_i.nonzero? || DEFAULTS[:timeout]
             )
           end
         end
@@ -95,21 +96,26 @@ module Digital
 
         # @api private
         def connect_nonblock(io_like, endpoint, timeout)
-          # IO.connect_nonblock retrun value is different across multiple platform.
-          io_like.connect_nonblock(endpoint) 
+          io_like.connect_nonblock(endpoint)
           raise Errno::EISCONN
-        rescue Errno::EINPROGRESS # connection in progress, wait a bit.
-          IO.select(nil, [io_like], nil, timeout) ? retry : nil
-        rescue Errno::EISCONN # The socket is already connected.
+        rescue Errno::EINPROGRESS
+          if IO.select(nil, [io_like], nil, timeout)
+            retry
+          else
+            io_like.close
+            Either.left(Timeout::Error.new('Connection timeout'))
+          end
+        rescue Errno::EISCONN
           init_io io_like
           Either.right(self)
         rescue => ex
+          io_like.close
           Either.left(ex)
         end
         
         def init_io(io)
           @io = io
-        end    
+        end
       end
     end
   end

data/lib/digital/transport/version.rb

@@ -1,5 +1,5 @@
 module Digital
   module Transport
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.7.0'.freeze
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: digital-transport
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Roman Lishtaba
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,62 +84,62 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: functional-ruby
   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: rs_232
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.5
 description: Library intended to unify interface between multiple transport adapters
@@ -149,10 +149,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
+- .yardopts
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -178,18 +178,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: interface between multiple transport adapters
 test_files: []
+has_rdoc: