excon 0.15.3 → 0.15.4

data/changelog.txt

@@ -1,3 +1,8 @@
+0.15.4 07/16/12
+===============
+
+rescue/retry nonblock errors from readline (even though they shouldn't occur)
+
 0.15.3 07/16/12
 ===============
 

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.15.3'
-  s.date              = '2012-07-17'
+  s.version           = '0.15.4'
+  s.date              = '2012-07-18'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
   unless const_defined?(:VERSION)
-    VERSION = '0.15.3'
+    VERSION = '0.15.4'
   end
 
   unless const_defined?(:CHUNK_SIZE)

data/lib/excon/socket.rb

@@ -106,6 +106,31 @@ module Excon
       end
     end
 
+    def readline
+      return nil if @eof
+
+      begin
+        @socket.readline
+      rescue OpenSSL::SSL::SSLError => error
+        if error.message == 'read would block'
+          if IO.select([@socket], nil, nil, @params[:read_timeout])
+            retry
+          else
+            raise(Excon::Errors::Timeout.new("read timeout reached"))
+          end
+        end
+      rescue Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable
+        if IO.select([@socket], nil, nil, @params[:read_timeout])
+          retry
+        else
+          raise(Excon::Errors::Timeout.new("read timeout reached"))
+        end
+      rescue EOFError
+        @eof = true
+        nil
+      end
+    end
+
     def write(data)
       # We normally return from the return in the else block below, but
       # we guard that data is still something in case we get weird

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70352714588600 !ruby/object:Gem::Requirement
+  requirement: &70201249148480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352714588600
+  version_requirements: *70201249148480
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70352714588000 !ruby/object:Gem::Requirement
+  requirement: &70201249147600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352714588000
+  version_requirements: *70201249147600
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &70352714587420 !ruby/object:Gem::Requirement
+  requirement: &70201249145740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352714587420
+  version_requirements: *70201249145740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70352714586660 !ruby/object:Gem::Requirement
+  requirement: &70201249137360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352714586660
+  version_requirements: *70201249137360
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70352714585720 !ruby/object:Gem::Requirement
+  requirement: &70201249128100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352714585720
+  version_requirements: *70201249128100
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &70352714584600 !ruby/object:Gem::Requirement
+  requirement: &70201249123000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352714584600
+  version_requirements: *70201249123000
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70352714583780 !ruby/object:Gem::Requirement
+  requirement: &70201249117960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70352714583780
+  version_requirements: *70201249117960
 description: EXtended http(s) CONnections
 email: geemus@gmail.com
 executables: []
@@ -166,6 +166,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3281686677193752386
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: