Merge pull request vcr#326 from vcr/update_gems

Update gems

Gemfile.lock

@@ -7,16 +7,16 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.5)
-    appraisal (0.5.1)
+    appraisal (0.5.2)
       bundler
       rake
     archive-tar-minitar (0.5.2)
     aruba (0.5.3)
       childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bouncy-castle-java (1.5.0146.1)
-    builder (3.2.0)
+    bouncy-castle-java (1.5.0147)
+    builder (3.2.2)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.9)
@@ -30,34 +30,33 @@ GEM
       gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    curb (0.8.3)
-    debugger (1.3.3)
+    curb (0.8.4)
+    debugger (1.6.1)
       columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.2.0)
-    diff-lcs (1.2.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
+    diff-lcs (1.2.4)
     em-http-request (1.0.3)
       addressable (>= 2.2.3)
       cookiejar
       em-socksify
       eventmachine (>= 1.0.0.beta.4)
       http_parser.rb (>= 0.5.3)
-    em-socksify (0.2.1)
+    em-socksify (0.3.0)
       eventmachine (>= 1.0.0.beta.4)
-    ethon (0.5.10)
-      ffi (~> 1.3.0)
+    ethon (0.6.1)
+      ffi (>= 1.3.0)
       mime-types (~> 1.18)
-    eventmachine (1.0.1)
-    eventmachine (1.0.1-java)
-    excon (0.22.1)
+    eventmachine (1.0.3)
+    eventmachine (1.0.3-java)
+    excon (0.25.3)
     fakeweb (1.3.0)
-    faraday (0.8.6)
-      multipart-post (~> 1.1)
-    ffi (1.3.1)
-    ffi (1.3.1-java)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    ffi (1.9.0)
+    ffi (1.9.0-java)
     fuubar (1.0.0)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
@@ -72,57 +71,57 @@ GEM
     github-markup (0.7.5)
     http_parser.rb (0.5.3)
     http_parser.rb (0.5.3-java)
-    httpclient (2.3.3)
-    jruby-openssl (0.8.2)
-      bouncy-castle-java (>= 1.5.0146.1)
+    httpclient (2.3.4.1)
+    jruby-openssl (0.9.0)
+      bouncy-castle-java (>= 1.5.0147)
     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.21)
+    method_source (0.8.2)
+    mime-types (1.25)
     multi_json (1.0.4)
     multipart-post (1.2.0)
     patron (0.4.18)
-    pry (0.9.12)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry (0.9.12-java)
+    pry (0.9.12.2-java)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
       spoon (~> 0.0)
     rack (1.3.10)
-    rack-protection (1.4.0)
+    rack-protection (1.5.0)
       rack
     rake (0.9.6)
     rbx-require-relative (0.0.9)
     redcarpet (1.17.2)
     redis (2.2.2)
-    relish (0.6)
+    relish (0.7)
       archive-tar-minitar (>= 0.5.2)
       json (>= 1.4.6)
       rest-client (>= 1.6.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    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)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.14.3)
     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)
-    safe_yaml (0.9.4)
+    safe_yaml (0.9.7)
     shoulda (2.9.2)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
@@ -132,18 +131,21 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    slop (3.4.3)
-    spoon (0.0.1)
-    term-ansicolor (1.0.7)
-    tilt (1.3.4)
+    slop (3.4.6)
+    spoon (0.0.4)
+      ffi
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    tilt (1.4.1)
     timecop (0.3.5)
-    typhoeus (0.6.2)
-      ethon (~> 0.5.10)
+    tins (0.10.0)
+    typhoeus (0.6.5)
+      ethon (~> 0.6.1)
     webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     yajl-ruby (1.1.0)
-    yard (0.8.5.2)
+    yard (0.8.7.2)
 
 PLATFORMS
   java

features/request_matching/headers.feature

@@ -83,5 +83,4 @@ Feature: Matching on Headers
       | c.hook_into :webmock  | curb                  |
       | c.hook_into :webmock  | patron                |
       | c.hook_into :webmock  | em-http-request       |
-      | c.hook_into :excon    | excon                 |
 

gemfiles/typhoeus_old.gemfile.lock

@@ -6,43 +6,43 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.3)
-    appraisal (0.5.1)
+    addressable (2.3.5)
+    appraisal (0.5.2)
       bundler
       rake
     archive-tar-minitar (0.5.2)
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
-      ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
-    builder (3.2.0)
+      rspec-expectations (>= 2.7.0)
+    builder (3.2.2)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     cookiejar (0.3.0)
-    crack (0.3.2)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    curb (0.8.3)
-    diff-lcs (1.2.1)
+    curb (0.8.4)
+    diff-lcs (1.2.4)
     em-http-request (1.0.3)
       addressable (>= 2.2.3)
       cookiejar
       em-socksify
       eventmachine (>= 1.0.0.beta.4)
       http_parser.rb (>= 0.5.3)
