[DRE-commits] [ruby-hashie] 01/05: Merge tag 'upstream/3.5.5'

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository ruby-hashie.

commit 753199ff5aed69665218f41792bd60c0d964f20f
Merge: e5026aa 256d6bd
Author: Pirate Praveen <praveen at debian.org>
Date:   Mon Jul 3 17:38:25 2017 +0530

    Merge tag 'upstream/3.5.5'
    
    Upstream version 3.5.5
    
    # gpg: Signature made തിങ്കള്‍ 03 ജൂലൈ 2017 05
    # gpg:                using RSA key 2A7974AE2FC152D77867DA4ACE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 CHANGELOG.md                                       | 157 ++++++++++++++++++---
 README.md                                          |  79 ++++++++++-
 Rakefile                                           |  19 ++-
 UPGRADING.md                                       |  25 ++++
 hashie.gemspec                                     |   2 +-
 lib/hashie.rb                                      |  15 +-
 lib/hashie/array.rb                                |  21 +++
 lib/hashie/dash.rb                                 |   6 +-
 lib/hashie/extensions/array/pretty_inspect.rb      |  19 +++
 lib/hashie/extensions/coercion.rb                  |  12 +-
 lib/hashie/extensions/dash/indifferent_access.rb   |   3 +-
 lib/hashie/extensions/deep_locate.rb               |   9 +-
 lib/hashie/extensions/deep_merge.rb                |   2 +-
 lib/hashie/extensions/mash/keep_original_keys.rb   |  54 +++++++
 lib/hashie/extensions/mash/symbolize_keys.rb       |  38 +++++
 lib/hashie/extensions/parsers/yaml_erb_parser.rb   |   2 +-
 lib/hashie/extensions/ruby_version.rb              |  60 ++++++++
 lib/hashie/extensions/ruby_version_check.rb        |  17 +++
 lib/hashie/logger.rb                               |  18 +++
 lib/hashie/mash.rb                                 |  66 ++++++++-
 lib/hashie/railtie.rb                              |  14 ++
 lib/hashie/utils.rb                                |  16 +++
 lib/hashie/version.rb                              |   2 +-
 spec/hashie/array_spec.rb                          |  29 ++++
 spec/hashie/dash_spec.rb                           |  37 +++++
 spec/hashie/extensions/coercion_spec.rb            |  10 +-
 spec/hashie/extensions/deep_find_spec.rb           |  25 ++++
 spec/hashie/extensions/deep_merge_spec.rb          |   9 +-
 spec/hashie/extensions/indifferent_access_spec.rb  |  37 +++++
 .../extensions/mash/keep_original_keys_spec.rb     |  46 ++++++
 spec/hashie/extensions/mash/symbolize_keys_spec.rb |  39 +++++
 spec/hashie/mash_spec.rb                           |  69 ++++++++-
 spec/hashie/parsers/yaml_erb_parser_spec.rb        |  43 ++++--
 spec/hashie/utils_spec.rb                          |  25 ++++
 spec/hashie_spec.rb                                |  13 ++
 spec/integration/omniauth-oauth2/app.rb            |  53 +++++++
 .../omniauth-oauth2/integration_spec.rb            |  26 ++++
 spec/integration/omniauth-oauth2/some_site.rb      |  38 +++++
 spec/integration/omniauth/app.rb                   |  11 ++
 spec/integration/omniauth/integration_spec.rb      |  38 +++++
 .../rails-without-dependency/integration_spec.rb   |  15 ++
 spec/integration/rails/app.rb                      |  48 +++++++
 spec/integration/rails/integration_spec.rb         |  26 ++++
 spec/spec_helper.rb                                |  10 +-
 spec/support/integration_specs.rb                  |  36 +++++
 spec/support/logger.rb                             |  24 ++++
 spec/support/ruby_version_check.rb                 |   6 +
 47 files changed, 1306 insertions(+), 63 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-hashie.git