right_agent 2.4.3 → 2.4.4

data/README.rdoc

@@ -1,3 +1,5 @@
+"master" branch: {<img src="https://travis-ci.org/rightscale/right_agent.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/rightscale/right_agent]
+
 = RightAgent
 
 = DESCRIPTION
@@ -22,7 +24,7 @@ documentation.
 Also use the built-in issues tracker (https://github.com/rightscale/right_agent/issues)
 to report issues.
 
-Maintained by the RightScale Teal Team
+Maintained by the RightScale Cornsilk Team
 
 == Interface
 

data/Rakefile

@@ -23,16 +23,48 @@
 
 require 'rubygems'
 require 'bundler/setup'
-require 'fileutils'
+
 require 'rake'
-require 'rspec/core/rake_task'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/clean'
+require 'rspec/core/rake_task'
+require 'fileutils'
 
-task :default => 'spec'
+# These dependencies can be omitted using "bundle install --without"; tolerate their absence.
+['rdoc/task'].each do |optional|
+  begin
+    require optional
+  rescue LoadError
+    # ignore
+  end
+end
+
+spec_opts_file = "\"#{File.dirname(__FILE__)}/spec/spec.opts\""
+spec_opts_file = "\"#{File.dirname(__FILE__)}/spec/spec.win32.opts\"" if RUBY_PLATFORM =~ /mingw|mswin32/
+RSPEC_OPTS = ['--options', spec_opts_file]
+
+desc "Run unit tests"
+task :default => :spec
+
+desc 'Run unit tests'
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = RSPEC_OPTS
+  t.pattern = Dir['**/*_spec.rb']
+end
+
+if defined?(Rake::RDocTask)
+  desc 'Generate documentation for the right_agent gem.'
+  Rake::RDocTask.new(:rdoc) do |rdoc|
+    rdoc.rdoc_dir = 'doc'
+    rdoc.title    = 'RightAgent'
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README.rdoc')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+    rdoc.rdoc_files.exclude('spec/**/*')
+  end
+end
+CLEAN.include('doc')
 
-# == Gem packaging == #
 module RightScale
   class MultiPlatformGemTask
     def self.gem_platform_override
@@ -50,64 +82,23 @@ module RightScale
   end
 end
 
-# multiply define gem and package task(s) using a gemspec with overridden gem
-# platform value. this works because rake accumulates task actions instead of
-# redefining them, so accumulated gem tasks will gem up all platforms. we need
+# Multiply define gem and package task(s) using a gemspec with overridden gem
+# platform value. This works because rake accumulates task actions instead of
+# redefining them, so accumulated gem tasks will gem up all platforms. We need
 # to produce multiple platform-specific .gem files because otherwise the gem
 # dependencies for non-Linux platforms (i.e. Windows) are lost from the default
 # .gem file produced on a Linux platform.
 gemtask = nil
 ::RightScale::MultiPlatformGemTask.define(%w[linux mingw], 'right_agent.gemspec') do |spec|
-  gemtask = ::Rake::GemPackageTask.new(spec) do |gpt|
-    gpt.package_dir = ENV['PACKAGE_DIR'] || 'pkg'
+  gemtask = Gem::PackageTask.new(spec) do |pkg|
+    pkg.package_dir = 'pkg'
 
     # the following are used by 'package' task (but not by 'gem' task)
-    gpt.need_zip = !`which zip`.strip.empty? # not present on Windows by default
-    gpt.need_tar = true  # some form of tar is required on Windows and Linux
+    pkg.need_zip = !`which zip`.strip.empty? # not present on Windows by default
+    pkg.need_tar = true  # some form of tar is required on Windows and Linux
   end
 end
+CLEAN.include('pkg')
 
-directory gemtask.package_dir
-
-CLEAN.include(gemtask.package_dir)
-
-# == Unit tests == #
-spec_opts_file = "\"#{File.dirname(__FILE__)}/spec/spec.opts\""
-spec_opts_file = "\"#{File.dirname(__FILE__)}/spec/spec.win32.opts\"" if RUBY_PLATFORM =~ /mingw|mswin32/
-RSPEC_OPTS = ['--options', spec_opts_file]
-
-desc 'Run unit tests'
-RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = RSPEC_OPTS
-end
-
-namespace :spec do
-  desc 'Run unit tests with RCov'
-  RSpec::Core::RakeTask.new(:rcov) do |t|
-    t.rspec_opts = RSPEC_OPTS
-    t.rcov = true
-    t.rcov_opts = %q[--exclude "spec"]
-  end
-
-  desc 'Print Specdoc for all unit tests'
-  RSpec::Core::RakeTask.new(:doc) do |t|
-    t.rspec_opts = ["--format", "documentation"]
-  end
-end
-
-# == Documentation == #
-
-desc 'Generate API documentation to doc/rdocs/index.html'
-Rake::RDocTask.new do |rd|
-  rd.rdoc_dir = 'doc/rdocs'
-  rd.main = 'README.rdoc'
-  rd.rdoc_files.include 'README.rdoc', 'lib/**/*.rb'
-end
-CLEAN.include('doc/rdocs')
-
-# == Emacs integration ==
-
-desc 'Rebuild TAGS file for emacs'
-task :tags do
-  sh 'rtags -R lib spec'
-end
+require 'right_develop'
+RightDevelop::CI::RakeTask.new

data/lib/right_agent/clients/api_client.rb

@@ -339,8 +339,8 @@ module RightScale
     end
 
     # Truncate string if it exceeds maximum length
-    # Do length check with bytesize rather than size since this code
-    # is running with ruby 1.9.2 while the API uses 1.8.7, otherwise
+    # Do length check with bytesize rather than size since this method
+    # is only intended for use with ruby 1.9 and above, otherwise
     # multi-byte characters could cause this code to be too lenient
     #
     # @param [String, NilClass] value to be truncated

data/lib/right_agent/clients/balanced_http_client.rb

@@ -445,7 +445,7 @@ module RightScale
         elsif code == 204 || body.nil? || (body.respond_to?(:empty?) && body.empty?)
           result = nil
         elsif decode
-          result = JSON.load(body)
+          result = JSON.legacy_load(body)
           result = nil if result.respond_to?(:empty?) && result.empty?
         else
           result = body

data/lib/right_agent/clients/router_client.rb

@@ -474,7 +474,16 @@ module RightScale
       @websocket = Faye::WebSocket::Client.new(url.to_s, protocols = nil, options)
 
       @websocket.onerror = lambda do |event|
-        ErrorTracker.log(self, "WebSocket error (#{event.data})") if event.data
+        error = if event.respond_to?(:data)
+          # faye-websocket 0.7.0
+          event.data
+        elsif event.respond_to?(:message)
+          # faye-websocket 0.7.4
+          event.message
+        else
+          event.to_s
+        end
+        ErrorTracker.log(self, "WebSocket error (#{error})") if error
       end
 
       @websocket.onclose = lambda do |event|
@@ -493,7 +502,7 @@ module RightScale
       @websocket.onmessage = lambda do |event|
         begin
           # Receive event
-          event = SerializationHelper.symbolize_keys(JSON.load(event.data))
+          event = SerializationHelper.symbolize_keys(JSON.parser.new(event.data, JSON.load_default_options).parse)
           Log.info("Received EVENT <#{event[:uuid]}> #{event[:type]} #{event[:path]} from #{event[:from]}")
           @stats["events"].update("#{event[:type]} #{event[:path]}")
 

data/lib/right_agent/history.rb

@@ -62,7 +62,7 @@ module RightScale
     #     where String is the event name and Object is any associated JSON-encodable data
     def load
       events = []
-      File.open(@history, "r") { |f| events = f.readlines.map { |l| JSON.load(l) } } if File.readable?(@history)
+      File.open(@history, "r") { |f| events = f.readlines.map { |l| JSON.legacy_load(l) } } if File.readable?(@history)
       events
     end
 

data/lib/right_agent/monkey_patches/ruby_patch.rb

@@ -51,5 +51,6 @@ RIGHT_AGENT_RUBY_PATCH_BASE_DIR = ::File.normalize_path('../ruby_patch', __FILE_
 
 require File.join(RIGHT_AGENT_RUBY_PATCH_BASE_DIR, 'array_patch')
 require File.join(RIGHT_AGENT_RUBY_PATCH_BASE_DIR, 'object_patch')
+require File.join(RIGHT_AGENT_RUBY_PATCH_BASE_DIR, 'json_patch')
 
 end # Unless already defined

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

@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2014 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.
+
+module JSON
+  class << self
+    def legacy_load(source)
+      if source.respond_to? :to_str
+        source = source.to_str
+      elsif source.respond_to? :to_io
+        source = source.to_io.read
+      else
+        source = source.read
+      end
+      source = source.dup.force_encoding("UTF-8") if source.respond_to?(:force_encoding)
+      if source =~ /(.*)json_class":"Nanite::(.*)/
+        source = Regexp.last_match(1) + 'json_class":"RightScale::' + Regexp.last_match(2)
+      end
+      # Workaround to make RightLink MessageEncoder work after chef update to 14.11
+      # which uses ffi-yajl which monkey patch JSON module and decoding of serialazed Ruby objects
+      # doesn't works as expected
+      JSON.parser.new(source, JSON.load_default_options).parse
+    end
+  end
+end

data/lib/right_agent/serialize/serializer.rb

@@ -29,16 +29,7 @@ require File.normalize_path(File.join(File.dirname(__FILE__), 'message_pack'))
 
 module JSONSerializer
   def self.load(source)
-
-    if source.respond_to? :to_str
-      source = source.to_str
-    elsif source.respond_to? :to_io
-      source = source.to_io.read
-    else
-      source = source.read
-    end
-    source.force_encoding("UTF-8") if source.respond_to?(:force_encoding)
-    JSON.load(source)
+    JSON.legacy_load(source)
   end
 
   def self.dump(*args)

data/right_agent.gemspec

@@ -25,8 +25,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name      = 'right_agent'
-  spec.version   = '2.4.3'
-  spec.date      = '2014-10-02'
+  spec.version   = '2.4.4'
+  spec.date      = '2014-10-23'
   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/api_client_spec.rb

@@ -406,7 +406,11 @@ describe RightScale::ApiClient do
 
     it "accounts for multi-byte characters" do
       @client.send(:truncate, "Schös Tägli wünschi", 20).should == "Schös Tägli wü..."
-      @client.send(:truncate, "Schös Tägli wünschi", 19).should == "Schös Tägli w..."
+      if RUBY_VERSION =~ /^1\.8/
+        @client.send(:truncate, "Schös Tägli wünschi", 20).should == "Schös Tägli wü..."
+      else
+        @client.send(:truncate, "Schös Tägli wünschi", 19).should == "Schös Tägli w..."
+      end
       @client.send(:truncate, "Schös Tägli wünschi", 18).should == "Schös Tägli w..."
       @client.send(:truncate, "Schös Tägli wünschi", 17).should == "Schös Tägli ..."
     end

data/spec/clients/balanced_http_client_spec.rb

@@ -158,7 +158,7 @@ describe RightScale::BalancedHttpClient do
     it "appends specified filter parameters to list when Log.level is :debug" do
       @params = {:some => "data", :secret => "data", :other => "data"}
       @log.should_receive(:level).and_return(:debug)
-      @log.should_receive(:info).with("Requesting POST <random uuid> /foo/bar {:some=>\"data\", :secret=>\"<hidden>\", :other=>\"<hidden>\"}").once
+      @log.should_receive(:info).with(on { |a| a =~ /^Requesting POST/ && a =~ /some.*data/ && a =~ /secret.*hidden/ && a =~ /other.*hidden/ }).once
       @log.should_receive(:info).with("Completed <random uuid> in 10ms | 200 [http://my.com/foo/bar] | 11 bytes | {\"out\"=>123}").once
       @client.request(:post, @path, @params, :filter_params => [:other])
     end
@@ -533,20 +533,23 @@ describe RightScale::BalancedHttpClient do
       it "generates text containing containing host, path, and filtered parameters" do
         @log.should_receive(:level).and_return(:debug)
         text = @client.send(:log_text, @path, {:some => "data", :secret => "data"}, ["secret"], @url)
-        text.should == "[http://my.com/foo/bar {:some=>\"data\", :secret=>\"<hidden>\"}]"
+        (text == "[http://my.com/foo/bar {:some=>\"data\", :secret=>\"<hidden>\"}]" ||
+         text == "[http://my.com/foo/bar {:secret=>\"<hidden>\", :some=>\"data\"}]").should be true
       end
     end
 
     context "when exception" do
       it "includes params regardless of Log.level" do
         text = @client.send(:log_text, @path, {:some => "data", :secret => "data"}, ["secret"], @url, "failed")
-        text.should == "[http://my.com/foo/bar {:some=>\"data\", :secret=>\"<hidden>\"}] | failed"
+        (text == "[http://my.com/foo/bar {:some=>\"data\", :secret=>\"<hidden>\"}] | failed" ||
+         text == "[http://my.com/foo/bar {:secret=>\"<hidden>\", :some=>\"data\"}] | failed").should be true
       end
 
       it "includes exception text" do
         exception = RightScale::HttpExceptions.create(400, "bad data")
         text = @client.send(:log_text, @path, {:some => "data", :secret => "data"}, ["secret"], @url, exception)
-        text.should == "[http://my.com/foo/bar {:some=>\"data\", :secret=>\"<hidden>\"}] | 400 Bad Request: bad data"
+        (text == "[http://my.com/foo/bar {:some=>\"data\", :secret=>\"<hidden>\"}] | 400 Bad Request: bad data" ||
+         text == "[http://my.com/foo/bar {:secret=>\"<hidden>\", :some=>\"data\"}] | 400 Bad Request: bad data").should be true
       end
     end
   end

data/spec/clients/blocking_client_spec.rb

@@ -151,7 +151,8 @@ describe RightScale::BlockingClient do
         it "uses form-encoded query option for parameters" do
           @params = {:some => "data", :more => ["a", "b"]}
           _, request_options = @client.options(verb, @path, @params, @headers, @options)
-          request_options[:query].should == "?some=data&more[]=a&more[]=b"
+          query = request_options[:query]
+          (query == "?some=data&more[]=a&more[]=b" || query == "?more[]=a&more[]=b&some=data").should be true
           request_options[:payload].should be nil
         end
 

data/spec/clients/router_client_spec.rb

@@ -585,16 +585,25 @@ describe RightScale::RouterClient do
       end
 
       context "on error" do
-        it "logs error" do
-          @log.should_receive(:error).with("WebSocket error (Protocol Error)")
-          @client.send(:connect, @routing_keys, &@handler)
-          @websocket.onerror("Protocol Error")
-        end
+        ["0.7.0", "0.7.4"].each do |version|
+          context "in faye-websocket #{version}" do
+            before(:each) do
+              @websocket = WebSocketClientMock.new(version)
+              flexmock(Faye::WebSocket::Client).should_receive(:new).and_return(@websocket)
+            end
 
-        it "does not log if there is no error data" do
-          @log.should_receive(:error).never
-          @client.send(:connect, @routing_keys, &@handler)
-          @websocket.onerror(nil)
+            it "logs error" do
+              @log.should_receive(:error).with("WebSocket error (Protocol Error)")
+              @client.send(:connect, @routing_keys, &@handler)
+              @websocket.onerror("Protocol Error")
+            end
+
+            it "does not log if there is no error data" do
+              @log.should_receive(:error).never
+              @client.send(:connect, @routing_keys, &@handler)
+              @websocket.onerror(nil)
+            end
+          end
         end
       end
     end

data/spec/clients/spec_helper.rb

@@ -57,7 +57,7 @@ class AuthClientMock < RightScale::AuthClient
   end
 end
 
-# Mock WebSocket event
+# Mock WebSocket event per faye-websocket 0.7.0
 class WebSocketEventMock
   attr_reader :code, :data, :reason
 
@@ -68,10 +68,42 @@ class WebSocketEventMock
   end
 end
 
+# Mock WebSocket message event per faye-websocket 0.7.4
+class WebSocketMessageEventMock
+  attr_reader :data
+
+  def initialize(data)
+    @data = data
+  end
+end
+
+# Mock WebSocket close event per faye-websocket 0.7.4
+class WebSocketCloseEventMock
+  attr_reader :code, :reason
+
+  def initialize(code = nil, reason = nil)
+    @code = code
+    @reason = reason
+  end
+end
+
+# Mock WebSocket error event per faye-websocket 0.7.4
+class WebSocketErrorEventMock
+  attr_reader :message
+
+  def initialize(message = nil)
+    @message = message
+  end
+end
+
 # Mock of WebSocket so that can call on methods
 class WebSocketClientMock
   attr_reader :sent, :closed, :code, :reason
 
+  def initialize(version = "0.7.4")
+    @version = version
+  end
+
   def send(event)
     @sent = @sent.nil? ? event : (@sent.is_a?(Array) ? @sent << event : [@sent, event])
   end
@@ -87,7 +119,7 @@ class WebSocketClientMock
   end
 
   def onclose(code, reason = nil)
-    @event = WebSocketEventMock.new(nil, code, reason)
+    @event = @version == "0.7.4" ? WebSocketCloseEventMock.new(code, reason) : WebSocketEventMock.new(nil, code, reason)
     @close_block.call(@event)
   end
 
@@ -95,8 +127,8 @@ class WebSocketClientMock
     @error_block = block
   end
 
-  def onerror(data)
-    @event = WebSocketEventMock.new(data)
+  def onerror(message)
+    @event = @version == "0.7.4" ? WebSocketErrorEventMock.new(message) : WebSocketEventMock.new(message)
     @error_block.call(@event)
   end
 
@@ -105,7 +137,7 @@ class WebSocketClientMock
   end
 
   def onmessage(data)
-    @event = WebSocketEventMock.new(data)
+    @event = @version == "0.7.4" ? WebSocketMessageEventMock.new(data) : WebSocketEventMock.new(data)
     @message_block.call(@event)
   end
 end

data/spec/retryable_request_spec.rb

@@ -31,11 +31,10 @@ describe RightScale::RetryableRequest do
   end
 
   before(:all) do
-    if @sender_exists = RightScale.const_defined?(:Sender)
+    if (@sender_exists = RightScale.const_defined?(:Sender))
       RightScale.module_eval('OldSender = Sender')
     end
     RightScale.module_eval('Sender = SenderMock')
-    @options = {:time_to_live => RightScale::RetryableRequest::DEFAULT_TIMEOUT}
   end
 
   after(:all) do
@@ -44,6 +43,12 @@ describe RightScale::RetryableRequest do
     end
   end
 
+  before(:each) do
+    @now = Time.now
+    flexmock(Time).should_receive(:now).and_return(@now).by_default
+    @options = {:time_to_live => RightScale::RetryableRequest::DEFAULT_TIMEOUT}
+  end
+
   context ':targets option' do
 
     context 'when :targets => nil' do
@@ -51,8 +56,7 @@ describe RightScale::RetryableRequest do
         request = RightScale::RetryableRequest.new('type', 'payload')
         flexmock(RightScale::Sender.instance).should_receive(:send_request).with('type', 'payload', nil, @options, Proc).
             and_yield(RightScale::OperationResult.non_delivery('test')).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).once
+        flexmock(EM).should_receive(:add_timer).twice
         request.run
       end
     end
@@ -62,8 +66,7 @@ describe RightScale::RetryableRequest do
         request = RightScale::RetryableRequest.new('type', 'payload', :targets => ["rs-agent-1-1"])
         flexmock(RightScale::Sender.instance).should_receive(:send_request).with('type', 'payload', {:agent_id => "rs-agent-1-1"}, @options, Proc).
             and_yield(RightScale::OperationResult.non_delivery('test')).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).once
+        flexmock(EM).should_receive(:add_timer).twice
         request.run
       end
     end
@@ -79,8 +82,7 @@ describe RightScale::RetryableRequest do
           options[:time_to_live].should == @options[:time_to_live]
           block.call(RightScale::OperationResult.non_delivery('test'))
         end
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).once
+        flexmock(EM).should_receive(:add_timer).twice
         request.run
       end
     end