-    em-socksify (0.2.1)
+    em-socksify (0.3.0)
       eventmachine (>= 1.0.0.beta.4)
-    eventmachine (1.0.1)
-    excon (0.22.1)
+    eventmachine (1.0.3)
+    excon (0.25.3)
     fakeweb (1.3.0)
-    faraday (0.8.6)
-      multipart-post (~> 1.1)
-    ffi (1.3.1)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    ffi (1.9.0)
     fuubar (1.0.0)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
@@ -54,34 +54,35 @@ GEM
       json (>= 1.4.6)
     github-markup (0.7.5)
     http_parser.rb (0.5.3)
-    httpclient (2.3.3)
+    httpclient (2.3.4.1)
     json (1.6.8)
-    mime-types (1.21)
+    mime-types (1.25)
     multi_json (1.0.4)
     multipart-post (1.2.0)
     patron (0.4.18)
     rack (1.3.10)
-    rack-protection (1.4.0)
+    rack-protection (1.5.0)
       rack
     rake (0.9.6)
     redcarpet (1.17.2)
     redis (2.2.2)
-    relish (0.6)
+    relish (0.7)
       archive-tar-minitar (>= 0.5.2)
       json (>= 1.4.6)
       rest-client (>= 1.6.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    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)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.14.3)
     ruby-progressbar (0.0.10)
+    safe_yaml (0.9.7)
     shoulda (2.9.2)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
@@ -91,24 +92,26 @@ GEM
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    term-ansicolor (1.0.7)
-    tilt (1.3.4)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    tilt (1.4.1)
     timecop (0.3.5)
+    tins (0.10.0)
     typhoeus (0.4.2)
       ffi (~> 1.0)
       mime-types (~> 1.18)
     webmock (1.8.11)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yajl-ruby (1.1.0)
-    yard (0.8.5.2)
+    yard (0.8.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
-  aruba (~> 0.4.11)
+  aruba (~> 0.5)
   bundler (>= 1.0.7)
   cucumber (~> 1.1.4)
   curb (~> 0.8.0)

lib/vcr/middleware/excon.rb

@@ -2,7 +2,7 @@
 require 'vcr/request_handler'
 require 'vcr/util/version_checker'
 
-VCR::VersionChecker.new('Excon', Excon::VERSION, '0.22.0', '0.22').check_version!
+VCR::VersionChecker.new('Excon', Excon::VERSION, '0.22.0', '0.25').check_version!
 
 module VCR
   # Contains middlewares for use with different libraries.

spec/spec_helper.rb

@@ -41,7 +41,7 @@
 require "support/http_library_adapters"
 
 module VCR
-  SPEC_ROOT = File.dirname(__FILE__)
+  SPEC_ROOT = File.dirname(File.expand_path('.', __FILE__))
 
   def reset!(hook = :fakeweb)
     instance_variables.each do |ivar|
@@ -60,6 +60,10 @@ def reset!(hook = :fakeweb)
     expectations.syntax = :expect
   end
 
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :expect
+  end
+
   tmp_dir = File.expand_path('../../tmp/cassette_library_dir', __FILE__)
   config.before(:each) do
     unless example.metadata[:skip_vcr_reset]

spec/support/configuration_stubbing.rb

@@ -0,0 +1,8 @@
+shared_context "configuration stubbing" do
+  let(:config) { double("VCR::Configuration") }
+
+  before do
+    allow(VCR).to receive(:configuration) { config }
+  end
+end
+

spec/support/http_library_adapters.rb

@@ -223,7 +223,7 @@ def make_http_request(method, url, body = nil, headers = {})
   end
 
   def normalize_request_headers(headers)
-    headers
+    headers.merge('User-Agent' => [Excon::USER_AGENT])
   end
 end
 

spec/support/shared_example_groups/excon.rb

@@ -1,7 +1,7 @@
 shared_examples "Excon streaming" do
   context "when Excon's streaming API is used" do
     it 'properly records and plays back the response' do
-      VCR.stub(:real_http_connections_allowed? => true)
+      allow(VCR).to receive(:real_http_connections_allowed?).and_return(true)
       recorded, played_back = [1, 2].map do
         chunks = []
 
@@ -19,7 +19,7 @@
     end
 
     it 'properly records and plays back the response for unexpected status' do
-      VCR.stub(:real_http_connections_allowed? => true)
+      allow(VCR).to receive(:real_http_connections_allowed?).and_return(true)
       recorded, played_back = [1, 2].map do
         chunks = []