right_agent 0.6.6 → 0.9.3

data/spec/platform/platform_spec.rb

@@ -21,40 +21,43 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
-
-
-describe RightScale::Platform do
-  before(:all) do
-    @platform = RightScale::Platform
-  end
-
-  context :shell do
-    context :uptime do
-      it 'should be positive' do
-        @platform.shell.uptime.should > 0
-      end
-
-      it 'should be strictly increasing' do
-        u0 = @platform.shell.uptime
-        sleep(1)
-        u1 = @platform.shell.uptime
-        
-        (u1 - u0).should >= 0
+require File.expand_path(File.join(File.dirname(__FILE__), 'darwin')) if RightScale::Platform.darwin?
+require File.expand_path(File.join(File.dirname(__FILE__), 'windows')) if RightScale::Platform.windows?
+require File.expand_path(File.join(File.dirname(__FILE__), 'linux')) if RightScale::Platform.linux?
+
+module RightScale
+  describe Platform do
+    subject { RightScale::Platform }
+    
+    context :shell do
+      context :uptime do
+        it 'should be positive' do
+          subject.shell.uptime.should > 0
+        end
+  
+        it 'should be strictly increasing' do
+          u0 = subject.shell.uptime
+          sleep(1)
+          u1 = subject.shell.uptime
+          
+          (u1 - u0).should >= 0
+        end
       end
-    end
-
-    context :booted_at do
-      it 'should be some time in the past' do
-        Time.at(@platform.shell.booted_at).to_i.should < Time.now.to_i
-      end
-
-      it 'should be constant' do
-        b0 = @platform.shell.booted_at
-        sleep(1)
-        b1 = @platform.shell.booted_at
-
-        b0.should == b1
+  
+      context :booted_at do
+        it 'should be some time in the past' do
+          Time.at(subject.shell.booted_at).to_i.should < Time.now.to_i
+        end
+  
+        it 'should be constant' do
+          b0 = subject.shell.booted_at
+          sleep(1)
+          b1 = subject.shell.booted_at
+  
+          b0.should == b1
+        end
       end
     end
+    
   end
 end

data/spec/platform/windows.rb

@@ -0,0 +1,11 @@
+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/sender_spec.rb

@@ -62,7 +62,7 @@ describe RightScale::Sender do
       @now = Time.at(1000000)
       flexmock(Time).should_receive(:now).and_return(@now).by_default
       @broker = flexmock("Broker", :subscribe => true, :publish => ["broker"], :connected? => true,
-                         :identity_parts => ["host", 123, 0, 0, nil]).by_default
+                         :identity_parts => ["host", 123, 0, 0]).by_default
       @agent = flexmock("Agent", :identity => "agent", :broker => @broker, :options => {:ping_interval => 0}).by_default
     end
 
@@ -153,14 +153,16 @@ describe RightScale::Sender do
     end
 
     it "should attempt to reconnect if mapper ping times out" do
-      @log.should_receive(:warning).with(/Mapper ping via broker/).once
+      @log.should_receive(:error).with(/Mapper ping via broker/).once
       @agent.should_receive(:options).and_return(:ping_interval => 1000)
       broker_id = "rs-broker-localhost-5672"
-      @broker.should_receive(:identity_parts).with(broker_id).and_return(["localhost", 5672, 0, 0, nil]).once
+      @broker.should_receive(:identity_parts).with(broker_id).and_return(["localhost", 5672, 0, 0]).once
       @agent.should_receive(:connect).with("localhost", 5672, 0, 0, true).once
       old_ping_timeout = RightScale::Sender::ConnectivityChecker::PING_TIMEOUT
+      old_max_ping_timeouts = RightScale::Sender::ConnectivityChecker::MAX_PING_TIMEOUTS
       begin
         RightScale::Sender::ConnectivityChecker.const_set(:PING_TIMEOUT, 0.5)
+        RightScale::Sender::ConnectivityChecker.const_set(:MAX_PING_TIMEOUTS, 1)
         EM.run do
           EM.add_timer(1) { EM.stop }
           RightScale::Sender.new(@agent)
@@ -170,6 +172,7 @@ describe RightScale::Sender do
         end
       ensure
         RightScale::Sender::ConnectivityChecker.const_set(:PING_TIMEOUT, old_ping_timeout)
+        RightScale::Sender::ConnectivityChecker.const_set(:MAX_PING_TIMEOUTS, old_max_ping_timeouts)
       end
     end
   end
@@ -365,7 +368,7 @@ describe RightScale::Sender do
       @broker_id = "broker"
       @broker_ids = [@broker_id]
       @broker = flexmock("Broker", :subscribe => true, :publish => @broker_ids, :connected? => true,
-                         :identity_parts => ["host", 123, 0, 0, nil]).by_default
+                         :all => @broker_ids, :identity_parts => ["host", 123, 0, 0]).by_default
       @agent = flexmock("Agent", :identity => "agent", :broker => @broker).by_default
       @agent.should_receive(:options).and_return({:ping_interval => 0, :time_to_live => 100}).by_default
       RightScale::Sender.new(@agent)
@@ -488,18 +491,6 @@ describe RightScale::Sender do
     end
 
     describe "with retry" do
-      it "should convert value to nil if 0" do
-        @instance.__send__(:nil_if_zero, 0).should == nil
-      end
-
-      it "should not convert value to nil if not 0" do
-        @instance.__send__(:nil_if_zero, 1).should == 1
-      end
-
-      it "should leave value as nil if nil" do
-        @instance.__send__(:nil_if_zero, nil).should == nil
-      end
-
       it "should not setup for retry if retry_timeout nil" do
         flexmock(EM).should_receive(:add_timer).never
         @agent.should_receive(:options).and_return({:retry_timeout => nil})
@@ -638,19 +629,24 @@ describe RightScale::Sender do
           @instance.connectivity_checker.ping_timer.should == nil
         end
 
-        it "should try to reconnect if ping times out" do
-          @log.should_receive(:warning).once
-          flexmock(EM::Timer).should_receive(:new).and_yield.once
+        it "should try to reconnect if ping times out repeatedly" do
+          @log.should_receive(:warning).with(/timed out after 30 seconds/).twice
+          @log.should_receive(:error).with(/reached maximum of 3 timeouts/).once
+          flexmock(EM::Timer).should_receive(:new).and_yield.times(3)
           flexmock(@agent).should_receive(:connect).once
           @instance.connectivity_checker.check(@broker_id)
+          @instance.connectivity_checker.check(@broker_id)
+          @instance.connectivity_checker.check(@broker_id)
           @instance.connectivity_checker.ping_timer.should == nil
         end
 
         it "should log error if attempt to reconnect fails" do
-          @log.should_receive(:warning).once
+          @log.should_receive(:warning).with(/timed out after 30 seconds/).twice
           @log.should_receive(:error).with(/Failed to reconnect/, Exception, :trace).once
           flexmock(@agent).should_receive(:connect).and_raise(Exception)
-          flexmock(EM::Timer).should_receive(:new).and_yield.once
+          flexmock(EM::Timer).should_receive(:new).and_yield.times(3)
+          @instance.connectivity_checker.check(@broker_id)
+          @instance.connectivity_checker.check(@broker_id)
           @instance.connectivity_checker.check(@broker_id)
         end
       end
@@ -665,7 +661,7 @@ describe RightScale::Sender do
       @broker_id = "broker"
       @broker_ids = [@broker_id]
       @broker = flexmock("Broker", :subscribe => true, :publish => @broker_ids, :connected? => true,
-                         :identity_parts => ["host", 123, 0, 0, nil]).by_default
+                         :identity_parts => ["host", 123, 0, 0]).by_default
       @agent = flexmock("Agent", :identity => "agent", :broker => @broker,
                         :options => {:ping_interval => 0, :time_to_live => 100}).by_default
       RightScale::Sender.new(@agent)
@@ -720,7 +716,7 @@ describe RightScale::Sender do
       flexmock(EM).should_receive(:next_tick).and_yield.by_default
       flexmock(EM).should_receive(:defer).and_yield.by_default
       @broker = flexmock("Broker", :subscribe => true, :publish => ["broker"], :connected? => true,
-                         :identity_parts => ["host", 123, 0, 0, nil]).by_default
+                         :identity_parts => ["host", 123, 0, 0]).by_default
       @agent = flexmock("Agent", :identity => "agent", :broker => @broker, :options => {:ping_interval => 0}).by_default
       RightScale::Sender.new(@agent)
       @instance = RightScale::Sender.instance
@@ -783,7 +779,7 @@ describe RightScale::Sender do
       flexmock(EM).should_receive(:next_tick).and_yield.by_default
       flexmock(EM).should_receive(:defer).and_yield.by_default
       @broker = flexmock("Broker", :subscribe => true, :publish => ["broker"], :connected? => true,
-                         :identity_parts => ["host", 123, 0, 0, nil]).by_default
+                         :identity_parts => ["host", 123, 0, 0]).by_default
       @agent = flexmock("Agent", :identity => "agent", :broker => @broker, :options => {:ping_interval => 0}).by_default
       RightScale::Sender.new(@agent)
       @instance = RightScale::Sender.instance
@@ -865,7 +861,7 @@ describe RightScale::Sender do
   describe "when use offline queueing" do
     before(:each) do
       @broker = flexmock("Broker", :subscribe => true, :publish => ["broker"], :connected? => true,
-                         :identity_parts => ["host", 123, 0, 0, nil]).by_default
+                         :identity_parts => ["host", 123, 0, 0]).by_default
       @agent = flexmock("Agent", :identity => "agent", :broker => @broker, :options => {:offline_queueing => true}).by_default
       RightScale::Sender.new(@agent)
       @instance = RightScale::Sender.instance

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_agent
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 61
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 6
-  version: 0.6.6
+  - 9
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Lee Kirchhoff
@@ -17,44 +17,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -08:00
+date: 2012-03-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: right_support
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 9
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 3
+        version: "1.3"
   requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: amqp
+  name: right_support
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 9
         segments: 
         - 0
-        - 6
-        - 7
-        version: 0.6.7
+        - 1
+        version: "0.1"
   requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: json
+  name: right_amqp
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +62,10 @@ dependencies:
         - 4
         version: "1.4"
   requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: eventmachine
+  name: json
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,10 +78,10 @@ dependencies:
         - 10
         version: 0.12.10
   requirement: *id004
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: right_popen
+  name: eventmachine
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,10 +94,10 @@ dependencies:
         - 11
         version: 1.0.11
   requirement: *id005
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: msgpack
+  name: right_popen
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -114,6 +110,24 @@ dependencies:
         - 4
         version: 0.4.4
   requirement: *id006
+  name: msgpack
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  requirement: *id007
+  name: net-ssh
+  prerelease: false
+  type: :runtime
 description: |
   RightAgent provides a foundation for running an agent on a server to interface
   in a secure fashion with other agents in the RightScale system. A RightAgent
@@ -143,7 +157,6 @@ files:
 - lib/right_agent/agent_identity.rb
 - lib/right_agent/agent_tags_manager.rb
 - lib/right_agent/audit_formatter.rb
-- lib/right_agent/broker_client.rb
 - lib/right_agent/command.rb
 - lib/right_agent/command/agent_manager_commands.rb
 - lib/right_agent/command/command_client.rb
@@ -176,12 +189,10 @@ files:
 - lib/right_agent/dispatcher.rb
 - lib/right_agent/enrollment_result.rb
 - lib/right_agent/exceptions.rb
-- lib/right_agent/ha_broker_client.rb
 - lib/right_agent/idempotent_request.rb
 - lib/right_agent/log.rb
 - lib/right_agent/minimal.rb
 - lib/right_agent/monkey_patches.rb
-- lib/right_agent/monkey_patches/amqp_patch.rb
 - lib/right_agent/monkey_patches/ruby_patch.rb
 - lib/right_agent/monkey_patches/ruby_patch/array_patch.rb
 - lib/right_agent/monkey_patches/ruby_patch/darwin_patch.rb
@@ -189,7 +200,6 @@ files:
 - 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/string_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
@@ -228,7 +238,6 @@ files:
 - lib/right_agent/serialize/secure_serializer_initializer.rb
 - lib/right_agent/serialize/serializable.rb
 - lib/right_agent/serialize/serializer.rb
-- lib/right_agent/stats_helper.rb
 - lib/right_agent/subprocess.rb
 - lib/right_agent/tracer.rb
 - right_agent.gemspec
@@ -237,7 +246,6 @@ files:
 - spec/agent_config_spec.rb
 - spec/agent_identity_spec.rb
 - spec/agent_spec.rb
-- spec/broker_client_spec.rb
 - spec/command/agent_manager_commands_spec.rb
 - spec/command/command_io_spec.rb
 - spec/command/command_parser_spec.rb
@@ -251,17 +259,17 @@ files:
 - spec/core_payload_types/spec_helper.rb
 - spec/dispatcher_spec.rb
 - spec/enrollment_result_spec.rb
-- spec/ha_broker_client_spec.rb
 - spec/idempotent_request_spec.rb
 - spec/log_spec.rb
-- spec/monkey_patches/amqp_patch_spec.rb
 - spec/monkey_patches/eventmachine_spec.rb
-- spec/monkey_patches/string_patch_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/linux_volume_manager_spec.rb
 - spec/platform/platform_spec.rb
+- spec/platform/windows.rb
 - spec/results_mock.rb
 - spec/secure_identity_spec.rb
 - spec/security/cached_certificate_store_proxy_spec.rb
@@ -279,7 +287,6 @@ files:
 - spec/serialize/serializer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/stats_helper_spec.rb
 - spec/tracer_spec.rb
 has_rdoc: true
 homepage: https://github.com/rightscale/right_agent