right_develop 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58bccc63409eb4fcbd40d7357816ab0742a472f1
-  data.tar.gz: fb027c76b663d06a0fa97bf1fac431d763b18fcd
+  metadata.gz: 7989cf01a6dc582f7974ca8517043149e465d0f3
+  data.tar.gz: b04cc7da6587497edd4c256d6ba16d74e55be1e2
 SHA512:
-  metadata.gz: e25f3a42e141509f8f2062513f911cf3b18adbb3f94142d7958e7debd7289c5139010b3da60eb9369d754d1614458c108ca236fed7e1a7cf228f734644962819
-  data.tar.gz: e136b4ce68d977c1a9cbe00d119f6a948b70d290d0ea4592d4479a33d1391293d40eac1ea5505eefe4580c36192b634a1e30641dc57515a2e49a47205fc4afab
+  metadata.gz: f00e538f03810658bd3cc41c296787f6a0621ce7aabeb26ce3b92f7c612f32d60b328bf0192ecabd9f214eb4c6c21264133e75ef2840b3455144a334d8529dbb
+  data.tar.gz: 7fce7bf3a7a856e04c7a359e7c01f4d335cb4f2ea6565bf1f360c6209ac2fe3ef275773b45c82a2589886220a5c2374911842c690c7110f91a2c7732cd04784c

data/VERSION

@@ -1 +1 @@
-3.0.2
+3.0.3

data/lib/right_develop/testing/clients/rest/requests/playback.rb

@@ -34,7 +34,9 @@ module RightDevelop::Testing::Client::Rest::Request
     HALT_TRANSMIT = :halt_transmit
 
     # exceptions
-    class PlaybackError < StandardError; end
+    PLAYBACK_ERROR = ::RightDevelop::Testing::Recording::Metadata::PlaybackError
+
+    class PeerResetConnectionError < PLAYBACK_ERROR; end
 
     # fake Net::HTTPResponse
     class FakeNetHttpResponse
@@ -114,7 +116,7 @@ module RightDevelop::Testing::Client::Rest::Request
                 "Released thread id=#{::Thread.current.object_id} after " <<
                 "#{try_counter} attempts to satisfy a retryable condition:\n" <<
                 response.message
-              raise PlaybackError, message
+              raise PLAYBACK_ERROR, message
             end
             if 1 == try_counter
               message = "Blocking thread id=#{::Thread.current.object_id} " <<
@@ -141,7 +143,7 @@ module RightDevelop::Testing::Client::Rest::Request
         log_response(response)
         process_result(response, &block)
       else
-        raise PlaybackError,
+        raise PLAYBACK_ERROR,
               'Unexpected RestClient::Request#transmit returned without calling RestClient::Request#log_request'
       end
     end
@@ -177,6 +179,9 @@ module RightDevelop::Testing::Client::Rest::Request
       end
       if file_path
         response_hash = ::Mash.new(::YAML.load_file(file_path))
+        if response_hash[:peer_reset_connection]
+          raise PeerResetConnectionError, 'Connection reset by peer'
+        end
         @response_metadata = create_response_metadata(
           state,
           response_hash[:http_status],
@@ -184,7 +189,7 @@ module RightDevelop::Testing::Client::Rest::Request
           response_hash[:body])
         result = FakeNetHttpResponse.new(response_hash, response_metadata)
       else
-        raise PlaybackError,
+        raise PLAYBACK_ERROR,
               "Unable to locate response file(s): \"#{tried_paths.join("\", \"")}\""
       end
       logger.debug("Played back response from #{file_path.inspect}.")
@@ -209,7 +214,7 @@ module RightDevelop::Testing::Client::Rest::Request
         # current epoch must be listed.
         current_epoch = state[:epoch]
         unless current_epoch == epochs.first
-          raise PlaybackError,
+          raise PLAYBACK_ERROR,
                 "Unable to locate current epoch directory: #{::File.join(fixtures_dir, current_epoch.to_s).inspect}"
         end
 
@@ -232,7 +237,7 @@ module RightDevelop::Testing::Client::Rest::Request
               h
             end
             if remaining.empty?
-              raise PlaybackError,
+              raise PLAYBACK_ERROR,
                     "Unable to determine remaining responses from #{search_path.inspect}"
             end
             logger.debug("Pending responses for epoch = #{current_epoch}: #{remaining.inspect}")

data/lib/right_develop/testing/recording/metadata.rb

@@ -84,6 +84,7 @@ module RightDevelop::Testing::Recording
 
     # exceptions.
     class RecordingError < StandardError; end
+    class PlaybackError < StandardError; end
 
     attr_reader :uri, :verb, :http_status, :headers, :body
     attr_reader :mode, :logger, :effective_route_config, :variables
@@ -520,7 +521,7 @@ module RightDevelop::Testing::Recording
           when ::Array
             # array should have a single element which should be a hash with
             # futher variable declarations for
