katcp 0.1.6 → 0.1.8

data/lib/katcp/client.rb

@@ -112,32 +112,29 @@ module KATCP
               req_timeouts = 0
               while req_timeouts < 2
                 # Use select to wait with timeout for data or error
-                rd_wr_err = select([@socket], [], [@socket], @socket_timeout)
+                rd_wr_ex = select([@socket], nil, nil, @socket_timeout)
 
                 # Handle timeout
-                if rd_wr_err.nil?
+                if rd_wr_ex.nil?
                   # Timeout, increment req_timeout if we're expecting a reply,
                   # then try again
                   req_timeouts += 1 if @reqname
                   next
                 end
 
-                # Handle error
-                if rd_wr_err[2][0]
-                  # Ignore unless we're expected a reply
-                  next unless @reqname
-                  # Otherwise, send double-bang error response, and give up
+                # OK to (try to) read!
+                line = nil
+                begin
+                  # TODO: Monkey-patch gets so that it recognizes "\r" or "\n"
+                  # as line endings.  Currently only recognizes fixed strings,
+                  # so for now go with "\n".
+                  line = @socket.gets("\n")
+                rescue
+                  # Uh-oh, send double-bang error response, and give up
                   @rxq.enq(['!!socket-error'])
                   throw :giveup
                 end
 
-                # OK to read!
-
-                # TODO: Monkey-patch gets so that it recognizes "\r" or "\n" as
-                # line endings.  Currently only recognizes fixed strings, so for
-                # now go with "\n".
-                line = @socket.gets("\n")
-
                 # If EOF
                 if line.nil?
                   # Send double-bang error response, and give up

data/lib/katcp/version.rb

@@ -3,5 +3,5 @@
 #++
 
 module KATCP
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: katcp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - David MacMahon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-25 00:00:00 Z
+date: 2013-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: narray
@@ -59,7 +59,7 @@ rdoc_options:
 - -m
 - README
 - --title
-- Ruby/KATCP 0.1.6 Documentation
+- Ruby/KATCP 0.1.8 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement