right_agent 0.10.13 → 0.13.5

data/spec/platform/windows_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe RightScale::Platform do
+  subject { RightScale::Platform }
+
+  context 'under Windows' do
+    context :installer do
+      context :install do
+        specify { lambda { subject.installer.install([]) }.should raise_exception }
+      end
+    end
+  end
+end if RightScale::Platform.windows?

data/spec/sender_spec.rb

@@ -381,7 +381,6 @@ describe RightScale::Sender do
       @timer = flexmock("timer")
       flexmock(EM::Timer).should_receive(:new).and_return(@timer).by_default
       flexmock(EM).should_receive(:next_tick).and_yield.by_default
-      flexmock(EM).should_receive(:defer).and_yield.by_default
       @broker_id = "broker"
       @broker_ids = [@broker_id]
       @broker = flexmock("Broker", :subscribe => true, :publish => @broker_ids, :connected? => true,
@@ -415,7 +414,7 @@ describe RightScale::Sender do
     it "should create a Request object" do
       @broker.should_receive(:publish).with(hsh(:name => "request"), on do |request|
         request.class.should == RightScale::Request
-      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
+      end, hsh(:persistent => false, :mandatory => true)).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
     end
 
@@ -433,7 +432,7 @@ describe RightScale::Sender do
         request.from.should == 'agent'
         request.target.should be_nil
         request.expires_at.should == 1000100
-      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
+      end, hsh(:persistent => false, :mandatory => true)).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
     end
 
@@ -445,14 +444,14 @@ describe RightScale::Sender do
       flexmock(Time).should_receive(:now).and_return(Time.at(1000000))
       @broker.should_receive(:publish).with(hsh(:name => "request"), on do |request|
         request.expires_at.should == 0
-      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
+      end, hsh(:persistent => false, :mandatory => true)).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
     end
 
     it "should set the correct target if specified" do
       @broker.should_receive(:publish).with(hsh(:name => "request"), on do |request|
         request.target.should == 'my-target'
-      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
+      end, hsh(:persistent => false, :mandatory => true)).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac', 'my-target') {|response|}
     end
 
@@ -461,7 +460,7 @@ describe RightScale::Sender do
         request.tags.should == ['tag']
         request.selector.should == :any
         request.scope.should == {:account => 123}
-      end, hsh(:persistent => false, :mandatory => true)).and_return(["rs-broker-host-123"]).once
+      end, hsh(:persistent => false, :mandatory => true)).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac', :tags => ['tag'], :scope => {:account => 123})
     end
 
@@ -512,7 +511,7 @@ describe RightScale::Sender do
         @agent.should_receive(:options).and_return({:retry_timeout => nil})
         RightScale::Sender.new(@agent)
         @instance = RightScale::Sender.instance
-        @broker.should_receive(:publish).and_return(["rs-broker-host-123"]).once
+        @broker.should_receive(:publish).once
         @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
       end
 
@@ -521,7 +520,7 @@ describe RightScale::Sender do
         @agent.should_receive(:options).and_return({:retry_interval => nil})
         RightScale::Sender.new(@agent)
         @instance = RightScale::Sender.instance
-        @broker.should_receive(:publish).and_return(["rs-broker-host-123"]).once
+        @broker.should_receive(:publish).once
         @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
       end
 
@@ -534,20 +533,6 @@ describe RightScale::Sender do
         @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response|}
       end
 
-      it "should respond with non-delivery if publish failed" do
-        flexmock(EM).should_receive(:add_timer).never
-        @agent.should_receive(:options).and_return({:retry_timeout => 60, :retry_interval => 60})
-        RightScale::Sender.new(@agent)
-        @instance = RightScale::Sender.instance
-        @log.should_receive(:error).with(/Failed to publish request/, RightAMQP::HABrokerClient::NoConnectedBrokers).once
-        @broker.should_receive(:publish).and_raise(RightAMQP::HABrokerClient::NoConnectedBrokers).once
-        @instance.send_retryable_request('/welcome/aboard', 'iZac') do |response|
-          result = RightScale::OperationResult.from_results(response)
-          result.non_delivery?.should be_true
-          result.content.should == "request send failed"
-        end
-      end
-
       it "should setup for retry if retry_timeout and retry_interval not nil and publish successful" do
         flexmock(EM).should_receive(:add_timer).with(60, any).once
         @agent.should_receive(:options).and_return({:retry_timeout => 60, :retry_interval => 60})