@@ -105,8 +107,7 @@ describe RightScale::RetryableRequest do
         request = RightScale::RetryableRequest.new('type', 'payload', :retry_on_error => true)
         flexmock(RightScale::Sender.instance).should_receive(:send_request).with('type', 'payload', nil, @options, Proc).
             and_yield(RightScale::OperationResult.error('test')).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).once
+        flexmock(EM).should_receive(:add_timer).twice
         request.run
       end
 
@@ -117,8 +118,7 @@ describe RightScale::RetryableRequest do
         end
         flexmock(request).should_receive(:fail).never
         flexmock(request).should_receive(:succeed).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).never
+        flexmock(EM).should_receive(:add_timer).once
         request.run
       end
 
@@ -127,8 +127,7 @@ describe RightScale::RetryableRequest do
         flexmock(RightScale::Log).should_receive(:info).with("Request type canceled (enough already)").once
         flexmock(RightScale::Sender.instance).should_receive(:send_request).with('type', 'payload', nil, @options, Proc).
             and_yield(RightScale::OperationResult.cancel('enough already')).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).never
+        flexmock(EM).should_receive(:add_timer).once
         request.run
       end
     end
@@ -144,8 +143,7 @@ describe RightScale::RetryableRequest do
         flexmock(RightScale::Log).should_receive(:info).with("Request non-delivery (test) for type").once
         flexmock(RightScale::Sender.instance).should_receive(:send_request).with('type', 'payload', nil, @options, Proc).
             and_yield(RightScale::OperationResult.non_delivery('test')).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).once
