right_develop 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7989cf01a6dc582f7974ca8517043149e465d0f3
-  data.tar.gz: b04cc7da6587497edd4c256d6ba16d74e55be1e2
+  metadata.gz: 75595aa0b043470ce941c74a449e02c91b6b3d0e
+  data.tar.gz: fabf099b71bf1a935e68fa7ffd7f1b0534c2e4fb
 SHA512:
-  metadata.gz: f00e538f03810658bd3cc41c296787f6a0621ce7aabeb26ce3b92f7c612f32d60b328bf0192ecabd9f214eb4c6c21264133e75ef2840b3455144a334d8529dbb
-  data.tar.gz: 7fce7bf3a7a856e04c7a359e7c01f4d335cb4f2ea6565bf1f360c6209ac2fe3ef275773b45c82a2589886220a5c2374911842c690c7110f91a2c7732cd04784c
+  metadata.gz: a7cb8687f1be119ea4599bb9ca094c92647ae529d8b024745417ae42458f48d2cc6a27e8e949bb4b37e3e5e1f44a653e8e71ed47178acb0c57a6ef9a461767e3
+  data.tar.gz: e1b224843dd49b113263f090608541ef66cee3b8f7e7bc2122b9dae99820991a0feb4b6bd2c9a8bfc99538c4f87ce70af7f01dc53f15388a93ab90f7482f913d

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.1.0

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

@@ -178,7 +178,7 @@ module RightDevelop::Testing::Client::Rest::Request
         file_path = nil
       end
       if file_path
-        response_hash = ::Mash.new(::YAML.load_file(file_path))
+        response_hash = RightSupport::Data::Mash.new(::YAML.load_file(file_path))
         if response_hash[:peer_reset_connection]
           raise PeerResetConnectionError, 'Connection reset by peer'
         end

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

@@ -22,7 +22,6 @@
 
 # ancestor
 require 'right_develop/testing/recording'
-require 'extlib'
 require 'json'
 require 'logger'
 require 'rack/utils'
@@ -43,7 +42,7 @@ module RightDevelop::Testing::Recording
     # value would be ambiguous.
     STOP_TRAVERSAL_KEY = ''.freeze
 
