bertrpc 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,9 @@
+= 1.1.2 / 2009-11-27
+  * Minor Changes
+    * Add useful debugging information to ReadTimeoutError
+    * Switch to using raw socket timeouts over buffered io (Linux only)
+    * Add BERTRPC::VERSION and BERTRPC.version
+
 = 1.1.1 / 2009-10-28
   Major Changes
     * Require bert-1.1.0 or greater

data/Rakefile

@@ -9,8 +9,9 @@ begin
     gem.email = "tom@mojombo.com"
     gem.homepage = "http://github.com/mojombo/bertrpc"
     gem.authors = ["Tom Preston-Werner"]
-    gem.add_dependency('bert', '>= 1.1.0')
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency('bert', '>= 1.1.0', '< 2.0.0')
+    # gem is a Gem::Specification...
+    # see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 
 rescue LoadError
@@ -37,7 +38,6 @@ rescue LoadError
   end
 end
 
-
 task :default => :test
 
 require 'rake/rdoctask'
@@ -55,3 +55,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+task :console do
+  exec('irb -Ilib -rbertrpc')
+end

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/bertrpc.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bertrpc}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2009-11-28}
   s.email = %q{tom@mojombo.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
      "bertrpc.gemspec",
      "lib/bertrpc.rb",
      "lib/bertrpc/action.rb",
-     "lib/bertrpc/buffered_io.rb",
      "lib/bertrpc/encodes.rb",
      "lib/bertrpc/errors.rb",
      "lib/bertrpc/mod.rb",
@@ -60,11 +59,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bert>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<bert>, [">= 1.1.0", "< 2.0.0"])
     else
-      s.add_dependency(%q<bert>, [">= 1.1.0"])
+      s.add_dependency(%q<bert>, [">= 1.1.0", "< 2.0.0"])
     end
   else
-    s.add_dependency(%q<bert>, [">= 1.1.0"])
+    s.add_dependency(%q<bert>, [">= 1.1.0", "< 2.0.0"])
   end
 end
+

data/lib/bertrpc/action.rb

@@ -44,8 +44,8 @@ module BERTRPC
       bert_response
     rescue Errno::ECONNREFUSED
       raise ConnectionError.new("Unable to connect to #{@svc.host}:#{@svc.port}")
-    rescue Timeout::Error
-      raise ReadTimeoutError.new("No response from #{@svc.host}:#{@svc.port} in #{@svc.timeout}s")
+    rescue Errno::EAGAIN
+      raise ReadTimeoutError.new(@svc.host, @svc.port, @svc.timeout)
     end
 
     # Creates a socket object which does speedy, non-blocking reads
@@ -57,9 +57,18 @@ module BERTRPC
     #   +port+ Integer port of the target TCP server
     #   +timeout+ Optional Integer (in seconds) of the read timeout
     def connect_to(host, port, timeout = nil)
-      io = BufferedIO.new(TCPSocket.new(host, port))
-      io.read_timeout = timeout
-      io
+      sock = TCPSocket.new(host, port)
+      sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
+
+      if timeout
+        secs = Integer(timeout)
+        usecs = Integer((timeout - secs) * 1_000_000)
+        optval = [secs, usecs].pack("l_2")
+        sock.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
+        sock.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
+      end
+
+      sock
     end
   end
 end

data/lib/bertrpc/errors.rb

@@ -28,8 +28,14 @@ module BERTRPC
 
   end
 
+  # Raised when we don't get a response from a server in a timely
+  # manner. This typically occurs in spite of a successful connection.
   class ReadTimeoutError < BERTRPCError
-
+    attr_reader :host, :port, :timeout
+    def initialize(host, port, timeout)
+      @host, @port, @timeout = host, port, timeout
+      super("No response from #{host}:#{port} in #{timeout}s")
+    end
   end
 
   class ProtocolError < BERTRPCError
@@ -52,4 +58,4 @@ module BERTRPC
   class InvalidOption < BERTRPCError
 
   end
-end
+end

data/lib/bertrpc.rb

@@ -8,4 +8,13 @@ require 'bertrpc/mod'
 require 'bertrpc/encodes'
 require 'bertrpc/action'
 require 'bertrpc/errors'
-require 'bertrpc/buffered_io'
+
+module BERTRPC
+  def self.version
+    File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION])).chomp
+  rescue
+    'unknown'
+  end
+
+  VERSION = self.version
+end

data/test/action_test.rb

@@ -94,13 +94,15 @@ class ActionTest < Test::Unit::TestCase
         io = stub()
         io.expects(:write).with("\000\000\000\003")
         io.expects(:write).with("foo")
-        io.expects(:read).with(4).raises(Timeout::Error)
+        io.expects(:read).with(4).raises(Errno::EAGAIN)
         @call.expects(:connect_to).returns(io)
         begin
           @call.transaction("foo")
           fail "Should have thrown an error"
         rescue BERTRPC::ReadTimeoutError => e
           assert_equal 0, e.code
+          assert_equal 'localhost', e.host
+          assert_equal 9941, e.port
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bertrpc
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -07:00
+date: 2009-11-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +21,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.1.0
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
     version: 
 description: 
 email: tom@mojombo.com
@@ -42,7 +45,6 @@ files:
 - bertrpc.gemspec
 - lib/bertrpc.rb
 - lib/bertrpc/action.rb
-- lib/bertrpc/buffered_io.rb
 - lib/bertrpc/encodes.rb
 - lib/bertrpc/errors.rb
 - lib/bertrpc/mod.rb

data/lib/bertrpc/buffered_io.rb

@@ -1,28 +0,0 @@
-module BERTRPC
-  # Taken with love from memcache-client.
-  #
-  # See http://is.gd/4CWRA for the code and
-  # http://is.gd/4CYde for the discussion.
-  class BufferedIO < Net::BufferedIO # :nodoc:
-    BUFSIZE = 1024 * 16
-
-    if RUBY_VERSION < '1.9.1'
-      def rbuf_fill
-        begin
-          @rbuf << @io.read_nonblock(BUFSIZE)
-        rescue Errno::EWOULDBLOCK
-          retry unless @read_timeout
-          if IO.select([@io], nil, nil, @read_timeout)
-            retry
-          else
-            raise Timeout::Error, 'IO timeout'
-          end
-        end
-      end
-    end
-
-    def setsockopt(*args)
-      @io.setsockopt(*args)
-    end
-  end
-end