vcr 2.4.0 → 2.5.0

data/features/cassettes/persistence.feature

@@ -45,7 +45,7 @@ Feature: Cassette Persistence
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_persisters[:redis] = RedisCassettePersister.new(Redis.connect)
         c.default_cassette_options = { :persist_with => :redis }
       end

data/features/cassettes/update_content_length_header.feature

@@ -52,7 +52,7 @@ Feature: Update content_length header
 
       VCR.configure do |c|
         c.cassette_library_dir = 'cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
       end
 
       def make_request_and_print_results

data/features/configuration/allow_http_connections_when_no_cassette.feature

@@ -18,7 +18,7 @@ Feature: Allow HTTP connections when no cassette
 
       VCR.configure do |c|
         c.allow_http_connections_when_no_cassette = true
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
       end
       """

data/features/configuration/cassette_library_dir.feature

@@ -14,7 +14,7 @@ Feature: cassette_library_dir
 
       VCR.configure do |c|
         c.cassette_library_dir = 'vcr/cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
       end
 
       VCR.use_cassette('localhost') do

data/features/configuration/debug_logging.feature

@@ -18,7 +18,7 @@ Feature: Debug Logging
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
         c.debug_logger = File.open(ARGV.first, 'w')
       end
@@ -31,9 +31,9 @@ Feature: Debug Logging
     Then the file "record.log" should contain exactly:
       """
       [Cassette: 'example'] Initialized with options: {:record=>:once, :match_requests_on=>[:method, :uri], :allow_unused_http_interactions=>true, :serialize_with=>:yaml, :persist_with=>:file_system}
