rexpro 0.0.1 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 437d2e1d9f2ce37b553dac26e0b2af775d8b7c6f
+  data.tar.gz: 81593681ee7a9115fcc574829138665a7a4c0ab7
+SHA512:
+  metadata.gz: 87e774e300890256b7cbe674c588808a69f12bb685f485bdc6e7a0d8554061ce33ebc32a025802808d65dd7abc568de959a34eb1fb967fc46717cb25c99e7d3f
+  data.tar.gz: ad898a7b0f7c5fb8d6798c17f720e05b505bc636545469e93024c128ea9f00d9ddd8082dc6889494c66a68ebb47941c2a0394f56f039119dcf2a2b2fc067bc3a

data/lib/rexpro/client.rb

@@ -1,4 +1,4 @@
-require 'socket'
+require 'tcp_timeout'
 
 require_relative './session'
 
@@ -10,20 +10,27 @@ module Rexpro
     attr_reader :host, :port, :socket
 
     def initialize(opts = {})
-      @host = opts[:host] || DEFAULT_HOST
-      @port = opts[:port] || DEFAULT_PORT
+      opts = opts.dup
+      @host = opts.delete(:host) || DEFAULT_HOST
+      @port = opts.delete(:port) || DEFAULT_PORT
+
+      @request_opts = {}
+      [:channel, :graph_name, :graph_obj_name].each do |key|
+        value = opts.delete(key)
+        @request_opts[key] = value if value
+      end
+
+      @socket_opts = opts
       reconnect
     end
 
     def reconnect
       @socket.close if @socket && !@socket.closed?
-      @socket = TCPSocket.new @host, @port
-    end
-
-    def new_session(*args)
-      req = Rexpro::Message::SessionRequest.new(*args)
-      resp = request(req)
-      Rexpro::Session.new(self, resp.session_uuid, req.channel, resp.languages)
+      begin
+        @socket = TCPTimeout::TCPSocket.new(@host, @port, @socket_opts)
+      rescue TCPTimeout::SocketTimeout => ex
+        raise Rexpro::RexproException.new(ex)
+      end
     end
 
     def request(req)
@@ -41,11 +48,21 @@ module Rexpro
           raise Rexpro::RexproError.new(err_msg)
         end
       end
+    rescue TCPTimeout::SocketTimeout => ex
+      raise Rexpro::RexproException.new(ex)
+    end
+
+    def new_session(opts = {})
+      opts = @request_opts.merge(opts)
+      req = Rexpro::Message::SessionRequest.new(opts)
+      resp = request(req)
+      Rexpro::Session.new(self, resp.session_uuid, req.channel, resp.languages)
     end
 
-    def execute(script, attrs = {})
-      attrs = attrs.merge(script: script)
-      msg = Rexpro::Message::ScriptRequest.new(attrs)
+    def execute(script, opts = {})
+      opts = @request_opts.merge(opts)
+      opts[:script] = script
+      msg = Rexpro::Message::ScriptRequest.new(opts)
       request(msg)
     end
   end

data/lib/rexpro/version.rb

@@ -1,3 +1,3 @@
 module Rexpro
-  VERSION = "0.0.1"
+  VERSION = "0.0.4"
 end

data/rexpro.gemspec

@@ -13,15 +13,16 @@ Gem::Specification.new do |spec|
 RexPro is a binary protocol for Rexster that can be used to send Gremlin
 scripts to a remote Rexster instance.
 DESC
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/lann/rexpro-ruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "msgpack", "~> 0.5.4"
-  spec.add_dependency "uuid",    "~> 2.3.7"
+  spec.add_dependency "msgpack",     "~> 0.5.4"
+  spec.add_dependency "uuid",        "~> 2.3.7"
+  spec.add_dependency "tcp_timeout", "~> 0.1.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/spec/integration/integration_helper.rb

@@ -1,8 +1,11 @@
 module IntegrationHelper
   def client_opts
-    %w[host port].inject({}) do |memo, key|
-      value = ENV["REXPRO_#{key.upcase}"]
-      memo[key.to_sym] = value if value
+    %w[host port connect_timeout read_timeout write_timeout
+    ].inject({}) do |memo, key|
+      if value = ENV["REXPRO_#{key.upcase}"]
+        value = value.to_i if value =~ /\A\d+$\z/
+        memo[key.to_sym] = value
+      end
       memo
     end
   end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rexpro
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Lann Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,15 +34,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.7
+- !ruby/object:Gem::Dependency
+  name: tcp_timeout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,17 +69,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: RexPro, a binary protocol for Rexster
@@ -98,30 +103,29 @@ files:
 - spec/integration/integration_helper.rb
 - spec/integration/session_spec.rb
 - spec/message_spec.rb
-homepage: ''
+homepage: https://github.com/lann/rexpro-ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RexPro is a binary protocol for Rexster that can be used to send Gremlin
   scripts to a remote Rexster instance.
 test_files: