right_agent 2.1.4 → 2.1.5

data/lib/right_agent/clients/non_blocking_client.rb

@@ -124,7 +124,8 @@ 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.error.to_s) }
+      http.errback { fiber.resume(http.error.to_s == "Errno::ETIMEDOUT" ? 504 : 500,
+                                  (http.error && http.error.to_s) || "HTTP connection failure for #{verb.to_s.upcase}") }
       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 +173,8 @@ 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.error.to_s) }
+      http.errback { fiber.resume(http.error.to_s == "Errno::ETIMEDOUT" ? 504 : 500,
+                                  (http.error && http.error.to_s) || "HTTP connection failure for POLL") }
       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/lib/right_agent/command/command_serializer.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 #
 # Copyright (c) 2009-2011 RightScale Inc
 #
@@ -36,6 +37,12 @@ module RightScale
     # === Return
     # data(String):: Corresponding serialized data
     def self.dump(command)
+      # Set the encoding before serialization otherwise YAML will serialize
+      # UTF8 characters as binary data.  This can cause some quirks we'd rather
+      # avoid, such as the deserialized binary data having no encoding on 
+      # deserialization
+      set_encoding(command)
+
       data = YAML::dump(command)
       data += SEPARATOR
     end
@@ -51,7 +58,12 @@ module RightScale
     # === Raise
     # (RightScale::Exceptions::IO): If serialized data is incorrect
     def self.load(data)
+      # Data coming from eventmachine is cleaned of it's encoding, so set it
+      # to UTF-8 manually before deserializing or you'll throw transcode errors.
+      set_encoding(data)
+
       command = YAML::load(data)
+
       raise RightScale::Exceptions::IO, "Invalid serialized command:\n#{data}" unless command
       command
     rescue RightScale::Exceptions::IO
@@ -59,5 +71,28 @@ module RightScale
     rescue Exception => e
       raise RightScale::Exceptions::IO, "Invalid serialized command: #{e.message}\n#{data}"
     end
+
+    private
+    # Force set encodings on ruby strings.
+    #
+    # === Parameters
+    # obj(Object):: String, or Hash/Array of Strings
+    #
+    # === Return
+    # (nil):: Returns nothing, edits object in place 
+    def self.set_encoding(obj, encoding = "UTF-8")
+      if obj.is_a?(Hash)
+        obj.each do |k,v|
+          set_encoding(v, encoding)
+        end
+      elsif obj.is_a?(Array)
+        obj.each do |v|
+          set_encoding(v, encoding)
+        end
+      elsif obj.is_a?(String) && !obj.frozen?
+        obj.force_encoding(encoding) if obj.respond_to?(:force_encoding)
+      end
+    end
+
   end
 end

data/lib/right_agent/serialize/serializer.rb

@@ -27,6 +27,7 @@ require 'json'
 
 require File.normalize_path(File.join(File.dirname(__FILE__), 'message_pack'))
 
+
 # Monkey patch common classes to support MessagePack serialization
 # As with JSON, unserializing them is manual using existing methods such as parse
 class Date

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.1.4'
-  spec.date      = '2014-04-10'
+  spec.version   = '2.1.5'
+  spec.date      = '2014-04-15'
   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

@@ -253,6 +253,17 @@ describe RightScale::NonBlockingClient do
         @request_options[:path].should == "/api/foo/bar"
       end
 
+      it "converts connection errors to 500 by default" do
+        @headers.http_status = 500
+        @response.should_receive(:errback).and_yield.once
+        @response.should_receive(:error).and_return(nil)
+        @fiber.should_receive(:resume).with(500, "HTTP connection failure for GET").once
+        flexmock(Fiber).should_receive(:yield).and_return([500, "HTTP connection failure for GET"]).once
+        flexmock(EM::HttpRequest).should_receive(:new).with(@host, @connect_options).and_return(@request).once
+        lambda { @client.request(:get, @path, @host, @connect_options, @request_options) }.
+            should raise_error(RightScale::HttpExceptions::InternalServerError)
+      end
+
       it "converts Errno::ETIMEDOUT error to 504" do
         @headers.http_status = 504
         @response.should_receive(:errback).and_yield.once

data/spec/command/command_io_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #
 # Copyright (c) 2009-2011 RightScale Inc
 #
@@ -66,6 +67,19 @@ describe RightScale::CommandIO do
     @input.should == 'input'
   end
 
+  it 'should receive a command with UTF-8 characters' do
+    @input = ''
+    EM.run do
+      RightScale::CommandIO.instance.listen(@socket_port) { |input, _| @input = input; stop }
+      send_input({:command => "say_hello", :data => 'Привет world'})
+      EM.add_timer(2) { stop }
+    end
+
+    @input.should == {:command => "say_hello", :data => 'Привет world'}
+    @input[:command].encoding.to_s.should == "UTF-8" if "".respond_to?(:encoding)
+    @input[:data].encoding.to_s.should == "UTF-8" if "".respond_to?(:encoding)
+  end
+
   it 'should receive many commands' do
     @inputs = []
     EM.run do

data/spec/command/command_serializer_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #
 # Copyright (c) 2009-2011 RightScale Inc
 #
@@ -25,7 +26,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe RightScale::CommandSerializer do
 
   before(:all) do
-    @sample_data = [ 42, 'fourty two', { :haha => 42, 'hoho' => 'fourty_two' }]
+    @sample_data = [ 42, 'fourty two', { :hello => 'Привет', :haha => 42, 'hoho' => 'fourty_two' }]
   end
 
   it 'should serialize' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-15 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: 3250741982797767948
+      hash: -210695347725236548
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.26