right_agent 0.17.0 → 0.17.2

data/lib/right_agent/history.rb

@@ -31,8 +31,9 @@ module RightScale
     #
     # === Parameters
     # identity(String):: Serialized agent identity
-    def initialize(identity)
-      @pid = Process.pid
+    # pid(Integer):: Process ID of agent, defaults to ID if current process
+    def initialize(identity, pid = nil)
+      @pid = pid || Process.pid
       @history = File.join(AgentConfig.pid_dir, identity + ".history")
     end
 

data/lib/right_agent/operation_result.rb

@@ -99,29 +99,36 @@ module RightScale
       e
     end
 
-    # Instantiate from request results
-    # Ignore all but first result if results is a hash
+    # Instantiate from request result
+    # Ignore all but first result if result is a hash
     #
     # === Parameters
-    # results(Result|Hash|OperationResult|nil):: Result or the Result "results" field
+    # result(Result|Hash|OperationResult|nil):: Result or the Result "results" field
     #
     # === Return
     # (RightScale::OperationResult):: Converted operation result
-    def self.from_results(results)
-      r = results.kind_of?(Result) ? results.results : results
+    def self.from_results(result)
+      r = result.is_a?(Result) ? result.results : result
       if r && r.respond_to?(:status_code) && r.respond_to?(:content)
         new(r.status_code, r.content)
-      elsif r && r.kind_of?(Hash) && r.values.size > 0
+      elsif r && r.is_a?(Hash) && r.values.size > 0
         r = r.values[0]
         if r.respond_to?(:status_code) && r.respond_to?(:content)
           new(r.status_code, r.content)
         else
           error("Invalid operation result content: #{r.inspect}")
         end
+      elsif r && r.is_a?(String)
+        # This is not a supported return value but older RightLink versions can incorrectly
+        # return a String rather than an OperationResult#error in situations where the actor
+        # raises an exception when processing a request
+        error(r)
       elsif r.nil?
         error("No results")
+      elsif result.is_a?(Result)
+        error("Invalid results in Result from #{result.from}: #{result.results.inspect}")
       else
-        error("Invalid operation result type: #{results.inspect}")
+        error("Invalid operation result type: #{result.inspect}")
       end
     end
     

data/lib/right_agent/sender.rb

@@ -919,7 +919,7 @@ module RightScale
 
         if handler = @pending_requests[token]
           if result && result.non_delivery? && handler.kind == :send_retryable_request
-            if [OperationResult::TARGET_NOT_CONNECTED, OperationResult::TTL_EXPIRATION].include?(result.content)
+            if result.content == OperationResult::TARGET_NOT_CONNECTED
               # Log and temporarily ignore so that timeout retry mechanism continues, but save reason for use below if timeout
               # Leave purging of associated request until final response, i.e., success response or retry timeout
               if parent = handler.retry_parent

data/lib/right_agent/serialize/serializable.rb

@@ -26,7 +26,18 @@ module RightScale
   # MessagePack and JSON serializable types that are sent to and from agents
   module Serializable
 
+    @check_active_support = true
+
     def self.included(base)
+      if @check_active_support
+        if require_succeeds?("active_support") && (v = Gem.loaded_specs['activesupport'].version.to_s) != "2.3.5"
+          raise Exception.new("Some versions of the activesupport gem modify json in ways that are incompatible with this " +
+                              "RightScale::Serializable module. Version #{v} used here is not allowed, use 2.3.5 instead.")
+        else
+          @check_active_support = false
+        end
+      end
+
       base.extend ClassMethods
       base.send(:include, InstanceMethods)
     end

data/right_agent.gemspec

@@ -24,8 +24,8 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '0.17.0'
-  spec.date      = '2013-08-04'
+  spec.version   = '0.17.2'
+  spec.date      = '2013-10-28'
   spec.authors   = ['Lee Kirchhoff', 'Raphael Simon', 'Tony Spataro']
   spec.email     = 'lee@rightscale.com'
   spec.homepage  = 'https://github.com/rightscale/right_agent'

data/spec/operation_result_spec.rb

@@ -57,13 +57,29 @@ describe RightScale::OperationResult do
       result.content.should == "Error"
     end
 
-    it "should return error OperationResult if results is nil" do
+    it "should convert unexpected string result into an error result" do
       result = RightScale::OperationResult.from_results(nil)
       result.kind_of?(RightScale::OperationResult).should be_true
       result.status_code.should == RightScale::OperationResult::ERROR
       result.content.should == "No results"
     end
 
+    it "should return error OperationResult if results is nil" do
+      string_result = RightScale::Result.new("token", "to", "Unexpected exception", "from")
+      result = RightScale::OperationResult.from_results(string_result)
+      result.kind_of?(RightScale::OperationResult).should be_true
+      result.status_code.should == RightScale::OperationResult::ERROR
+      result.content.should == "Unexpected exception"
+    end
+
+    it "should return error OperationResult including Result results if the results value is not recognized" do
+      array_result = RightScale::Result.new("token", "to", ["some data"], "from")
+      result = RightScale::OperationResult.from_results(array_result)
+      result.kind_of?(RightScale::OperationResult).should be_true
+      result.status_code.should == RightScale::OperationResult::ERROR
+      result.content.should == 'Invalid results in Result from from: ["some data"]'
+    end
+
     it "should return error OperationResult if the results value is not recognized" do
       result = RightScale::OperationResult.from_results(0)
       result.kind_of?(RightScale::OperationResult).should be_true

data/spec/sender_spec.rb

@@ -815,7 +815,7 @@ describe RightScale::Sender do
           end
           @instance.pending_requests.empty?.should be_false
           token = @instance.pending_requests.keys.last
-          non_delivery = RightScale::OperationResult.non_delivery(RightScale::OperationResult::TTL_EXPIRATION)
+          non_delivery = RightScale::OperationResult.non_delivery(RightScale::OperationResult::TARGET_NOT_CONNECTED)
           @instance.handle_response(RightScale::Result.new(token, 'iZac', non_delivery, "from"))
           EM.add_timer(1) do
             EM.stop
@@ -990,15 +990,12 @@ describe RightScale::Sender do
       @instance.handle_response(response)
     end
 
-    it "should not deliver TARGET_NOT_CONNECTED and TTL_EXPIRATION responses for send_retryable_request" do
+    it "should not deliver TARGET_NOT_CONNECTED response for send_retryable_request" do
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|_|}
       flexmock(@instance).should_receive(:deliver).never
       non_delivery = RightScale::OperationResult.non_delivery(RightScale::OperationResult::TARGET_NOT_CONNECTED)
       response = RightScale::Result.new('token1', 'to', non_delivery, 'target1')
       @instance.handle_response(response)
-      non_delivery = RightScale::OperationResult.non_delivery(RightScale::OperationResult::TTL_EXPIRATION)
-      response = RightScale::Result.new('token1', 'to', non_delivery, 'target1')
-      @instance.handle_response(response)
     end
 
     it "should record non-delivery regardless of whether there is a response handler" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
-  requirement: &2168887200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -26,10 +26,18 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168887200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: right_amqp
-  requirement: &2168885180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,10 +45,15 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *2168885180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2168883820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -51,10 +64,18 @@ dependencies:
         version: 1.7.6
   type: :runtime
   prerelease: false
-  version_requirements: *2168883820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2168882040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +86,18 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168882040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &2168880380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +108,18 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *2168880380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2168878400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,7 +127,12 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168878400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: ! 'RightAgent provides a foundation for running an agent on a server
   to interface
 
@@ -289,10 +331,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4577991098158607352
+      hash: 435154341923902142
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.26
 signing_key: 
 specification_version: 3
 summary: Agent for interfacing server with RightScale system