rubysl-net-protocol 1.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a5f5190a2f8eea39f80416cc303533647f25b1c
-  data.tar.gz: e7e39d163a97f4f42b9f1da93968fc84729d41a2
+  metadata.gz: 3f0dddf4e307731f0d4912dab2cb75188a77121a
+  data.tar.gz: 6e32a554d2c4e473a6de3a3458c081edb0247aec
 SHA512:
-  metadata.gz: c451315d4c840b290f1adee071288a5eaf9b65638090c649ed7c87d8813ddc0ca4fd5f43251b0ffd122a2148ebb12442899ae26d73b93f8ee9a92ab2d7fc9d67
-  data.tar.gz: 78b3ae013cadd203836a021c62f5f4c5410b143e6bfcfd4eb36fb0eeb679ea28ff159fa2eb9d1da3d23741830b254aeaa9a9ff28440678463318160c8e6a71dc
+  metadata.gz: 62b61fcc4432be376df0d401738fc201ec9e810c0ca60b08959c5a83dea326b46a47ea539daf1e328c1cf9113709041218ea2b073c3b77e8f69a7740a065b15a
+  data.tar.gz: ebb62c7ca6e2fa6a7d0bb5881701a8a5c42cf7c4e0d5ba4fb0712abc824f35d5b4be3f1c916ec8386e6a0fe2adb17a44e6c6d0c02a9e810c3c1bd093c7421789

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+env:
+  - RUBYLIB=lib
+script: bundle exec mspec spec
+rvm:
+  - rbx-nightly-19mode

data/lib/rubysl/net/protocol/protocol.rb

@@ -2,8 +2,8 @@
 # = net/protocol.rb
 #
 #--
-# Copyright (c) 1999-2005 Yukihiro Matsumoto
-# Copyright (c) 1999-2005 Minero Aoki
+# Copyright (c) 1999-2004 Yukihiro Matsumoto
+# Copyright (c) 1999-2004 Minero Aoki
 #
 # written and maintained by Minero Aoki <aamine@loveruby.net>
 #
@@ -45,23 +45,41 @@ module Net # :nodoc:
   class ProtoRetriableError    < ProtocolError; end
   ProtocRetryError = ProtoRetriableError
 
+  ##
+  # OpenTimeout, a subclass of Timeout::Error, is raised if a connection cannot
+  # be created within the open_timeout.
+
+  class OpenTimeout            < Timeout::Error; end
+
+  ##
+  # ReadTimeout, a subclass of Timeout::Error, is raised if a chunk of the
+  # response cannot be read within the read_timeout.
+
+  class ReadTimeout            < Timeout::Error; end
+
 
   class BufferedIO   #:nodoc: internal use only
     def initialize(io)
       @io = io
       @read_timeout = 60
+      @continue_timeout = nil
       @debug_output = nil
       @rbuf = ''
     end
 
     attr_reader :io
     attr_accessor :read_timeout
+    attr_accessor :continue_timeout
     attr_accessor :debug_output
 
     def inspect
       "#<#{self.class} io=#{@io}>"
     end
 
+    def eof?
+      @io.eof?
+    end
+
     def closed?
       @io.closed?
     end
@@ -121,7 +139,7 @@ module Net # :nodoc:
         return rbuf_consume(@rbuf.size)
       end
     end
-        
+
     def readline
       readuntil("\n").chop
     end
@@ -131,9 +149,23 @@ module Net # :nodoc:
     BUFSIZE = 1024 * 16
 
     def rbuf_fill
-      timeout(@read_timeout) {
-        @rbuf << @io.sysread(BUFSIZE)
-      }
+      begin
+        @rbuf << @io.read_nonblock(BUFSIZE)
+      rescue IO::WaitReadable
+        if IO.select([@io], nil, nil, @read_timeout)
+          retry
+        else
+          raise Net::ReadTimeout
+        end
+      rescue IO::WaitWritable
+        # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
+        # http://www.openssl.org/support/faq.html#PROG10
+        if IO.select(nil, [@io], nil, @read_timeout)
+          retry
+        else
+          raise Net::ReadTimeout
+        end
+      end
     end
 
     def rbuf_consume(len)
@@ -154,6 +186,8 @@ module Net # :nodoc:
       }
     end
 
+    alias << write
+
     def writeline(str)
       writing {
         write0 str + "\r\n"
@@ -202,16 +236,6 @@ module Net # :nodoc:
 
 
   class InternetMessageIO < BufferedIO   #:nodoc: internal use only
-    def InternetMessageIO.old_open(addr, port,
-        open_timeout = nil, read_timeout = nil, debug_output = nil)
-      debug_output << "opening connection to #{addr}...\n" if debug_output
-      s = timeout(open_timeout) { TCPsocket.new(addr, port) }
-      io = new(s)
-      io.read_timeout = read_timeout
-      io.debug_output = debug_output
-      io
-    end
-
     def initialize(io)
       super
       @wbuf = nil
@@ -232,7 +256,7 @@ module Net # :nodoc:
       LOG_on()
       LOG "read message (#{read_bytes} bytes)"
     end
-  
+
     # *library private* (cannot handle 'break')
     def each_list_item
       while (str = readuntil("\r\n")) != ".\r\n"
@@ -298,7 +322,7 @@ module Net # :nodoc:
 
     def each_crlf_line(src)
       buffer_filling(@wbuf, src) do
-        while line = @wbuf.slice!(/\A.*(?:\n|\r\n|\r(?!\z))/n)
+        while line = @wbuf.slice!(/\A[^\r\n]*(?:\n|\r(?:\n|(?!\z)))/)
           yield line.chomp("\n") + "\r\n"
         end
       end
@@ -317,8 +341,8 @@ module Net # :nodoc:
           yield
         end
       else    # generic reader
-        src.each do |s|
-          buf << s
+        src.each do |str|
+          buf << str
           yield if buf.size > 1024
         end
         yield unless buf.empty?

data/lib/rubysl/net/protocol/version.rb

@@ -1,7 +1,7 @@
 module RubySL
   module Net
     module Protocol
-      VERSION = "1.0.0"
+      VERSION = "2.0.1"
     end
   end
 end

data/rubysl-net-protocol.gemspec

@@ -16,6 +16,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = "~> 2.0"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "mspec", "~> 1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysl-net-protocol
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: mspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 description: Ruby standard library net-protocol.
 email:
 - brixen@gmail.com
@@ -46,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -65,9 +80,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ~>
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -80,3 +95,4 @@ signing_key:
 specification_version: 4
 summary: Ruby standard library net-protocol.
 test_files: []
+has_rdoc: