right_agent 2.1.2 → 2.1.3

data/lib/right_agent/clients/non_blocking_client.rb

@@ -124,7 +124,7 @@ module RightScale
       fiber = Fiber.current
       connection = EM::HttpRequest.new(uri.to_s, connect_options)
       http = connection.send(verb, request_options)
-      http.errback { fiber.resume(http.error.to_s == "Errno::ETIMEDOUT" ? 504 : 500, http.error) }
+      http.errback { fiber.resume(http.error.to_s == "Errno::ETIMEDOUT" ? 504 : 500, http.error && http.error.to_s) }
       http.callback { fiber.resume(http.response_header.status, http.response, http.response_header) }
       response_code, response_body, response_headers = Fiber.yield
       response_headers = beautify_headers(response_headers) if response_headers
@@ -172,7 +172,7 @@ module RightScale
     # @raise [HttpException] HTTP failure with associated status code
     def poll_again(fiber, connection, request_options, stop_at)
       http = connection.send(:get, request_options)
-      http.errback { fiber.resume(http.error.to_s == "Errno::ETIMEDOUT" ? 504 : 500, http.error) }
+      http.errback { fiber.resume(http.error.to_s == "Errno::ETIMEDOUT" ? 504 : 500, http.error && http.error.to_s) }
       http.callback do
         code, body, headers = http.response_header.status, http.response, http.response_header
         if code == 200 && (body.nil? || body == "null") && Time.now < stop_at

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.1.2'
-  spec.date      = '2014-04-07'
+  spec.version   = '2.1.3'
+  spec.date      = '2014-04-10'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro', 'Scott Messier']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/clients/non_blocking_client_spec.rb

@@ -256,7 +256,7 @@ describe RightScale::NonBlockingClient do
       it "converts Errno::ETIMEDOUT error to 504" do
         @headers.http_status = 504
         @response.should_receive(:errback).and_yield.once
-        @response.should_receive(:error).and_return("Errno::ETIMEDOUT")
+        @response.should_receive(:error).and_return(Errno::ETIMEDOUT)
         @fiber.should_receive(:resume).with(504, "Errno::ETIMEDOUT").once
         flexmock(Fiber).should_receive(:yield).and_return([504, "Errno::ETIMEDOUT"]).once
         flexmock(EM::HttpRequest).should_receive(:new).with(@host, @connect_options).and_return(@request).once
@@ -340,7 +340,7 @@ describe RightScale::NonBlockingClient do
         end
 
         it "stops polling if there is an error" do
-          @response.should_receive(:error).and_return("some error").twice
+          @response.should_receive(:error).and_return("some error").times(3)
           @response.should_receive(:errback).and_yield.once
           @fiber.should_receive(:resume).with(500, "some error").once
           @client.send(:poll_again, @fiber, @request, @request_options, @stop_at).should be true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -412,7 +412,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 701936506677112594
+      hash: -3545944091295491847
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.26