right_develop 2.2.0 → 2.2.1

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/bin/right_develop

@@ -20,7 +20,7 @@ end
 # just yet.
 command_list = commands.keys.map { |c| "       * #{c}" }.join("\n")
 p = Trollop::Parser.new do
-  version "right_develop #{gemspec.version} (c) 2013- RightScale, Inc."
+  version "right_develop #{gemspec.version} (c) 2013-2014 RightScale, Inc."
   banner <<-EOS
 A command-line interface to various tools offered by the right_develop gem.
 

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

@@ -61,7 +61,7 @@ module RightDevelop::Testing::Recording
     FIXTURE_FILE_NAME_REGEX = /^([0-9A-Fa-f]{32}).yml$/
 
     # typename to value expression for significant/requests/responses configurations.
-    TYPE_NAME_VALUE_REGEX = /^(body|header|query|verb)(?:\:([^=]+))?=(.*)$/
+    TYPE_NAME_VALUE_REGEX = /^(body|header|query|verb)(?:[:#]([^=]+))?=(.*)$/
 
     # exceptions.
     class ConfigError < StandardError; end

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

@@ -37,7 +37,7 @@ module RightDevelop::Testing::Recording
     VERBS = %w(DELETE GET HEAD PATCH POST PUT).freeze
 
     # valid modes, determines how variables are substituted, etc.
-    MODES = %w(echo record playback)
+    MODES = %w(echo record playback validate)
 
     # valid kinds, also keys under matchers.
     KINDS = %w(request response)
@@ -87,6 +87,7 @@ module RightDevelop::Testing::Recording
 
     attr_reader :uri, :verb, :http_status, :headers, :body
     attr_reader :mode, :logger, :effective_route_config, :variables
+    attr_reader :typenames_to_values
 
     # Computes the metadata used to identify where the request/response should
     # be stored-to/retrieved-from. Recording the full request is not strictly
@@ -141,7 +142,7 @@ module RightDevelop::Testing::Recording
       # apply the configuration by substituting for variables in the request and
       # by obfuscating wherever a variable name is nil.
       case @mode
-      when 'echo'
+      when 'validate'
         # do nothing; used to validate the fixtures before playback, etc.
       else
         erck = @effective_route_config[@kind]
@@ -750,7 +751,7 @@ module RightDevelop::Testing::Recording
 
       # use deep-sorted JSON to prevent random ordering changing the checksum.
       checksum_data = self.class.deep_sorted_json(significant_data)
-      if logger.debug? && @mode != 'echo'
+      if logger.debug? && @mode != 'validate'
         logger.debug("#{@kind} checksum_data = #{checksum_data.inspect}")
       end
       ::Digest::MD5.hexdigest(checksum_data)

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

@@ -175,7 +175,7 @@ module RightDevelop::Testing::Server::MightApi
 
               # eliminate headers that interfere with response via proxy.
               %w(
-                connection status content-encoding
+                status content-encoding
               ).each { |key| response_headers.delete(key) }
 
               case response_code = Integer(rest_response.code)
@@ -293,10 +293,20 @@ module RightDevelop::Testing::Server::MightApi
       #
       # @return [Hash] normalized headers
       def normalize_rack_response_headers(headers)
-        headers.inject({}) do |h, (k, v)|
+        result = headers.inject({}) do |h, (k, v)|
           h[k.to_s.gsub('_', '-').downcase] = v.join("\n")
           h
         end
+
+        # a proxy server must always instruct the client close the connection by
+        # specification because a live socket cannot be proxied from client to
+        # the real server. this also works around a lame warning in ruby 1.9.3
+        # webbrick code (fixed in 2.1.0+) saying:
+        #   Could not determine content-length of response body.
+        #   Set content-length of the response or set Response#chunked = true
+        # in the case of 204 empty response, which is incorrect.
+        result['connection'] = 'close'
+        result
       end
 
       # @return [Array] rack-style response for 500

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

@@ -39,19 +39,51 @@ module RightDevelop::Testing::Server::MightApi::App
     # @see RightDevelop::Testing::Server::MightApi::App::Base#handle_request
     def handle_request(env, verb, uri, headers, body)
 
-      # check routes.
+      # echo request back as response.
       response = ::Rack::Response.new
+      response.write "verb = #{verb.inspect}\n\n"
+      response.write "uri = #{uri}\n\n"
+      response.write "headers = #{METADATA_CLASS.deep_sorted_json(headers, true)}\n\n"
+      response.write "body = #{body.inspect}\n\n"
+
+      # check routes.
       if route = find_route(uri)
-        response.write "URL matched #{route.last[:name].inspect}\n"
+        route_path, route_data = route
+        response.write "URL matched #{route_data[:name].inspect}\n\n"
+
+        # compute effective metadata for request.
+        begin
+          proxied_url = ::File.join(route_data[:url], uri.path)
+          unless uri.query.to_s.empty?
+            proxied_url << '?' << uri.query
+          end
+          request_metadata = METADATA_CLASS.new(
+            mode:       :echo,
+            kind:       :request,
+            logger:     logger,
+            route_data: route_data,
+            uri:        METADATA_CLASS.normalize_uri(proxied_url),
+            verb:       verb,
+            headers:    headers,
+            body:       body,
+            variables:  {})
+
+          # echo any interesting metadata.
+          response.write "substituted request variables = #{METADATA_CLASS.deep_sorted_json(request_metadata.variables, true)}\n\n"
+          response.write "effective route configuration = #{METADATA_CLASS.deep_sorted_json(request_metadata.effective_route_config, true)}\n\n"
+          response.write "request checksum = #{request_metadata.checksum}\n\n"
+        rescue Exception => e
+          response.write "Failure to compute request metadata:\n#{e.class}: #{e.message}\n#{(e.backtrace || []).join("\n")}\n\n"
+        end
       else
-        response.write "Failed to match any route. The following routes are valid:\n"
+        response.write "Failed to match any route. The following routes are valid:\n\n"
         config.routes.keys.each do |prefix|
           response.write "Prefix = #{prefix.inspect}\n\n"
         end
       end
 
-      # echo request back as response.
-      response.write "\nruby %sp%s\n\n" % [RUBY_VERSION, RUBY_PATCHLEVEL]
+      # process details.
+      response.write "ruby %sp%s\n\n" % [RUBY_VERSION, RUBY_PATCHLEVEL]
       response.write "Raw configuration = #{::JSON.pretty_generate(config.to_hash)}\n\n"  # hash order is significant in config
       config.routes.each do |route_path, route_config|
         response.write "=== Compiled route matchers begin for root = #{route_path.inspect}:\nmatchers = {\n"
@@ -62,10 +94,6 @@ module RightDevelop::Testing::Server::MightApi::App
       end
       response.write "env = #{METADATA_CLASS.deep_sorted_json(env, true)}\n\n"
       response.write "ENV = #{METADATA_CLASS.deep_sorted_json(::ENV, true)}\n\n"
-      response.write "verb = #{verb.inspect}\n\n"
-      response.write "uri = #{uri}\n\n"
-      response.write "headers = #{METADATA_CLASS.deep_sorted_json(headers, true)}\n\n"
-      response.write "body = #{body.inspect}\n\n"
       response.finish
     end
 

data/lib/right_develop/testing/servers/might_api/lib/config.rb

@@ -154,7 +154,7 @@ module RightDevelop::Testing::Server::MightApi
 
               # compute checksum from recorded request metadata.
               request_metadata = METADATA_CLASS.new(
-                mode:       :echo,
+                mode:       :validate,
                 kind:       :request,
                 logger:     logger,
                 route_data: route_data,

data/right_develop.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{right_develop}
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tony Spataro"]
-  s.date = %q{2014-04-28}
+  s.date = %q{2014-05-13}
   s.default_executable = %q{right_develop}
   s.description = %q{A toolkit of development tools created by RightScale.}
   s.email = %q{support@rightscale.com}

metadata

@@ -1,245 +1,241 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: right_develop
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
+version: !ruby/object:Gem::Version
+  version: 2.2.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tony Spataro
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-05-06 00:00:00 -07:00
-default_executable: right_develop
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2014-05-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
-  name: rake
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
   name: right_support
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: right_git
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.1.0
-  name: right_git
   type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
   name: right_aws
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
   name: extlib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.8.3
-  name: jeweler
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 4
-        - 2
-        version: 2.4.2
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+- !ruby/object:Gem::Dependency
   name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.2
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.2
 description: A toolkit of development tools created by RightScale.
 email: support@rightscale.com
-executables: 
+executables:
 - right_develop
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
@@ -291,39 +287,32 @@ files:
 - lib/right_develop/utility/versioning.rb
 - right_develop.gemspec
 - right_develop.rconf
-has_rdoc: true
 homepage: https://github.com/rightscale/right_develop
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -307522925874421181
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Reusable dev & test code.
 test_files: []
-