[DRE-commits] [ruby-webmock] 01/03: Merge tag 'upstream/1.18.0'

[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 0b8d95975f0d9ae3ff9d290edfd79c2dbd044d6f
Merge: 85e9964 46c0e66
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Jul 8 13:17:17 2014 +0200

    Merge tag 'upstream/1.18.0'
    
    Upstream version 1.18.0
    
    # gpg: Signature faite le mar. 08 juil. 2014 13:17:13 CEST
    # 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> »

 CHANGELOG.md                                       |  27 ++++
 README.md                                          |  30 +++-
 lib/webmock.rb                                     |   1 +
 lib/webmock/http_lib_adapters/curb_adapter.rb      |   4 +
 lib/webmock/http_lib_adapters/http_gem/client.rb   |  14 ++
 lib/webmock/http_lib_adapters/http_gem/request.rb  |  10 ++
 lib/webmock/http_lib_adapters/http_gem/response.rb |  21 +++
 lib/webmock/http_lib_adapters/http_gem/streamer.rb |  13 ++
 lib/webmock/http_lib_adapters/http_gem/webmock.rb  |  62 ++++++++
 lib/webmock/http_lib_adapters/http_gem_adapter.rb  | 170 +++------------------
 lib/webmock/minitest.rb                            |  10 +-
 lib/webmock/rack_response.rb                       |   2 +-
 lib/webmock/request_pattern.rb                     |  33 +++-
 lib/webmock/version.rb                             |   2 +-
 metadata.yml                                       |  23 +--
 spec/acceptance/curb/curb_spec.rb                  |   9 ++
 spec/acceptance/http_gem/http_gem_spec.rb          |  40 +++--
 spec/acceptance/http_gem/http_gem_spec_helper.rb   |  49 +++---
 spec/support/my_rack_app.rb                        |   4 +-
 spec/unit/rack_response_spec.rb                    |  10 ++
 spec/unit/request_pattern_spec.rb                  |  66 ++++++++
 webmock.gemspec                                    |   2 +-
 22 files changed, 383 insertions(+), 219 deletions(-)

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