-      [fakeweb] Handling request: [get http://localhost:7777/] (disabled: false)
+      [webmock] Handling request: [get http://localhost:7777/] (disabled: false)
         [Cassette: 'example'] Initialized HTTPInteractionList with request matchers [:method, :uri] and 0 interaction(s): {  }
-      [fakeweb] Identified request type (recordable) for [get http://localhost:7777/]
+      [webmock] Identified request type (recordable) for [get http://localhost:7777/]
       [Cassette: 'example'] Recorded HTTP interaction [get http://localhost:7777/] => [200 "Hello World"]
 
       """
@@ -41,12 +41,12 @@ Feature: Debug Logging
     Then the file "playback.log" should contain exactly:
       """
       [Cassette: 'example'] Initialized with options: {:record=>:once, :match_requests_on=>[:method, :uri], :allow_unused_http_interactions=>true, :serialize_with=>:yaml, :persist_with=>:file_system}
-      [fakeweb] Handling request: [get http://localhost:7777/] (disabled: false)
+      [webmock] Handling request: [get http://localhost:7777/] (disabled: false)
         [Cassette: 'example'] Initialized HTTPInteractionList with request matchers [:method, :uri] and 1 interaction(s): { [get http://localhost:7777/] => [200 "Hello World"] }
         [Cassette: 'example'] Checking if [get http://localhost:7777/] matches [get http://localhost:7777/] using [:method, :uri]
           [Cassette: 'example'] method (matched): current request [get http://localhost:7777/] vs [get http://localhost:7777/]
           [Cassette: 'example'] uri (matched): current request [get http://localhost:7777/] vs [get http://localhost:7777/]
         [Cassette: 'example'] Found matching interaction for [get http://localhost:7777/] at index 0: [200 "Hello World"]
-      [fakeweb] Identified request type (stubbed_by_vcr) for [get http://localhost:7777/]
+      [webmock] Identified request type (stubbed_by_vcr) for [get http://localhost:7777/]
 
       """

data/features/configuration/filter_sensitive_data.feature

@@ -38,7 +38,7 @@ Feature: Filter sensitive data
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
         c.filter_sensitive_data('<GREETING>') { 'Hello' }
         c.filter_sensitive_data('<LOCATION>') { 'World' }
@@ -71,7 +71,7 @@ Feature: Filter sensitive data
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
         c.filter_sensitive_data('<LOCATION>', :my_tag) { 'World' }
       end

data/features/configuration/hook_into.feature

@@ -4,7 +4,6 @@ Feature: hook_into
   HTTP requests to record and replay them.  There are currently 4 valid
   options which support many different HTTP libraries:
 
-    - :fakeweb can be used to hook into Net::HTTP requests.
     - :webmock can be used to hook into requests from:
       - Net::HTTP
       - HTTPClient
@@ -17,17 +16,15 @@ Feature: hook_into
       but not Typhoeus::Easy or Typhoeus::Multi).
     - :excon can be used to hook into itself.
     - :faraday can be used to hook into itself.
+    - :fakeweb (deprecated) can be used to hook into Net::HTTP requests.
 
   There are some addiitonal trade offs to consider when deciding which
   option to use:
 
-    - FakeWeb is currently about 4 times faster than WebMock for hooking into
-      Net::HTTP (see benchmarks/http_stubbing_libraries.rb for details).
-    - FakeWeb and WebMock both use extensive monkey patching to hook into their
-      supported HTTP libraries.  No monkey patching is used for Typhoeus, Excon or
-      Faraday.
-    - FakeWeb and WebMock cannot both be used at the same time.
+    - WebMock uses extensive monkey patching to hook into supported HTTP 
+      libraries.  No monkey patching is used for Typhoeus, Excon or Faraday.
     - Typhoeus, Excon, Faraday can be used together, and with either FakeWeb or WebMock.
+    - FakeWeb and WebMock cannot both be used at the same time.
 
   Regardless of which library you use, VCR takes care of all of the configuration
   for you.  You should not need to interact directly with FakeWeb, WebMock or the

data/features/getting_started.md

@@ -1,7 +1,7 @@
 ### Install it
 
     [sudo] gem install vcr
-    [sudo] gem install fakeweb
+    [sudo] gem install webmock
 
 ### Configure it
 
@@ -11,7 +11,7 @@ Create a file named `vcr_setup.rb` with content like:
 
     VCR.configure do |c|
       c.cassette_library_dir = 'vcr_cassettes'
-      c.hook_into :fakeweb
+      c.hook_into :webmock
     end
 
 Ensure this file is required by your test suite before any

data/features/hooks/before_playback.feature

@@ -58,7 +58,7 @@ Feature: before_playback hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
 
         c.before_playback do |interaction|
@@ -80,7 +80,7 @@ Feature: before_playback hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
 
         c.before_playback do |interaction, cassette|
@@ -106,7 +106,7 @@ Feature: before_playback hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
         c.before_playback { |i| i.ignore! }
       end
@@ -125,7 +125,7 @@ Feature: before_playback hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
 
         c.before_playback { puts "In before_playback hook 1" }
@@ -151,7 +151,7 @@ Feature: before_playback hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
 
         c.before_playback(:tag_2) do |i|

data/features/hooks/before_record.feature

@@ -33,7 +33,7 @@ Feature: before_record hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
 
         c.before_record do |i|
@@ -59,7 +59,7 @@ Feature: before_record hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
 
         c.before_record do |interaction, cassette|
@@ -84,7 +84,7 @@ Feature: before_record hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
         c.before_record { |i| i.ignore! }
       end
@@ -108,7 +108,7 @@ Feature: before_record hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
 
         c.before_record { puts "In before_record hook 1" }
@@ -138,7 +138,7 @@ Feature: before_record hook
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
 
         c.before_record(:tag_1) do

data/features/middleware/rack.feature

@@ -51,7 +51,7 @@ Feature: Rack
 
       VCR.configure do |c|
         c.cassette_library_dir = 'cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.allow_http_connections_when_no_cassette = true
       end
       """
@@ -78,7 +78,7 @@ Feature: Rack
 
       VCR.configure do |c|
         c.cassette_library_dir = 'cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.allow_http_connections_when_no_cassette = true
       end
       """

data/features/record_modes/all.feature

@@ -20,7 +20,7 @@ Feature: :all
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into                :fakeweb
+        c.hook_into                :webmock
         c.cassette_library_dir     = 'cassettes'
       end
       """

data/features/record_modes/new_episodes.feature

@@ -19,7 +19,7 @@ Feature: :new_episodes
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into                :fakeweb
+        c.hook_into                :webmock
         c.cassette_library_dir     = 'cassettes'
       end
       """

data/features/record_modes/none.feature

@@ -15,7 +15,7 @@ Feature: :none
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into                :fakeweb
+        c.hook_into                :webmock
         c.cassette_library_dir     = 'cassettes'
       end
       """

data/features/record_modes/once.feature

@@ -22,7 +22,7 @@ Feature: :once
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into                :fakeweb
+        c.hook_into                :webmock
         c.cassette_library_dir     = 'cassettes'
       end
       """

data/features/request_matching/custom_matcher.feature

@@ -111,7 +111,7 @@ Feature: Register and use a custom matcher
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
         c.register_request_matcher :port do |request_1, request_2|
           URI(request_1.uri).port == URI(request_2.uri).port

data/features/request_matching/headers.feature

@@ -84,6 +84,4 @@ Feature: Matching on Headers
       | c.hook_into :webmock  | patron                |
       | c.hook_into :webmock  | em-http-request       |
       | c.hook_into :excon    | excon                 |
-      | c.hook_into :faraday  | faraday (w/ net_http) |
-      | c.hook_into :faraday  | faraday (w/ typhoeus) |
 

data/features/request_matching/playback_repeats.feature

@@ -65,7 +65,7 @@ Feature: Playback repeats
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
       end
 

data/features/request_matching/uri_without_param.feature

@@ -70,7 +70,7 @@ Feature: URI without param(s)
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir = 'cassettes'
         c.default_cassette_options = {
           :match_requests_on => [:method,

data/features/support/env.rb

@@ -5,6 +5,7 @@ Bundler.setup
 require 'ruby-debug' if !defined?(RUBY_ENGINE) && RUBY_VERSION != '1.9.3' && !ENV['CI']
 
 require 'aruba/cucumber'
+require 'aruba/jruby' if RUBY_PLATFORM == 'java'
 
 additional_paths = []
 Before('@rspec-1') do

data/features/test_frameworks/cucumber.feature

@@ -14,21 +14,21 @@ Feature: Usage with Cucumber
     t.tags '@tag2', '@tag3'
 
     t.tag  '@tag3', :cassette => :options
-    t.tags '@tag4, '@tag5', :cassette => :options
+    t.tags '@tag4', '@tag5', :cassette => :options
     t.tag  '@vcr', :use_scenario_name => true
   end
   ```
 
-  VCR will use a cassette named "cucumber_tags/<tag_name>" for scenarios
-  with each of these tags (Unless the :use_scenario_name option is provided. See below).
+  VCR will use a cassette named `cucumber_tags/<tag_name>` for scenarios
+  with each of these tags (Unless the `:use_scenario_name` option is provided. See below).
   The configured `default_cassette_options` will be used, or you can override specific
   options by passing a hash as the last argument to `#tag` or `#tags`.
 
   You can also have VCR name your cassettes automatically according to the feature
-  and scenario name by providing :use_scenario_name => true to '#tag' or '#tags'.
-  In this case, the cassette will be named "<feature_name>/<scenario_name>".
+  and scenario name by providing `:use_scenario_name => true` to `#tag` or `#tags`.
+  In this case, the cassette will be named `<feature_name>/<scenario_name>`.
   For scenario outlines, VCR will record one cassette per row, and the cassettes
-  will be named "<feature_name>/<scenario_name>/<row_name>.
+  will be named `<feature_name>/<scenario_name>/<row_name>`.
 
   @exclude-jruby
   Scenario: Record HTTP interactions in a scenario by tagging it
@@ -47,7 +47,7 @@ Feature: Usage with Cucumber
       require 'vcr'
 
       VCR.configure do |c|
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.cassette_library_dir     = 'features/cassettes'
       end
 
@@ -148,4 +148,4 @@ Feature: Usage with Cucumber
     And the file "features/cassettes/nested_cassette.yml" should contain "Hello nested_cassette"
     And the file "features/cassettes/allowed.yml" should contain "Hello allowed"
     And the file "features/cassettes/VCR_example/tagged_scenario.yml" should contain "Hello localhost_request_1"
-    And the file "features/cassettes/VCR_example/tagged_scenario_outline/_foo_bar_.yml" should contain "Hello localhost_request_1"
+    And the file "features/cassettes/VCR_example/tagged_scenario_outline/_foo_bar_.yml" should contain "Hello localhost_request_1"

data/features/test_frameworks/rspec_macro.feature

@@ -67,7 +67,7 @@ Feature: Usage with RSpec macro
 
       VCR.configure do |c|
         c.cassette_library_dir = 'spec/cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
       end
 
       RSpec.configure do |c|
@@ -92,7 +92,7 @@ Feature: Usage with RSpec macro
 
       VCR.configure do |c|
         c.cassette_library_dir = 'spec/cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
       end
 
       Spec::Runner.configure do |c|

data/features/test_frameworks/rspec_metadata.feature

@@ -18,7 +18,7 @@ Feature: Usage with RSpec metadata
 
       VCR.configure do |c|
         c.cassette_library_dir = 'spec/cassettes'
-        c.hook_into :fakeweb
+        c.hook_into :webmock
         c.configure_rspec_metadata!
       end
 

data/gemfiles/typhoeus_old.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "jruby-openssl", :platforms=>:jruby

data/gemfiles/typhoeus_old.gemfile.lock

@@ -1,12 +1,12 @@
 PATH
-  remote: /Users/hungerandthirst/Code/Ruby/vcr
+  remote: /Users/myron/code/vcr
   specs:
-    vcr (2.3.0)
+    vcr (2.4.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,11 @@ 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)
-    columnize (0.3.6)
+    builder (3.2.0)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
     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 +28,7 @@ GEM
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     curb (0.8.3)
-    debugger (1.2.2)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.5)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.5)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     em-http-request (1.0.3)
       addressable (>= 2.2.3)
       cookiejar
@@ -46,12 +37,12 @@ GEM
       http_parser.rb (>= 0.5.3)
     em-socksify (0.2.1)
       eventmachine (>= 1.0.0.beta.4)
-    eventmachine (1.0.0)
-    excon (0.16.10)
+    eventmachine (1.0.1)
+    excon (0.20.0)
     fakeweb (1.3.0)
-    faraday (0.8.4)
+    faraday (0.8.6)
       multipart-post (~> 1.1)
-    ffi (1.2.0)
+    ffi (1.3.1)
     fuubar (1.0.0)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
@@ -61,26 +52,18 @@ GEM
       ruby-progressbar (~> 0.0.10)
     gherkin (2.9.3)
       json (>= 1.4.6)
-    github-markup (0.7.4)
+    github-markup (0.7.5)
     http_parser.rb (0.5.3)
-    httpclient (2.3.0.1)
-    json (1.6.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    method_source (0.8.1)
-    mime-types (1.19)
+    httpclient (2.3.3)
+    json (1.6.8)
+    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)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rack (1.3.6)
-    rack-protection (1.2.0)
+    rack (1.3.10)
+    rack-protection (1.4.0)
       rack
-    rake (0.9.5)
-    rbx-require-relative (0.0.9)
+    rake (0.9.6)
     redcarpet (1.17.2)
     redis (2.2.2)
     relish (0.6)
@@ -89,20 +72,15 @@ 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)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    rspec-mocks (2.13.0)
     ruby-progressbar (0.0.10)
     shoulda (2.9.2)
     simplecov (0.5.4)
@@ -113,9 +91,8 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    slop (3.3.3)
     term-ansicolor (1.0.7)
-    tilt (1.3.3)
+    tilt (1.3.4)
     timecop (0.3.5)
     typhoeus (0.4.2)
       ffi (~> 1.0)
@@ -124,7 +101,7 @@ GEM
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yajl-ruby (1.1.0)
-    yard (0.8.3)
+    yard (0.8.5.2)
 
 PLATFORMS
   ruby
@@ -135,7 +112,6 @@ DEPENDENCIES
   bundler (>= 1.0.7)
   cucumber (~> 1.1.4)
   curb (~> 0.8.0)
-  debugger
   em-http-request (~> 1.0.2)
   excon (>= 0.11.0, < 1.0)
   fakeweb (~> 1.3.0)
@@ -148,14 +124,12 @@ DEPENDENCIES
   json (~> 1.6.5)
   multi_json (~> 1.0.3)
   patron (~> 0.4.15)
-  pry
   rack (~> 1.3.6)
   rake (~> 0.9.2)
   redcarpet (~> 1.17.2)
   redis (~> 2.2.2)
   relish (~> 0.6)
   rspec (~> 2.11)
-  ruby-debug
   shoulda (~> 2.9.2)
   simplecov (~> 0.5.3)
   sinatra (~> 1.3.2)