[DRE-commits] [ruby-webmock] 01/05: Merge tag 'upstream/1.17.4'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-webmock.

commit 933ceefdca3f3846a982a7721564e97ebb9d8ae3
Merge: ea4fb59 d62841c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Mar 14 10:06:40 2014 +0100

    Merge tag 'upstream/1.17.4'
    
    Upstream version 1.17.4
    
    # gpg: Signature faite le ven. 14 mars 2014 10:06:34 CET
    # gpg:                avec la clef RSA 0xDA4958F611E149E9
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9

 .travis.yml                                        |  12 +-
 CHANGELOG.md                                       |  46 ++++++
 README.md                                          |   8 +
 lib/webmock.rb                                     |   1 +
 lib/webmock/api.rb                                 |   2 +-
 lib/webmock/http_lib_adapters/curb_adapter.rb      |  15 +-
 lib/webmock/http_lib_adapters/http_gem_adapter.rb  | 170 +++++++++++++++++++++
 .../http_lib_adapters/typhoeus_hydra_adapter.rb    |  11 ++
 lib/webmock/rack_response.rb                       |   2 +-
 lib/webmock/request_execution_verifier.rb          |   2 +-
 .../rspec/matchers/request_pattern_matcher.rb      |   8 +-
 lib/webmock/rspec/matchers/webmock_matcher.rb      |   8 +-
 lib/webmock/util/json.rb                           |   5 +
 lib/webmock/util/query_mapper.rb                   |   4 +-
 lib/webmock/util/version_checker.rb                |  21 +++
 lib/webmock/version.rb                             |   2 +-
 metadata.yml                                       | 125 +++++++++------
 spec/acceptance/curb/curb_spec.rb                  |  49 ++++++
 spec/acceptance/excon/excon_spec_helper.rb         |   9 +-
 spec/acceptance/http_gem/http_gem_spec.rb          |  54 +++++++
 spec/acceptance/http_gem/http_gem_spec_helper.rb   |  52 +++++++
 spec/acceptance/shared/callbacks.rb                |  10 +-
 .../shared/returning_declared_responses.rb         |  13 ++
 spec/acceptance/typhoeus/typhoeus_hydra_spec.rb    |  39 +++++
 spec/quality_spec.rb                               |  24 +++
 spec/unit/request_execution_verifier_spec.rb       |   4 +-
 spec/unit/util/query_mapper_spec.rb                |  30 ++++
 webmock.gemspec                                    |   3 +-
 28 files changed, 655 insertions(+), 74 deletions(-)

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