+        flexmock(EM).should_receive(:add_timer).twice
         request.run
       end
 
@@ -155,8 +153,7 @@ describe RightScale::RetryableRequest do
         flexmock(RightScale::Log).should_receive(:info).with("Request type failed (test) and should be retried").once
         flexmock(RightScale::Sender.instance).should_receive(:send_request).with('type', 'payload', nil, @options, Proc).
             and_yield(RightScale::OperationResult.retry('test')).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).once
+        flexmock(EM).should_receive(:add_timer).twice
         request.run
       end
 
@@ -166,8 +163,7 @@ describe RightScale::RetryableRequest do
         flexmock(RightScale::Log).should_receive(:info).with("Request type failed (RightScale not ready) and should be retried").once
         flexmock(RightScale::Sender.instance).should_receive(:send_request).with('type', 'payload', nil, @options, Proc).
             and_yield(RightScale::OperationResult.retry).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).once
+        flexmock(EM).should_receive(:add_timer).twice
         request.run
       end
 
@@ -177,8 +173,7 @@ describe RightScale::RetryableRequest do
             and_yield(RightScale::OperationResult.success('test')).once
         flexmock(request).should_receive(:fail).once
         flexmock(request).should_receive(:succeed).never
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).never
+        flexmock(EM).should_receive(:add_timer).once
         request.cancel('test')
         request.run
       end
@@ -188,8 +183,7 @@ describe RightScale::RetryableRequest do
         flexmock(RightScale::Log).should_receive(:info).with("Request type canceled (enough already)").once
         flexmock(RightScale::Sender.instance).should_receive(:send_request).with('type', 'payload', nil, @options, Proc).
             and_yield(RightScale::OperationResult.cancel('enough already')).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_TIMEOUT, Proc).once
-        flexmock(EM).should_receive(:add_timer).with(RightScale::RetryableRequest::DEFAULT_RETRY_DELAY, Proc).never
+        flexmock(EM).should_receive(:add_timer).once
         request.run
       end
     end

data/spec/spec_helper.rb

@@ -23,8 +23,9 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'flexmock'
 require 'rspec'
+require 'flexmock'
+require 'simplecov'
 require 'eventmachine'
 require 'fileutils'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_agent
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
@@ -272,6 +272,7 @@ files:
 - 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
+- lib/right_agent/monkey_patches/ruby_patch/json_patch.rb
 - 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
@@ -414,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3291070338952462239
+      hash: 2766248071266273264
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.26