-    VALID_MODES = ::Mash.new(
+    VALID_MODES = RightSupport::Data::Mash.new(
       :admin    => 'Administrative for changing mode, fixtures, etc. while running.',
       :echo     => 'Echoes request back as response and validates route.',
       :playback => 'Playback a session for one or more stubbed web services.',
@@ -71,7 +70,7 @@ module RightDevelop::Testing::Recording
     def initialize(config_hash, options = nil)
       # defaults.
       current_dir = ::Dir.pwd
-      defaults = ::Mash.new(
+      defaults = RightSupport::Data::Mash.new(
         'fixtures_dir' => ::File.expand_path(FIXTURES_DIR_NAME, current_dir),
         'log_level'    => :info,
         'log_dir'      => ::File.expand_path(LOG_DIR_NAME, current_dir),
@@ -89,7 +88,7 @@ module RightDevelop::Testing::Recording
         # another deep merge of any additional options.
         ::RightSupport::Data::HashTools.deep_merge!(config_hash, options)
       end
-      @config_hash = ::Mash.new
+      @config_hash = RightSupport::Data::Mash.new
       mode(config_hash['mode'])
       admin(config_hash['admin'])
       routes(config_hash['routes'])
@@ -178,7 +177,7 @@ module RightDevelop::Testing::Recording
           # normalize routes for efficient usage but keep them separate from
           # user's config so that .to_hash returns something understandable and
           # JSONizable/YAMLable.
-          @normalized_routes = value.inject(::Mash.new) do |r, (k, v)|
+          @normalized_routes = value.inject(RightSupport::Data::Mash.new) do |r, (k, v)|
             r[normalize_route_prefix(k)] = normalize_route_data(k, v)
             r
           end
@@ -252,11 +251,11 @@ module RightDevelop::Testing::Recording
         if subdir = route_data[:subdir]
           route_subdir = ::File.expand_path(::File.join(path, '..', subdir))
           ::Dir[::File.join(route_subdir, "**/*#{extension}")].each do |route_config_path|
-            route_config_data = ::Mash.new(::YAML.load_file(route_config_path))
+            route_config_data = RightSupport::Data::Mash.new(::YAML.load_file(route_config_path))
             filename = ::File.basename(route_config_path)[0..-(extension.length + 1)]
             hash_path = ::File.dirname(route_config_path)[(route_subdir.length + 1)..-1].split('/')
             unless current_route_data = ::RightSupport::Data::HashTools.deep_get(route_data, hash_path)
-              current_route_data = ::Mash.new
+              current_route_data = RightSupport::Data::Mash.new
               ::RightSupport::Data::HashTools.deep_set!(route_data, hash_path, current_route_data)
             end
 
@@ -288,19 +287,7 @@ module RightDevelop::Testing::Recording
     #
     # @return [Object] depends on input type
     def self.deep_mash(any)
-      case any
-      when Array
-        # traverse arrays
-        any.map { |i| deep_mash(i) }
-      when Hash
-        # mash the hash
-        any.inject(::Mash.new) do |m, (k, v)|
-          m[k] = deep_mash(v)
-          m
-        end
-      else
-        any  # whatever
-      end
+      RightSupport::Data::HashTools.deep_mash(any)
     end
 
     protected
@@ -449,7 +436,7 @@ module RightDevelop::Testing::Recording
           # FIX: don't think there is a need for wildcard qualifiers beyond URI
           # path (i.e. wildcard matchers) so they are not currently supported.
           qualifiers_to_data = regex_to_data[regex] ||= {}
-          current_qualifiers = ::Mash.new
+          current_qualifiers = RightSupport::Data::Mash.new
           if k == STOP_TRAVERSAL_KEY
             # no qualifiers; stopped after URI path
             qualifiers_to_data[current_qualifiers] = normalize_route_stop_configuration(position, uri_path + [k], v)
@@ -475,8 +462,8 @@ module RightDevelop::Testing::Recording
       end
 
       # could be multiple qualifiers in a CGI-style string.
-      current_qualifiers = ::Mash.new(current_qualifiers)
-      more_qualifiers = ::Mash.new
+      current_qualifiers = RightSupport::Data::Mash.new(current_qualifiers)
+      more_qualifiers = RightSupport::Data::Mash.new
       ::CGI.unescape(subpath.last).split('&').each do |q|
         if matched = TYPE_NAME_VALUE_REGEX.match(q)
           case qualifier_type = matched[1]
@@ -507,13 +494,13 @@ module RightDevelop::Testing::Recording
             # not case-sensitive so convert the header keys to snake_case to
             # match normalized headers from request.
             if qualifier_type == 'header'
-              qualifier = qualifier.inject(::Mash.new) do |h, (k, v)|
+              qualifier = qualifier.inject(RightSupport::Data::Mash.new) do |h, (k, v)|
                 h[normalize_header_key(k)] = v
                 h
               end
             end
             ::RightSupport::Data::HashTools.deep_merge!(
-              more_qualifiers[qualifier_type] ||= ::Mash.new,
+              more_qualifiers[qualifier_type] ||= RightSupport::Data::Mash.new,
               qualifier)
           end
         else
@@ -552,7 +539,7 @@ module RightDevelop::Testing::Recording
         raise ConfigError, message
       end
 
-      route_stop_config.inject(::Mash.new) do |rst, (rst_k, rst_v)|
+      route_stop_config.inject(RightSupport::Data::Mash.new) do |rst, (rst_k, rst_v)|
 
         # sanity check.
         unwanted_keys = rst_v.keys.map(&:to_s) - ALLOWED_CONFIG_ACTIONS
@@ -564,11 +551,11 @@ module RightDevelop::Testing::Recording
           raise ConfigError, message
         end
 
-        rst[rst_k] = rst_v.inject(::Mash.new) do |kc, (kc_k, kc_v)|
+        rst[rst_k] = rst_v.inject(RightSupport::Data::Mash.new) do |kc, (kc_k, kc_v)|
           case kc_k
           when METADATA_CLASS::TIMEOUTS_KEY
             # sanity check.
-            kc_v = kc_v.inject(::Mash.new) do |h, (k, v)|
+            kc_v = kc_v.inject(RightSupport::Data::Mash.new) do |h, (k, v)|
               h[k] = Integer(v)
               h
             end
@@ -601,7 +588,7 @@ module RightDevelop::Testing::Recording
                 end
               when ::Hash
                 # transform, variables
-                kc_v[:header] = headers.inject(::Mash.new) do |h, (k, v)|
+                kc_v[:header] = headers.inject(RightSupport::Data::Mash.new) do |h, (k, v)|
                   h[normalize_header_key(k)] = v
                   h
                 end

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

@@ -276,7 +276,7 @@ module RightDevelop::Testing::Recording
     #
     # @return [Mash] types to names to values
     def compute_typenames_to_values
-      ::Mash.new(
+      RightSupport::Data::Mash.new(
         verb:   @verb,
         query:  parse_query_string(@uri.query.to_s),
         header: @headers,
@@ -409,7 +409,7 @@ module RightDevelop::Testing::Recording
     #
     # @return [Hash] effective route configuration
     def compute_effective_route_config
-      result = ::Mash.new
+      result = RightSupport::Data::Mash.new
       if configuration_data = @route_data[MATCHERS_KEY]
         # the top-level keys are expected to be regular expressions used to
         # match only the URI path.
@@ -768,7 +768,7 @@ module RightDevelop::Testing::Recording
         {}
 
       # verb and (response-only) http_status are always significant.
-      significant_data = ::Mash.new(verb: @verb)
+      significant_data = RightSupport::Data::Mash.new(verb: @verb)
       significant_data[:http_status] = @http_status if @http_status
 
       # headers
@@ -819,7 +819,7 @@ module RightDevelop::Testing::Recording
     def copy_if_significant(type, significant, significant_data)
       if significant_type = significant[type]
         significant_data[type] = recursive_selective_hash_copy(
-          ::Mash.new, @typenames_to_values[type], significant_type)
+          RightSupport::Data::Mash.new, @typenames_to_values[type], significant_type)
         true
       else
         false

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

@@ -34,8 +34,8 @@ module RightDevelop::Testing::Server::MightApi
 
       # Rack (and Skeletor) apps and some known AWS apps only accept dash and
       # not underscore so ensure the default settings reflect the 80-20 rule.
-      DEFAULT_PROXY_SETTINGS = ::Mash.new(
-        header: ::Mash.new(
+      DEFAULT_PROXY_SETTINGS = RightSupport::Data::Mash.new(
+        header: RightSupport::Data::Mash.new(
           case:      :capitalize,
           separator: :dash
         ).freeze
@@ -322,7 +322,7 @@ module RightDevelop::Testing::Server::MightApi
           if header_data = proxy_data[:header]
             to_separator = (header_data[:separator] == :underscore) ? '_' : '-'
             from_separator = (to_separator == '-') ? '_' : '-'
-            proxied = headers.inject(::Mash.new) do |h, (k, v)|
+            proxied = headers.inject(RightSupport::Data::Mash.new) do |h, (k, v)|
               k = k.to_s
               case header_data[:case]
               when nil
@@ -342,7 +342,7 @@ module RightDevelop::Testing::Server::MightApi
             end
           end
         end
-        proxied || ::Mash.new(headers)
+        proxied || RightSupport::Data::Mash.new(headers)
       end
 
       # rack has a convention of newline-delimited header multi-values.

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

@@ -140,8 +140,8 @@ module RightDevelop::Testing::Server::MightApi
               # load request/response pair to validate.
               request_file_path = ::File.join(requests_dir, path)
               response_file_path = ::File.join(responses_dir, path)
-              request_data = ::Mash.new(::YAML.load_file(request_file_path))
-              response_data = ::Mash.new(::YAML.load_file(response_file_path))
+              request_data = RightSupport::Data::Mash.new(::YAML.load_file(request_file_path))
+              response_data = RightSupport::Data::Mash.new(::YAML.load_file(response_file_path))
 
               # if confing contains unreachable (i.e. no available route) files
               # then that is ignorable.

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.3 ruby lib
+# stub: right_develop 3.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_develop"
-  s.version = "3.0.3"
+  s.version = "3.1.0"
 
   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-09-03"
+  s.date = "2014-09-25"
   s.description = "A toolkit of development tools created by RightScale."
   s.email = "support@rightscale.com"
   s.executables = ["right_develop"]
@@ -78,19 +78,18 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/rightscale/right_develop"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.2.0"
   s.summary = "Reusable dev & test code."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<right_support>, [">= 2.8.10"])
+      s.add_runtime_dependency(%q<right_support>, ["< 3.0.0", ">= 2.8.31"])
       s.add_runtime_dependency(%q<builder>, ["~> 3.0"])
       s.add_runtime_dependency(%q<trollop>, ["< 3.0", ">= 1.0"])
       s.add_runtime_dependency(%q<right_git>, [">= 1.0"])
       s.add_runtime_dependency(%q<right_aws>, [">= 2.1.0"])
-      s.add_runtime_dependency(%q<extlib>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0.8.7"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
@@ -99,12 +98,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<pry-byebug>, [">= 0"])
     else
-      s.add_dependency(%q<right_support>, [">= 2.8.10"])
+      s.add_dependency(%q<right_support>, ["< 3.0.0", ">= 2.8.31"])
       s.add_dependency(%q<builder>, ["~> 3.0"])
       s.add_dependency(%q<trollop>, ["< 3.0", ">= 1.0"])
       s.add_dependency(%q<right_git>, [">= 1.0"])
       s.add_dependency(%q<right_aws>, [">= 2.1.0"])
-      s.add_dependency(%q<extlib>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0.8.7"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
@@ -114,12 +112,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry-byebug>, [">= 0"])
     end
   else
-    s.add_dependency(%q<right_support>, [">= 2.8.10"])
+    s.add_dependency(%q<right_support>, ["< 3.0.0", ">= 2.8.31"])
     s.add_dependency(%q<builder>, ["~> 3.0"])
     s.add_dependency(%q<trollop>, ["< 3.0", ">= 1.0"])
     s.add_dependency(%q<right_git>, [">= 1.0"])
     s.add_dependency(%q<right_aws>, [">= 2.1.0"])
-    s.add_dependency(%q<extlib>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0.8.7"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: right_develop
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Tony Spataro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.10
+        version: 2.8.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.10
+        version: 2.8.31
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +92,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: extlib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Reusable dev & test code.