vcr 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c6e5ef325a46f12137b6d559a35e1664c684a7f
-  data.tar.gz: c2bcdd8e42555694ec5cf081eccb74bb01ebd89f
+  metadata.gz: 3bd06000e811a9f066f1d73a5d955bbb4ad3733e
+  data.tar.gz: 2784446a0155cfef8d7389208213b5b86aad1b8e
 SHA512:
-  metadata.gz: 687d5591fedaf5c58051814b07f7b5eb9e2a42d6179ddb946d9124ebbf07d58c2edf4bb90a16b80553e36ab93f91036fb25e51f2324bcb49ec1fd90795e7edba
-  data.tar.gz: 85865a69856a58f4ad35f2fad7d8231071ad2e8c4bfc34b5d308a7bb90fdd31bec403e58a1df8bf7d77076eadec0351aa25593ab7b29aabdbfb602a56b3759df
+  metadata.gz: cb7de4b059e58371b9669c4bf72c3c5f806594e5f9cbd614ed5e41bbbd40d30f38a2bf5e2e079da0b139989aaca57080134d736f8680ff0344191f47a2ceba45
+  data.tar.gz: 1cf77c3a9198f1995721acbabd3470f2735d7e682280f218bdc46385342923beb6956080522e37761132f60ea1d4b67e4a5cfac5bd33d6471df22105a60cb766

data/features/CHANGELOG.md

@@ -0,0 +1 @@
+/Users/tony/src/vcr/CHANGELOG.md

data/features/CONTRIBUTING.md

@@ -0,0 +1 @@
+/Users/tony/src/vcr/CONTRIBUTING.md

data/features/LICENSE.md

@@ -0,0 +1 @@
+/Users/tony/src/vcr/LICENSE

data/features/README.md

@@ -0,0 +1 @@
+/Users/tony/src/vcr/README.md

data/features/Upgrade.md

@@ -0,0 +1 @@
+/Users/tony/src/vcr/Upgrade.md

data/features/configuration/debug_logging.feature

@@ -1,4 +1,3 @@
-@exclude-18
 Feature: Debug Logging
 
   Use the `debug_logger` option to set an IO-like object that VCR will log

data/features/configuration/hook_into.feature

@@ -21,7 +21,7 @@ Feature: hook_into
   There are some addiitonal trade offs to consider when deciding which
   option to use:
 
-    - WebMock uses extensive monkey patching to hook into supported HTTP 
+    - 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.
@@ -85,7 +85,7 @@ Feature: hook_into
       | c.hook_into :faraday  | faraday (w/ net_http) |
       | c.hook_into :faraday  | faraday (w/ typhoeus) |
 