-            #   "one ore more objects of the same type in an array."
+            #   "zero or more objects of the same type in an array."
             # the array is only an indicator that an array is expected here.
             variables_for_elements = variable.first
             if variable.size != 1 || !variables_for_elements.kind_of?(::Hash)
@@ -609,8 +610,17 @@ module RightDevelop::Testing::Recording
 
     # Inserts (or reuses) a real value into cached array by variable name.
     def variable_to_cache(variable, real_value)
+      # special case for variables surrounded by parentheses; treat as a ruby
+      # macro to be executed on playback.
       result = nil
-      if values = @variables[variable]
+      if variable.start_with?('<%=')
+        unless variable.end_with?('%>')
+          message = 'Illegal macro-for-variable was missing end-of-macro: ' +
+                    variable.inspect
+          raise RecordingError, message
+        end
+        result = variable  # use macro as substituted value
+      elsif values = @variables[variable]
         # quick out for same as initial value; don't show array index.
         if values.first == real_value
           result = variable
@@ -632,25 +642,52 @@ module RightDevelop::Testing::Recording
 
     # Requires a real value to already exist in cache by variable name.
     def variable_in_cache(path, variable, real_value)
+      # special case for variables surrounded by parentheses; treat as a ruby
+      # macro to be executed on playback.
       result = nil
-      values = @variables[variable]
-      case value_index = values && values.index(real_value)
-      when nil
-        message = 'A variable referenced by a response has not yet been ' +
-                  "defined by a request while replacing variable = " +
-                  "#{variable.inspect} at #{path.join('/').inspect}"
-        raise RecordingError, message
-      when 0
-        variable
+      if variable.start_with?('<%=')
+        unless variable.end_with?('%>')
+          message = 'Illegal macro-for-variable was missing end-of-macro: ' +
+                    variable.inspect
+          raise RecordingError, message
+        end
+        result = variable  # use macro as substituted value
       else
-        "#{variable}[#{value_index}]"
+        values = @variables[variable]
+        case value_index = values && values.index(real_value)
+        when nil
+          message = 'A variable referenced by a response has not yet been ' +
+                    'defined by a request while replacing variable = ' +
+                    "#{variable.inspect} at #{path.join('/').inspect}"
+          raise RecordingError, message
+        when 0
+          result = variable
+        else
+          result = "#{variable}[#{value_index}]"
+        end
       end
+      result
     end
 
     # Attempts to get cached variable value by index from recorded string.
     def variable_from_cache(path, variable, target_value)
+      # special case for variables surrounded by parentheses; treat as a ruby
+      # macro to be executed on playback.
       result = nil
-      if variable_array = @variables[variable]
+      if variable.start_with?('<%=')
+        unless variable.end_with?('%>')
+          message = 'Illegal macro-for-variable was missing end-of-macro: ' +
+                    variable.inspect
+          raise PlaybackError, message
+        end
+        begin
+          result = ::Object.class_eval(variable[3..-3].strip)
+        rescue ::Exception => e
+          message = "Failed to evaluate macro-for-variable:\n#{variable}\n" +
+                    e.message
+          raise PlaybackError, message
+        end
+      elsif variable_array = @variables[variable]
         if matched = VARIABLE_INDEX_REGEX.match(target_value)
           variable_array_index = Integer(matched[1])
         else

data/lib/right_develop/testing/servers/might_api/app/base.rb

@@ -126,8 +126,20 @@ module RightDevelop::Testing::Server::MightApi
         # have come from a proxied request/response whereas 500 is never an
         # expected response.
         internal_server_error(message)
-      rescue ::RightDevelop::Testing::Client::Rest::Request::Playback::PlaybackError => e
-        # response has not been recorded.
+      rescue ::RightDevelop::Testing::Client::Rest::Request::Playback::PeerResetConnectionError => e
+        # FIX: have only implemented socket close for webrick; not sure if this
+        # is needed for other rack implementations.
+        if socket = ::Thread.current[:WEBrickSocket]
+          # closing the socket causes 'peer reset connection' on client side and
+          # also prevents any response coming back on connection.
+          socket.close
+        end
+        message = e.message
+        trace = [e.class.name] + (e.backtrace || [])
+        logger.info(message)
+        internal_server_error(message)
+      rescue ::RightDevelop::Testing::Recording::Metadata::PlaybackError => e
+        # response has not been recorded, etc.
         message = e.message
         trace = [e.class.name] + (e.backtrace || [])
         logger.error(message)

data/right_develop.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: right_develop 3.0.2 ruby lib
+# stub: right_develop 3.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_develop"
-  s.version = "3.0.2"
+  s.version = "3.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tony Spataro"]
-  s.date = "2014-08-20"
+  s.date = "2014-09-03"
   s.description = "A toolkit of development tools created by RightScale."
   s.email = "support@rightscale.com"
   s.executables = ["right_develop"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_develop
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support