protoplasm-blocking-client 0.1.2 → 0.1.3

data/lib/protoplasm/client/blocking_client.rb

@@ -17,7 +17,23 @@ module Protoplasm
 
     def _socket
       host, port = host_port
-      @_socket ||= TCPSocket.open(host, port)
+      count = 0
+      begin
+        @socket ||= begin
+          s = TCPSocket.open(host, port)
+          s.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
+          s
+        end
+        yield @socket
+      rescue Errno::EPIPE, Errno::ECONNRESET
+        count += 1
+        if count > 3
+          raise
+        else
+          @socket = nil
+          retry
+        end
+      end
     end
 
     def send_request(field, *args, &blk)
@@ -26,30 +42,31 @@ module Protoplasm
       cmd_class = type.command_class.fields.values.find{|f| f.name == field}
       cmd = self.class._types.request_class.new(self.class._types.request_type_field => type.type, type.field => cmd_class.type.new(*args))
       cmd.encode(s)
-      socket = _socket
-      socket.write([Types::Request::NORMAL, s.size].pack("CQ"))
-      socket.write s
-      socket.flush
-      fetch_objects = true
       obj = nil
-      while fetch_objects
-        response_byte = socket.read(1)
-        response_code = response_byte.unpack("C").first
-        case response_code
-        when Types::Response::NORMAL
-          fetch_objects = !type.void?
-          if fetch_objects
-            len_buf = socket.read(8)
-            len = len_buf.unpack("Q").first
-            data = socket.read(len)
-            obj = type.response_class.decode(data)
-            yield obj if block_given?
+      _socket do |socket|
+        socket.write([Types::Request::NORMAL, s.size].pack("CQ"))
+        socket.write s
+        socket.flush
+        fetch_objects = true
+        while fetch_objects
+          response_byte = socket.read(1)
+          response_code = response_byte.unpack("C").first
+          case response_code
+          when Types::Response::NORMAL
+            fetch_objects = !type.void?
+            if fetch_objects
+              len_buf = socket.read(8)
+              len = len_buf.unpack("Q").first
+              data = socket.read(len)
+              obj = type.response_class.decode(data)
+              yield obj if block_given?
+            end
+            fetch_objects = false unless type.streaming?
+          when Types::Response::STOP_STREAMING
+            fetch_objects = false
+          else
+            raise "Control byte is #{response_byte.inspect}, code is #{response_code.inspect}"
           end
-          fetch_objects = false unless type.streaming?
-        when Types::Response::STOP_STREAMING
-          fetch_objects = false
-        else
-          raise "Control byte is #{response_byte.inspect}, code is #{response_code.inspect}"
         end
       end
       obj

data/lib/protoplasm/version.rb

@@ -1,3 +1,3 @@
 module Protoplasm
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,56 +1,78 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: protoplasm-blocking-client
-version: !ruby/object:Gem::Version
-  version: 0.1.2
+version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
-authors:
+authors: 
 - Josh Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: beefcake
-  requirement: &70224617142360 !ruby/object:Gem::Requirement
+
+date: 2012-01-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 3
+        - 7
         version: 0.3.7
+  requirement: *id001
   type: :runtime
   prerelease: false
-  version_requirements: *70224617142360
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70224617141940 !ruby/object:Gem::Requirement
+  name: beefcake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
   type: :development
   prerelease: false
-  version_requirements: *70224617141940
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &70224617141400 !ruby/object:Gem::Requirement
+  name: rake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
         version: 2.6.1
+  requirement: *id003
   type: :development
   prerelease: false
-  version_requirements: *70224617141400
+  name: minitest
 description: A blocking client for a Protoplasm server.
-email:
+email: 
 - joshbuddy@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.md
@@ -66,34 +88,37 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/bazaarlabs/protoplasm
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4090923455675816360
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4090923455675816360
+      version: "0"
 requirements: []
+
 rubyforge_project: protoplasm-blocking-client
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A blocking client for a Protoplasm server
-test_files:
+test_files: 
 - test/protoplasm_test.rb
 - test/test_helper.rb