-  @exclude-jruby @exclude-rbx @exclude-18
+  @exclude-jruby @exclude-rbx
   Scenario Outline: Use Typhoeus, Excon and Faraday in combination with FakeWeb or WebMock
     Given a file named "hook_into_multiple.rb" with:
       """ruby

data/features/hooks/around_http_request.feature

@@ -1,4 +1,4 @@
-@exclude-18 @exclude-1.9.3p327
+@exclude-1.9.3p327
 Feature: around_http_request hook
 
   The `around_http_request` hook wraps each HTTP request. It can be used

data/lib/vcr/library_hooks/webmock.rb

@@ -4,25 +4,42 @@ require 'webmock'
 
 VCR::VersionChecker.new('WebMock', WebMock.version, '1.8.0').check_version!
 
+WebMock.enable!
+
 module VCR
   class LibraryHooks
     # @private
     module WebMock
       extend self
 
-      attr_accessor :global_hook_disabled
-      alias global_hook_disabled? global_hook_disabled
+      @global_hook_disabled_requests = {}
 
-      def with_global_hook_disabled
-        self.global_hook_disabled = true
+      def with_global_hook_disabled(request)
+        global_hook_disabled_requests << request
 
         begin
           yield
         ensure
-          self.global_hook_disabled = false
+          global_hook_disabled_requests.delete(request)
         end
       end
 
+      def global_hook_disabled?(request)
+        requests = @global_hook_disabled_requests[Thread.current.object_id]
+        requests && requests.include?(request)
+      end
+
+      def global_hook_disabled_requests
+        requests = @global_hook_disabled_requests[Thread.current.object_id]
+        return requests if requests
+
+        ObjectSpace.define_finalizer(Thread.current, lambda {
+          @global_hook_disabled_requests.delete(Thread.current.object_id)
+        })
+
+        @global_hook_disabled_requests[Thread.current.object_id] = []
+      end
+
       # @private
       module Helpers
         def vcr_request_for(webmock_request)
@@ -88,7 +105,7 @@ module VCR
 
         def externally_stubbed?
           # prevent infinite recursion...
-          VCR::LibraryHooks::WebMock.with_global_hook_disabled do
+          VCR::LibraryHooks::WebMock.with_global_hook_disabled(request) do
             ::WebMock.registered_request?(request)
           end
         end
@@ -124,7 +141,7 @@ module VCR
       extend Helpers
 
       ::WebMock.globally_stub_request do |req|
-        global_hook_disabled? ? nil : RequestHandler.new(req).handle
+        global_hook_disabled?(req) ? nil : RequestHandler.new(req).handle
       end
 
       ::WebMock.after_request(:real_requests_only => true) do |request, response|

data/lib/vcr/util/internet_connection.rb

@@ -13,7 +13,7 @@ module VCR
     module Ping
       def pingecho(host, timeout=5, service="echo")
         begin
-          timeout(timeout) do
+          Timeout.timeout(timeout) do
             s = TCPSocket.new(host, service)
             s.close
           end

data/lib/vcr/version.rb

@@ -10,7 +10,7 @@ module VCR
   #   * `parts` [Array<Integer>] List of the version parts.
   def version
     @version ||= begin
-      string = '3.0.1'
+      string = '3.0.2'
 
       def string.parts
         split('.').map { |p| p.to_i }

data/spec/lib/vcr/library_hooks/webmock_spec.rb

@@ -71,7 +71,6 @@ describe "WebMock hook", :with_monkey_patches => :webmock do
   end
 
   http_libs = %w[net/http patron httpclient em-http-request curb typhoeus excon]
-  http_libs.delete('patron') if RUBY_VERSION == '1.8.7'
   http_libs.each do |lib|
     other = []
     other << :status_message_not_exposed if lib == 'excon'

data/spec/lib/vcr/middleware/faraday_spec.rb

@@ -3,7 +3,6 @@ require 'vcr/library_hooks/faraday'
 
 describe VCR::Middleware::Faraday do
   http_libs = %w[ typhoeus net_http patron ]
-  http_libs.delete('patron') if RUBY_VERSION == '1.8.7'
   http_libs.each do |lib|
     it_behaves_like 'a hook into an HTTP library', :faraday, "faraday (w/ #{lib})",
       :status_message_not_exposed,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcr
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Myron Marston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -326,6 +326,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- features/CHANGELOG.md
+- features/CONTRIBUTING.md
+- features/LICENSE.md
+- features/README.md
+- features/Upgrade.md
 - features/about_these_examples.md
 - features/cassettes/allow_unused_http_interactions.feature
 - features/cassettes/automatic_re_recording.feature
@@ -487,7 +492,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -495,7 +500,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Record your test suite's HTTP interactions and replay them during future
@@ -564,6 +569,7 @@ test_files:
 - features/cassettes/naming.feature
 - features/cassettes/no_cassette.feature
 - features/cassettes/update_content_length_header.feature
+- features/CHANGELOG.md
 - features/configuration/allow_http_connections_when_no_cassette.feature
 - features/configuration/cassette_library_dir.feature
 - features/configuration/debug_logging.feature
@@ -574,6 +580,7 @@ test_files:
 - features/configuration/preserve_exact_body_bytes.feature
 - features/configuration/query_parser.feature
 - features/configuration/uri_parser.feature
+- features/CONTRIBUTING.md
 - features/getting_started.md
 - features/hooks/after_http_request.feature
 - features/hooks/around_http_request.feature
@@ -582,8 +589,10 @@ test_files:
 - features/hooks/before_record.feature
 - features/http_libraries/em_http_request.feature
 - features/http_libraries/net_http.feature
+- features/LICENSE.md
 - features/middleware/faraday.feature
 - features/middleware/rack.feature
+- features/README.md
 - features/record_modes/all.feature
 - features/record_modes/new_episodes.feature
 - features/record_modes/none.feature
@@ -608,4 +617,5 @@ test_files:
 - features/test_frameworks/rspec_macro.feature
 - features/test_frameworks/rspec_metadata.feature
 - features/test_frameworks/test_unit.feature
+- features/Upgrade.md
 has_rdoc: