vcr 4.0.0 → 6.2.0

data/lib/vcr/util/internet_connection.rb

@@ -1,31 +1,25 @@
 module VCR
   # Ruby 1.8 provides Ping.pingecho, but it was removed in 1.9.
-  # So we try requiring it, and if that fails, define it ourselves.
-  begin
-    require 'ping'
-    Ping = ::Ping
-  rescue LoadError
-    # This is copied, verbatim, from Ruby 1.8.7's ping.rb.
-    require 'timeout'
-    require "socket"
+  # This is copied, verbatim, from Ruby 1.8.7's ping.rb.
+  require 'timeout'
+  require "socket"
 
-    # @private
-    module Ping
-      def pingecho(host, timeout=5, service="echo")
-        begin
-          Timeout.timeout(timeout) do
-            s = TCPSocket.new(host, service)
-            s.close
-          end
-        rescue Errno::ECONNREFUSED
-          return true
-        rescue Timeout::Error, StandardError
-          return false
+  # @private
+  module Ping
+    def pingecho(host, timeout=5, service="echo")
+      begin
+        Timeout.timeout(timeout) do
+          s = TCPSocket.new(host, service)
+          s.close
         end
+      rescue Errno::ECONNREFUSED
         return true
+      rescue Timeout::Error, StandardError
+        return false
       end
-      module_function :pingecho
+      return true
     end
+    module_function :pingecho
   end
 
   # @private

data/lib/vcr/version.rb

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

data/lib/vcr.rb

@@ -52,7 +52,7 @@ module VCR
   # Inserts the named cassette using the given cassette options.
   # New HTTP interactions, if allowed by the cassette's `:record` option, will
   # be recorded to the cassette. The cassette's existing HTTP interactions
-  # will be used to stub requests, unless prevented by the cassete's
+  # will be used to stub requests, unless prevented by the cassette's
   # `:record` option.
   #
   # @example
@@ -107,6 +107,12 @@ module VCR
   # @option options :persist_with [Symbol] Which cassette persister to
   #  use. Defaults to :file_system. You can also register and use a
   #  custom persister.
+  # @option options :persister_options [Hash] Pass options to the
+  #  persister specified in `persist_with`. Currently available options for the file_system persister:
+  #    - `:downcase_cassette_names`: when `true`, names of cassettes will be
+  #      normalized in lowercase before reading and writing, which can avoid
+  #      confusion when using both case-sensitive and case-insensitive file
+  #      systems.
   # @option options :preserve_exact_body_bytes [Boolean] Whether or not
   #  to base64 encode the bytes of the requests and responses for this cassette
   #  when serializing it. See also `VCR::Configuration#preserve_exact_body_bytes`.
@@ -186,6 +192,9 @@ module VCR
 
     begin
       call_block(block, cassette)
+    rescue StandardError
+      cassette.run_failed!
+      raise
     ensure
       eject_cassette
     end
@@ -194,18 +203,21 @@ module VCR
   # Inserts multiple cassettes the given names
   #
   # @example
-  # cassettes = [
-  #  { name: 'github' },
-  #  { name: 'apple', options: { erb: true } }
-  # ]
-  # VCR.use_cassettes() do
-  #   # make multiple HTTP requests
-  # end
+  #   cassettes = [
+  #    { name: 'github' },
+  #    { name: 'apple', options: { erb: true } }
+  #   ]
+  #   VCR.use_cassettes(cassettes) do
+  #     # make multiple HTTP requests
+  #   end
   def use_cassettes(cassettes, &block)
-    return use_cassette(cassettes.last[:name]) { block.call } if cassettes.length == 1
     cassette = cassettes.pop
-    use_cassette(cassette[:name], cassette[:options]) do
-      use_cassettes(cassettes, &block)
+    use_cassette(cassette[:name], cassette[:options] || {}) do
+      if cassettes.empty?
+        block.call
+      else
+        use_cassettes(cassettes, &block)
+      end
     end
   end
 
@@ -254,6 +266,7 @@ module VCR
   # @see #turn_off!
   # @see #turn_on!
   # @see #turned_on?
+  # @see #turned_on
   def turned_off(options = {})
     turn_off!(options)
 
@@ -289,11 +302,28 @@ module VCR
     set_context_value(:turned_off, true)
   end
 
+  # Turns on VCR, for the duration of a block.
+  # @param (see #turn_off!)
+  # @return [void]
+  # @see #turn_off!
+  # @see #turned_off
+  # @see #turned_on?
+  def turned_on(options = {})
+    turn_on!
+
+    begin
+      yield
+    ensure
+      turn_off!(options)
+    end
+  end
+
   # Turns on VCR, if it has previously been turned off.
   # @return [void]
   # @see #turn_off!
   # @see #turned_off
   # @see #turned_on?
+  # @see #turned_on
   def turn_on!
     set_context_value(:turned_off, false)
   end
@@ -305,6 +335,9 @@ module VCR
   # @see #turn_off!
   # @see #turned_off
   def turned_on?
