vcr 2.4.0 → 2.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    M2E1NzkzNThjMThkYmM4MDg3NzVhNDI0NTM0OTkxZjQ2OGVjMGZhYw==
+  data.tar.gz: !binary |-
+    ZDBhNTNiNWE0Mjk2YTJlN2U4Zjk2OTEyZTE3ZGMxOThjODU0NzM2ZQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTQzYzIwNWFmNTA0NWUxMDViMDk5NmU5NTVmMzU4NGMxYTUwYTFmMjNiOTQx
+    NDgwM2ZjY2RlZmZhNzVhYjkwOWZhOTFkMDExNDFmOTEyZGI2YmVlYzAwZjVl
+    ZWQ0N2E5YmJmMTM3NDEwOTVmNTlhODA4ZDdhYzZjYTY4MDg3YzM=
+  data.tar.gz: !binary |-
+    ZTEyOTM4NGYzYjk1MDY4NmYyOTc4ZTIwNjdmZDE3NTMyZjZkNjVkNjNmYTkx
+    ODU4N2ZkNjQ2NTUzZGNkNGU3YzIyYTVjY2VmMjAwYTBiYzJlODk1NzQ5MmY1
+    NTdkNGVjZGEwY2ZlNDQwYjlkNTU4Y2M0YzNiMmI0ZmIzMmYzNzU=

data/.gitignore

@@ -45,5 +45,8 @@ doc
 .idea/
 
 .rbenv-version