@@ -574,9 +559,12 @@ describe RightScale::Sender do
           @instance.send_retryable_request('/welcome/aboard', 'iZac') do |response|
             result = RightScale::OperationResult.from_results(response)
           end
+          header = flexmock("amqp header")
+          header.should_receive(:ack).once
           EM.add_timer(0.15) do
             @instance.pending_requests.empty?.should be_false
-            @instance.handle_response(RightScale::Result.new(token, nil, {'from' => RightScale::OperationResult.success}, nil))
+            result = RightScale::Result.new(token, nil, {'from' => RightScale::OperationResult.success}, nil)
+            @instance.handle_response(result, header)
           end
           EM.add_timer(0.3) do
             EM.stop
@@ -751,55 +739,85 @@ describe RightScale::Sender do
       RightScale::Sender.new(@agent)
       @instance = RightScale::Sender.instance
       flexmock(RightScale::AgentIdentity, :generate => 'token1')
+      @header = flexmock("amqp header")
     end
 
     it "should deliver the response for a Request" do
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|_|}
       response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
-      flexmock(@instance).should_receive(:deliver).with(response, RightScale::Sender::PendingRequest).once
-      @instance.handle_response(response)
+      flexmock(@instance).should_receive(:deliver).with(response, RightScale::Sender::PendingRequest, @header).once
+      @instance.handle_response(response, @header)
     end
 
     it "should deliver the response for a Push" do
       @instance.send_push('/welcome/aboard', 'iZac') {|_|}
       response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
-      flexmock(@instance).should_receive(:deliver).with(response, RightScale::Sender::PendingRequest).once
-      @instance.handle_response(response)
+      flexmock(@instance).should_receive(:deliver).with(response, RightScale::Sender::PendingRequest, @header).once
+      @instance.handle_response(response, @header)
     end
 
     it "should not deliver TARGET_NOT_CONNECTED and TTL_EXPIRATION responses for send_retryable_request" do
+      @header.should_receive(:ack).twice
       @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)
+      @instance.handle_response(response, @header)
       non_delivery = RightScale::OperationResult.non_delivery(RightScale::OperationResult::TTL_EXPIRATION)
       response = RightScale::Result.new('token1', 'to', non_delivery, 'target1')
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
     end
 
     it "should record non-delivery regardless of whether there is a response handler" do
+      @header.should_receive(:ack).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|_|}
       non_delivery = RightScale::OperationResult.non_delivery(RightScale::OperationResult::NO_ROUTE_TO_TARGET)
       response = RightScale::Result.new('token1', 'to', non_delivery, 'target1')
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
       @instance.instance_variable_get(:@non_delivery_stats).total.should == 1
     end
 
     it "should log non-delivery if there is no response handler" do
+      @header.should_receive(:ack).once
       @log.should_receive(:info).with(/Non-delivery of/).once
       @instance.send_push('/welcome/aboard', 'iZac')
       non_delivery = RightScale::OperationResult.non_delivery(RightScale::OperationResult::NO_ROUTE_TO_TARGET)
       response = RightScale::Result.new('token1', 'to', non_delivery, 'target1')
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
     end
 
     it "should log a debug message if request no longer pending" do
+      @header.should_receive(:ack).once
       @log.should_receive(:debug).with(/No pending request for response/).once
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|_|}
       @instance.pending_requests['token1'].should_not be_nil
       @instance.pending_requests['token2'].should be_nil
       response = RightScale::Result.new('token2', 'to', RightScale::OperationResult.success, 'target1')
+      @instance.handle_response(response, @header)
+    end
+
+    it "should ack response even if fail while handling it" do
+      @header.should_receive(:ack).once
+      @instance.send_push('/welcome/aboard', 'iZac') {|_|}
+      response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
+      flexmock(response).should_receive(:token).and_raise(Exception).once
+      flexmock(@instance).should_receive(:deliver).never
+      lambda { @instance.handle_response(response, @header) }.should raise_error(Exception)
+    end
+
+    it "should not attempt to ack response if fail while handling it and there is no header" do
+      @instance.send_push('/welcome/aboard', 'iZac') {|_|}
+      response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
+      exception = Exception.new("test")
+      flexmock(response).should_receive(:token).and_raise(exception).once
+      flexmock(@instance).should_receive(:deliver).never
+      lambda { @instance.handle_response(response, nil) }.should raise_error(Exception, "test")
+    end
+
+    it "should not attempt to ack response if there is no header" do
+      @instance.send_retryable_request('/welcome/aboard', 'iZac') {|_|}
+      response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
+      flexmock(@instance).should_receive(:deliver).with(response, RightScale::Sender::PendingRequest, nil).once
       @instance.handle_response(response)
     end
   end
@@ -814,13 +832,15 @@ describe RightScale::Sender do
       RightScale::Sender.new(@agent)
       @instance = RightScale::Sender.instance
       flexmock(RightScale::AgentIdentity, :generate => 'token1')
+      @header = flexmock("amqp header")
+      @header.should_receive(:ack).once.by_default
     end
 
     it "should delete all associated pending Request requests" do
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|_|}
       @instance.pending_requests['token1'].should_not be_nil
       response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
       @instance.pending_requests['token1'].should be_nil
     end
 
@@ -828,7 +848,7 @@ describe RightScale::Sender do
       @instance.send_push('/welcome/aboard', 'iZac') {|_|}
       @instance.pending_requests['token1'].should_not be_nil
       response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
       @instance.pending_requests['token1'].should_not be_nil
     end
 
@@ -838,7 +858,7 @@ describe RightScale::Sender do
       @instance.pending_requests['token2'] = @instance.pending_requests['token1'].dup
       @instance.pending_requests['token2'].retry_parent = 'token1'
       response = RightScale::Result.new('token2', 'to', RightScale::OperationResult.success, 'target1')
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
       @instance.pending_requests['token1'].should be_nil
       @instance.pending_requests['token2'].should be_nil
     end
@@ -847,7 +867,7 @@ describe RightScale::Sender do
       called = 0
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|response| called += 1}
       response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
       called.should == 1
     end
 
@@ -860,7 +880,7 @@ describe RightScale::Sender do
       response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
       flexmock(EM).should_receive(:defer).and_yield.once
       flexmock(EM).should_receive(:next_tick).never
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
       called.should == 1
     end
 
@@ -873,7 +893,7 @@ describe RightScale::Sender do
       response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
       flexmock(EM).should_receive(:next_tick).and_yield.once
       flexmock(EM).should_receive(:defer).never
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
       called.should == 1
     end
 
@@ -883,9 +903,32 @@ describe RightScale::Sender do
       @instance.send_retryable_request('/welcome/aboard', 'iZac') {|_| raise Exception}
       @instance.pending_requests['token1'].should_not be_nil
       response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
-      @instance.handle_response(response)
+      @instance.handle_response(response, @header)
       @instance.pending_requests['token1'].should be_nil
     end
+
+    it "should ack response even if fail while delivering it" do
+      flexmock(EM).should_receive(:defer).and_raise(Exception).once
+      @instance.send_push('/welcome/aboard', 'iZac') {|_|}
+      response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
+      lambda { @instance.handle_response(response, @header) }.should raise_error(Exception)
+    end
+
+    it "should not attempt to ack response if fail while delivering it and there is no header" do
+      @header.should_receive(:ack).never
+      exception = Exception.new("test")
+      flexmock(EM).should_receive(:defer).and_raise(exception).once
+      @instance.send_push('/welcome/aboard', 'iZac') {|_|}
+      response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
+      lambda { @instance.handle_response(response, nil) }.should raise_error(Exception, "test")
+    end
+
+    it "should not attempt to ack response if there is no header" do
+      @header.should_receive(:ack).never
+      @instance.send_retryable_request('/welcome/aboard', 'iZac') {|_|}
+      response = RightScale::Result.new('token1', 'to', RightScale::OperationResult.success, 'target1')
+      @instance.handle_response(response)
+    end
   end
 
   describe "when use offline queueing" do

metadata

@@ -2,7 +2,7 @@
 name: right_agent
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.13
+  version: 0.13.5
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-07 00:00:00 Z
+date: 2012-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: right_support
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.3"
+        version: 2.4.1
     - - <
       - !ruby/object:Gem::Version 
         version: "3.0"
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.3"
+        version: "0.4"
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -153,9 +153,11 @@ files:
 - lib/right_agent/core_payload_types/secure_document_location.rb
 - lib/right_agent/core_payload_types/software_repository_instantiation.rb
 - lib/right_agent/daemonize.rb
+- lib/right_agent/dispatched_cache.rb
 - lib/right_agent/dispatcher.rb
 - lib/right_agent/enrollment_result.rb
 - lib/right_agent/exceptions.rb
+- lib/right_agent/history.rb
 - lib/right_agent/idempotent_request.rb
 - lib/right_agent/log.rb
 - lib/right_agent/minimal.rb
@@ -166,7 +168,6 @@ files:
 - lib/right_agent/monkey_patches/ruby_patch/linux_patch.rb
 - lib/right_agent/monkey_patches/ruby_patch/linux_patch/file_patch.rb
 - lib/right_agent/monkey_patches/ruby_patch/object_patch.rb
-- lib/right_agent/monkey_patches/ruby_patch/singleton_patch.rb
 - lib/right_agent/monkey_patches/ruby_patch/windows_patch.rb
 - lib/right_agent/monkey_patches/ruby_patch/windows_patch/file_patch.rb
 - lib/right_agent/monkey_patches/ruby_patch/windows_patch/process_patch.rb
@@ -224,19 +225,21 @@ files:
 - spec/core_payload_types/login_user_spec.rb
 - spec/core_payload_types/right_script_attachment_spec.rb
 - spec/core_payload_types/spec_helper.rb
+- spec/dispatched_cache_spec.rb
 - spec/dispatcher_spec.rb
 - spec/enrollment_result_spec.rb
+- spec/history_spec.rb
 - spec/idempotent_request_spec.rb
 - spec/log_spec.rb
 - spec/monkey_patches/eventmachine_spec.rb
 - spec/multiplexer_spec.rb
 - spec/operation_result_spec.rb
 - spec/packets_spec.rb
-- spec/platform/darwin.rb
-- spec/platform/linux.rb
+- spec/platform/darwin_spec.rb
+- spec/platform/linux_spec.rb
 - spec/platform/linux_volume_manager_spec.rb
 - spec/platform/platform_spec.rb
-- spec/platform/windows.rb
+- spec/platform/windows_spec.rb
 - spec/platform/windows_volume_manager_spec.rb
 - spec/results_mock.rb
 - spec/secure_identity_spec.rb
@@ -279,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2192797536970431426
+      hash: -1208467833270175194
       segments: 
       - 0
       version: "0"

data/lib/right_agent/monkey_patches/ruby_patch/singleton_patch.rb

@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2011 RightScale Inc
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require 'singleton'
-
-module RightScale
-
-  module Singleton
-
-    module ClassMethods
-
-      # Redirect missing class methods to singleton instance.
-      def method_missing(meth, *args, &blk)
-        self.instance.__send__(meth, *args, &blk)
-      end
-    end
-
-    # Upon inclusion, also include standard Singleton mixin
-    def self.included(base)
-      base.__send__(:include, ::Singleton)
-      base.__send__(:extend, ClassMethods)
-    end
-
-  end
-
-end

data/spec/platform/darwin.rb

@@ -1,11 +0,0 @@
-module RightScale
-  describe Platform do
-    subject { RightScale::Platform }
-    
-    context :installer do
-      context :install do
-        specify { lambda { subject.installer.install([]) }.should raise_exception }
-      end
-    end
-  end
-end

data/spec/platform/linux.rb

@@ -1,23 +0,0 @@
-module RightScale
-  describe Platform do
-    
-    context :installer do
-      context :install do
-        it 'should succeed if no packages are specified' do
-          packages = []
-          RightScale::Platform.installer.install(packages).should == true
-        end
-        
-        it 'should succeed if all packages install successfully' do
-          packages = ['syslog-ng']
-          RightScale::Platform.installer.install(packages).should == true
-        end
-        
-        it 'should fail if one more packages are not found' do
-          packages = ['jdk-6u26-linux-x64']
-          lambda { RightScale::Platform.installer.install(packages) }.should raise_error
-        end
-      end
-    end
-  end
-end