+    linked_context = current_context[:linked_context]
+    return !linked_context[:turned_off] if linked_context
+
     !context_value(:turned_off)
   end
 

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: vcr
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Myron Marston
-autorequire: 
+- Kurtis Rainbolt-Greene
+- Olle Jonsson
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +46,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -151,63 +153,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 1.0.0.beta1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.14.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.14.14
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: excon
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,21 +235,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.62.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.62.0
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -307,7 +321,7 @@ dependencies:
 description: Record your test suite's HTTP interactions and replay them during future
   test runs for fast, deterministic, accurate tests.
 email:
-- myron.marston@gmail.com
+- kurtis@rainbolt-greene.online
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -332,7 +346,6 @@ files:
 - lib/vcr/library_hooks/excon.rb
 - lib/vcr/library_hooks/faraday.rb
 - lib/vcr/library_hooks/typhoeus.rb
-- lib/vcr/library_hooks/typhoeus_0.4.rb
 - lib/vcr/library_hooks/webmock.rb
 - lib/vcr/linked_cassette.rb
 - lib/vcr/middleware/excon.rb
@@ -352,11 +365,12 @@ files:
 - lib/vcr/util/variable_args_block_caller.rb
 - lib/vcr/util/version_checker.rb
 - lib/vcr/version.rb
-homepage: https://relishapp.com/vcr/vcr/docs
+homepage: https://benoittgt.github.io/vcr
 licenses:
+- Hippocratic-2.1
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -364,16 +378,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.4.14
+signing_key:
 specification_version: 4
 summary: Record your test suite's HTTP interactions and replay them during future
   test runs for fast, deterministic, accurate tests.

data/lib/vcr/library_hooks/typhoeus_0.4.rb

@@ -1,103 +0,0 @@
-VCR::VersionChecker.new('Typhoeus', Typhoeus::VERSION, '0.3.2').check_version!
-
-module VCR
-  class LibraryHooks
-    # @private
-    module Typhoeus
-      # @private
-      class RequestHandler < ::VCR::RequestHandler
-        attr_reader :request
-        def initialize(request)
-          @request = request
-        end
-
-        def vcr_request
-          @vcr_request ||= VCR::Request.new \
-            request.method,
-            request.url,
-            request.body,
-            request.headers
-        end
-
-      private
-
-        def externally_stubbed?
-          ::Typhoeus::Hydra.stubs.detect { |stub| stub.matches?(request) }
-        end
-
-        def set_typed_request_for_after_hook(*args)
-          super
-          request.instance_variable_set(:@__typed_vcr_request, @after_hook_typed_request)
-        end
-
-        def on_unhandled_request
-          invoke_after_request_hook(nil)
-          super
-        end
-
-        def on_stubbed_by_vcr_request
-          ::Typhoeus::Response.new \
-            :http_version   => stubbed_response.http_version,
-            :code           => stubbed_response.status.code,
-            :status_message => stubbed_response.status.message,
-            :headers_hash   => stubbed_response_headers,
-            :body           => stubbed_response.body
-        end
-
-        def stubbed_response_headers
-          @stubbed_response_headers ||= {}.tap do |hash|
-            stubbed_response.headers.each do |key, values|
-              hash[key] = values.size == 1 ? values.first : values
-            end if stubbed_response.headers
-          end
-        end
-      end
-
-      # @private
-      def self.vcr_response_from(response)
-        VCR::Response.new \
-          VCR::ResponseStatus.new(response.code, response.status_message),
-          response.headers_hash,
-          response.body,
-          response.http_version
-      end
-
-      ::Typhoeus::Hydra.after_request_before_on_complete do |request|
-        unless VCR.library_hooks.disabled?(:typhoeus)
-          vcr_response = vcr_response_from(request.response)
-          typed_vcr_request = request.send(:remove_instance_variable, :@__typed_vcr_request)
-
-          unless request.response.mock?
-            http_interaction = VCR::HTTPInteraction.new(typed_vcr_request, vcr_response)
-            VCR.record_http_interaction(http_interaction)
-          end
-
-          VCR.configuration.invoke_hook(:after_http_request, typed_vcr_request, vcr_response)
-        end
-      end
-
-      ::Typhoeus::Hydra.register_stub_finder do |request|
-        VCR::LibraryHooks::Typhoeus::RequestHandler.new(request).handle
-      end
-    end
-  end
-end
-
-# @private
-module Typhoeus
-  class << Hydra
-    # ensure HTTP requests are always allowed; VCR takes care of disallowing
-    # them at the appropriate times in its hook
-    def allow_net_connect_with_vcr?(*args)
-      VCR.turned_on? ? true : allow_net_connect_without_vcr?
-    end
-
-    alias allow_net_connect_without_vcr? allow_net_connect?
-    alias allow_net_connect? allow_net_connect_with_vcr?
-  end unless Hydra.respond_to?(:allow_net_connect_with_vcr?)
-end
-
-VCR.configuration.after_library_hooks_loaded do
-  ::Kernel.warn "WARNING: VCR's Typhoeus 0.4 integration is deprecated and will be removed in VCR 3.0."
-end
-