+.ruby-version
+.ruby-gemset
 bin/*
 bundle/*
+.rspec-local

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ree
   - jruby-18mode
   - jruby-19mode
@@ -17,6 +18,7 @@ matrix:
     - rvm: jruby-19mode
     - rvm: rbx-19mode
     - rvm: rbx-18mode
+    - rvm: 2.0.0
 branches:
   except:
     - gh-pages

data/CHANGELOG.md

@@ -1,3 +1,34 @@
+## Unreleased Changes
+
+[Full Changelog](http://github.com/vcr/vcr/compare/v2.5.0...master)
+
+* No significant changes.
+
+## 2.5.0 (May 18, 2013)
+
+[Full Changelog](http://github.com/vcr/vcr/compare/v2.4.0...v2.5.0)
+
+Bug Fixes:
+
+* Fix `around_http_request` so that it does not raise confusing
+  errors when requests are made in multiple threads.
+* Fix `configure_rspec_metadata!` so that you can safely call it
+  more than once
+
+Enhancements:
+
+* Relax WebMock version checker to allow WebMock 1.10 and 1.11 without
+  issuing warnings (Johannes Würbach and Myron Marston).
+* Update Excon integration to take advantage of new Excon middleware
+  architecture. This is a more robust way to hook into Excon and will
+  be less prone to breakage due to internal Excon changes (Myron
+  Marston).
+
+Deprecations:
+
+* Deprecate support for Typhoeus < 0.5. It will be removed in
+  VCR 3.0 (Sheel Choksi).
+
 ## 2.4.0 (January 4, 2013)
 
 [Full Changelog](http://github.com/vcr/vcr/compare/v2.3.0...v2.4.0)

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'appraisal'
 
@@ -22,4 +22,3 @@ group :extras do
   gem 'debugger', :platforms => :mri_19
   gem 'pry'
 end
-

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    vcr (2.4.0)
+    vcr (2.5.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.3.2)
+    addressable (2.3.3)
     appraisal (0.5.1)
       bundler
       rake
@@ -16,13 +16,14 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    builder (3.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    coderay (1.0.8)
+    bouncy-castle-java (1.5.0146.1)
+    builder (3.2.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.9)
     columnize (0.3.6)
     cookiejar (0.3.0)
-    crack (0.3.1)
+    crack (0.3.2)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -30,14 +31,14 @@ GEM
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     curb (0.8.3)
-    debugger (1.2.2)
+    debugger (1.3.3)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.5)
+      debugger-ruby_core_source (~> 1.2.0)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.5)
-    diff-lcs (1.1.3)
+    debugger-ruby_core_source (1.2.0)
+    diff-lcs (1.2.1)
     em-http-request (1.0.3)
       addressable (>= 2.2.3)
       cookiejar
@@ -46,15 +47,17 @@ GEM
       http_parser.rb (>= 0.5.3)
     em-socksify (0.2.1)
       eventmachine (>= 1.0.0.beta.4)
-    ethon (0.5.6)
-      ffi (~> 1.1.5)
+    ethon (0.5.10)
+      ffi (~> 1.3.0)
       mime-types (~> 1.18)
-    eventmachine (1.0.0)
-    excon (0.16.10)
+    eventmachine (1.0.1)
+    eventmachine (1.0.1-java)
+    excon (0.22.1)
     fakeweb (1.3.0)
-    faraday (0.8.4)
+    faraday (0.8.6)
       multipart-post (~> 1.1)
-    ffi (1.1.5)
+    ffi (1.3.1)
+    ffi (1.3.1-java)
     fuubar (1.0.0)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
@@ -64,25 +67,36 @@ GEM
       ruby-progressbar (~> 0.0.10)
     gherkin (2.9.3)
       json (>= 1.4.6)
-    github-markup (0.7.4)
+    gherkin (2.9.3-java)
+      json (>= 1.4.6)
+    github-markup (0.7.5)
     http_parser.rb (0.5.3)
-    httpclient (2.3.0.1)
-    json (1.6.7)
+    http_parser.rb (0.5.3-java)
+    httpclient (2.3.3)
+    jruby-openssl (0.8.2)
+      bouncy-castle-java (>= 1.5.0146.1)
+    json (1.6.8)
+    json (1.6.8-java)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     method_source (0.8.1)
-    mime-types (1.19)
+    mime-types (1.21)
     multi_json (1.0.4)
-    multipart-post (1.1.5)
+    multipart-post (1.2.0)
     patron (0.4.18)
-    pry (0.9.10)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry (0.9.12-java)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rack (1.3.6)
-    rack-protection (1.2.0)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    rack (1.3.10)
+    rack-protection (1.4.0)
       rack
-    rake (0.9.5)
+    rake (0.9.6)
     rbx-require-relative (0.0.9)
     redcarpet (1.17.2)
     redis (2.2.2)
@@ -92,20 +106,21 @@ GEM
       rest-client (>= 1.6.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.0)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.12.0)
+    rspec-mocks (2.13.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    ruby-debug-base (0.10.4-java)
     ruby-progressbar (0.0.10)
     shoulda (2.9.2)
     simplecov (0.5.4)
@@ -116,19 +131,21 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    slop (3.3.3)
+    slop (3.4.3)
+    spoon (0.0.1)
     term-ansicolor (1.0.7)
-    tilt (1.3.3)
+    tilt (1.3.4)
     timecop (0.3.5)
-    typhoeus (0.5.3)
-      ethon (~> 0.5.3)
-    webmock (1.9.0)
+    typhoeus (0.6.2)
+      ethon (~> 0.5.10)
+    webmock (1.11.0)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+      crack (>= 0.3.2)
     yajl-ruby (1.1.0)
-    yard (0.8.3)
+    yard (0.8.5.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -139,7 +156,7 @@ DEPENDENCIES
   curb (~> 0.8.0)
   debugger
   em-http-request (~> 1.0.2)
-  excon (>= 0.11.0, < 1.0)
+  excon (~> 0.22)
   fakeweb (~> 1.3.0)
   faraday (~> 0.8)
   fuubar
@@ -162,8 +179,8 @@ DEPENDENCIES
   simplecov (~> 0.5.3)
   sinatra (~> 1.3.2)
   timecop (~> 0.3.5)
-  typhoeus (~> 0.5.3)
+  typhoeus (~> 0.6)
   vcr!
-  webmock (~> 1.9)
+  webmock (~> 1.10)
   yajl-ruby (~> 1.1.0)
   yard

data/README.md

@@ -36,11 +36,11 @@ maintenance) and accurate (the response will contain the same headers and body y
 * Automatically records and replays your HTTP interactions with minimal setup/configuration code.
 * Supports and works with the HTTP stubbing facilities of multiple libraries.  Currently, the
   following are supported:
-  * [FakeWeb](https://github.com/chrisk/fakeweb)
   * [WebMock](https://github.com/bblimke/webmock)
   * [Typhoeus](https://github.com/typhoeus/typhoeus)
   * [Faraday](https://github.com/technoweenie/faraday)
   * [Excon](https://github.com/geemus/excon)
+  * [FakeWeb](https://github.com/chrisk/fakeweb) (deprecated)
 * Supports multiple HTTP libraries:
   * [Patron](http://github.com/toland/patron) (when using WebMock)
   * [Curb](http://github.com/taf2/curb) (when using WebMock -- only supports Curl::Easy at the moment)
@@ -71,7 +71,7 @@ maintenance) and accurate (the response will contain the same headers and body y
 
 The docs come in two flavors:
 
-* The [relish docs](http://relishapp.com/myronmarston/vcr) contain
+* The [relish docs](https://relishapp.com/vcr/vcr/docs) contain
   example-based documentation (VCR's cucumber suite, in fact). It's a
   good place to look when you are first getting started with VCR, or if
   you want to see an example of how to use a feature.
@@ -138,6 +138,7 @@ yard server --reload
 Thanks also to the following people who have contributed patches or helpful suggestions:
 
 * [Aaron Brethorst](http://github.com/aaronbrethorst)
+* [Alexander Wenzowski](https://github.com/wenzowski)
 * [Austen Ito](https://github.com/austenito)
 * [Avdi Grimm](https://github.com/avdi)
 * [Bartosz Blimke](http://github.com/bblimke)
@@ -154,6 +155,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Hans Hasselberg](https://github.com/i0rek)
 * [Ingemar](https://github.com/ingemar)
 * [Jacob Green](https://github.com/Jacobkg)
+* [Jay Shepherd](https://github.com/jayshepherd)
 * [Jeff Pollard](https://github.com/Fluxx)
 * [Joe Nelson](https://github.com/begriffs)
 * [Jonathan Tron](https://github.com/JonathanTron)
@@ -161,6 +163,7 @@ Thanks also to the following people who have contributed patches or helpful sugg
 * [Karl Baum](https://github.com/kbaum)
 * [Luke van der Hoeven](https://github.com/plukevdh)
 * [Mark Burns](https://github.com/markburns)
+* [Max Riveiro](https://github.com/kavu)
 * [Michael Lavrisha](https://github.com/vrish88)
 * [Mislav Marohnić](https://github.com/mislav)
 * [Nathaniel Bibler](https://github.com/nbibler)

data/features/cassettes/allow_unused_http_interactions.feature

@@ -14,7 +14,7 @@ Feature: Allow Unused HTTP Interactions
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
       end
       """

data/features/cassettes/automatic_re_recording.feature

@@ -45,7 +45,7 @@ Feature: Automatic Re-recording
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
       end
 

data/features/cassettes/decompress.feature

@@ -32,7 +32,7 @@ Feature: Decode compressed response
 
       VCR.configure do |c|
         c.cassette_library_dir = 'cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.default_cassette_options = { :serialize_with => :syck }
       end
       """
@@ -47,7 +47,7 @@ Feature: Decode compressed response
     And I run `ruby decompress.rb`
     Then the file "cassettes/decompress.yml" should contain a YAML fragment like:
       """
-      content-encoding:
+      Content-Encoding:
       - gzip
       """
 
@@ -61,7 +61,7 @@ Feature: Decode compressed response
     And I run `ruby decompress.rb`
     Then the file "cassettes/decompress.yml" should contain a YAML fragment like:
       """
-      content-length:
+      Content-Length:
       - '43'
       """
     And the file "cassettes/decompress.yml" should contain:

data/features/cassettes/dynamic_erb.feature

@@ -42,7 +42,7 @@ Feature: Dynamic ERB cassettes
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
       end
 
@@ -87,7 +87,7 @@ Feature: Dynamic ERB cassettes
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
       end
 

data/features/cassettes/exclusive.feature

@@ -76,7 +76,7 @@ Feature: exclusive cassette
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
         c.default_cassette_options = { :record => :new_episodes }
       end

data/features/cassettes/naming.feature

@@ -16,7 +16,7 @@ Feature: Naming
 
       VCR.configure do |c|
         c.cassette_library_dir = 'cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
       end
 
       VCR.use_cassette('Fee, Fi Fo Fum') do

data/features/cassettes/no_cassette.feature

@@ -63,8 +63,9 @@ Feature: Error for HTTP request made when no cassette is in use
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
       end
+      WebMock.allow_net_connect!
 
       def make_request(context)
         puts context
@@ -113,8 +114,9 @@ Feature: Error for HTTP request made when no cassette is in use
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
       end
+      WebMock.allow_net_connect!
 
       VCR.turn_off!
       VCR.insert_cassette('example')
@@ -133,8 +135,9 @@ Feature: Error for HTTP request made when no cassette is in use
 
       VCR.configure do |c|
         c.cassette_library_dir = 'cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
       end
+      WebMock.allow_net_connect!
 
       VCR.turn_off!(:ignore_cassettes => true)