vcr 1.3.2 → 1.3.3

data/.gitignore

@@ -25,3 +25,4 @@ features/fixtures/vcr_cassettes/**/temp/
 *.rbc
 .bundle
 tmp
+rerun.txt

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.3.3 (November 21, 2010)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.3.2...v1.3.3)
+
+* In specs, hit a local sinatra server rather than example.com.  This makes
+  the specs faster and removes an external dependency.  The specs can pass
+  without being online!
+* Raise an explicit error when the http stubbing library is not configured
+  (rather than letting the user get a confusing error later).
+* Test against the latest WebMock release (1.6.1) (no changes required).
+* Fix a few cucumber scenarios so they pass on rubinius and jruby.
+
 ## 1.3.2 (November 16, 2010)
 
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v1.3.1...v1.3.2)
@@ -29,6 +41,8 @@
 * Add support for [Typhoeus](https://github.com/pauldix/typhoeus).  Thanks to
   [David Balatero](https://github.com/dbalatero) for making the necessary changes in Typhoeus
   to support VCR.
+* Remove FakeWeb/WebMock inference logic.  You _must_ configure the http stubbing library
+  explicitly now.
 
 ## 1.2.0 (October 13, 2010)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcr (1.3.2)
+    vcr (1.3.3)
 
 GEM
   remote: http://rubygems.org/
@@ -60,7 +60,7 @@ GEM
     rake (0.8.7)
     rb-fsevent (0.3.6)
     rcov (0.9.9)
-    relish (0.1.1)
+    relish (0.1.5)
       archive-tar-minitar (~> 0.5.2)
       json (~> 1.4.6)
       rest-client (~> 1.6.1)
@@ -98,7 +98,7 @@ GEM
     tilt (1.1)
     timecop (0.3.5)
     typhoeus (0.2.0)
-    webmock (1.6.0)
+    webmock (1.6.1)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
 
@@ -108,7 +108,7 @@ PLATFORMS
 
 DEPENDENCIES
   aruba (~> 0.2.1)
-  bundler (~> 1.0.0)
+  bundler (~> 1.0.7)
   cucumber (~> 0.9.4)
   curb (~> 0.7.8)
   em-http-request (~> 0.2.7)

data/Rakefile

@@ -12,7 +12,7 @@ end
 desc "Run all examples using rcov"
 RSpec::Core::RakeTask.new :rcov => :cleanup_rcov_files do |t|
   t.rcov = true
-  t.rcov_opts =  %[-Ilib -Ispec --exclude "spec/*,gems/*" --text-report --sort coverage --aggregate coverage.data]
+  t.rcov_opts =  %[-Ilib -Ispec --exclude "spec/*,gems/*,ping,basic_object" --text-report --sort coverage --aggregate coverage.data]
 end
 
 task :cleanup_rcov_files do
@@ -26,7 +26,9 @@ task :default => [:spec, :cucumber]
 
 desc "Push cukes to relishapp using the relish-client-gem"
 task :relish do
-  sh "relish push vcr"
+  require 'vcr/version'
+  sh "relish versions:add myronmarston/vcr:#{VCR.version}"
+  sh "relish push vcr:#{VCR.version}"
 end
 
 task :release => :relish

data/TODO.md

@@ -1,4 +1,2 @@
-* use `expect { }.to` rather than `lambda { }.should` in specs.
 * Use fakefs gem instead of using temp_dir in specs.
-* Use localhost server in specs instead of hitting example.com.
 * Fix #method vs .method in specs.

data/features/cassettes/no_cassette.feature

@@ -25,7 +25,7 @@ Feature: Error for HTTP request made when no cassette is in use
     Then it should fail with "<error>"
     And the output should contain each of the following:
       | You can use VCR to automatically record this request and replay it later. |
-      | from no_cassette_error.rb:11                                              |
+      | no_cassette_error.rb:11                                                   |
 
     Examples:
       | stub_with  | http_lib        | error                              |

data/features/step_definitions/cli_steps.rb

@@ -47,6 +47,14 @@ Given /^the directory "([^"]*)" does not exist$/ do |dir|
   check_directory_presence([dir], false)
 end
 
+Given /^a previously recorded cassette file "([^"]*)" with:$/ do |file_name, content|
+  create_file(file_name, normalize_cassette_yaml(content))
+end
+
+Given /^(\d+) days have passed since the cassette was recorded$/ do |day_count|
+  set_env('DAYS_PASSED', day_count)
+end
+
 Then /^the file "([^"]*)" should exist$/ do |file_name|
   check_file_presence([file_name], true)
 end
@@ -66,17 +74,9 @@ Then /^the file "([^"]*)" should contain YAML like:$/ do |file_name, expected_co
   normalize_cassette_structs(actual_content).should == normalize_cassette_structs(expected_content)
 end
 
-Given /^a previously recorded cassette file "([^"]*)" with:$/ do |file_name, content|
-  create_file(file_name, normalize_cassette_yaml(content))
-end
-
 Then /^the file "([^"]*)" should contain each of these:$/ do |file_name, table|
   table.raw.flatten.each do |string|
     check_file_content(file_name, string, true)
   end
 end
 
-Given /^(\d+) days have passed since the cassette was recorded$/ do |day_count|
-  set_env('DAYS_PASSED', day_count)
-end
-

data/features/support/vcr_cucumber_helpers.rb

@@ -5,7 +5,16 @@ $LOAD_PATH.unshift '../../lib'  unless $LOAD_PATH.include?('../../lib')
 
 RUNNING_UNDER_ARUBA = File.dirname(__FILE__) == '.' || File.dirname(__FILE__) =~ /aruba/
 
-require 'support/fixnum_extension' if RUNNING_UNDER_ARUBA
+if RUNNING_UNDER_ARUBA
+  require 'support/fixnum_extension'
+  require 'vcr/internet_connection'
+
+  # pretend we're always on the internet (so that we don't have an
+  # internet connection dependency for our cukes)
+  VCR::InternetConnection.class_eval do
+    def available?; true; end
+  end
+end
 
 if ENV['DAYS_PASSED']
   require 'timecop'

data/lib/vcr/cassette.rb

@@ -7,7 +7,7 @@ module VCR
   class Cassette
     class MissingERBVariableError < NameError; end
 
-    VALID_RECORD_MODES = [:all, :none, :new_episodes].freeze
+    VALID_RECORD_MODES = [:all, :none, :new_episodes]
 
     attr_reader :name, :record_mode, :match_requests_on, :erb, :re_record_interval
 

data/lib/vcr/config.rb

@@ -16,11 +16,14 @@ module VCR
         @default_cassette_options
       end
 
-      attr_reader :http_stubbing_libraries
       def stub_with(*http_stubbing_libraries)
         @http_stubbing_libraries = http_stubbing_libraries
       end
 
+      def http_stubbing_libraries
+        @http_stubbing_libraries ||= []
+      end
+
       def ignore_localhost=(value)
         VCR.http_stubbing_adapter && VCR.http_stubbing_adapter.ignore_localhost = value
         @ignore_localhost = value

data/lib/vcr/http_stubbing_adapters/common.rb

@@ -10,8 +10,8 @@ module VCR
     module Common
       def self.add_vcr_info_to_exception_message(exception_klass)
         exception_klass.class_eval do
-          def message
-            super + ".  " + VCR::HttpStubbingAdapters::Common::RECORDING_INSTRUCTIONS
+          def initialize(message)
+            super(message + '.  ' + VCR::HttpStubbingAdapters::Common::RECORDING_INSTRUCTIONS)
           end
         end
       end

data/lib/vcr/http_stubbing_adapters/fakeweb.rb

@@ -7,7 +7,7 @@ module VCR
       include VCR::HttpStubbingAdapters::Common
       extend self
 
-      UNSUPPORTED_REQUEST_MATCH_ATTRIBUTES = [:body, :headers].freeze
+      UNSUPPORTED_REQUEST_MATCH_ATTRIBUTES = [:body, :headers]
       LOCALHOST_REGEX = %r|\Ahttps?://((\w+:)?\w+@)?(#{VCR::LOCALHOST_ALIASES.map { |a| Regexp.escape(a) }.join('|')})(:\d+)?/|i
 
       MINIMUM_VERSION = '1.3.0'

data/lib/vcr/request_matcher.rb

@@ -2,8 +2,8 @@ require 'set'
 
 module VCR
   class RequestMatcher
-    VALID_MATCH_ATTRIBUTES = [:method, :uri, :host, :path, :headers, :body].freeze
-    DEFAULT_MATCH_ATTRIBUTES = [:method, :uri].freeze
+    VALID_MATCH_ATTRIBUTES = [:method, :uri, :host, :path, :headers, :body]
+    DEFAULT_MATCH_ATTRIBUTES = [:method, :uri]
 
     attr_reader :request, :match_attributes
 

data/lib/vcr/version.rb

@@ -3,7 +3,7 @@ module VCR
 
   def version
     @version ||= begin
-      string = '1.3.2'
+      string = '1.3.3'
 
       def string.parts; VCR.version.split('.').map { |p| p.to_i }; end
       def string.major; parts[0]; end

data/script/full_build

@@ -1 +1 @@
-rvm 1.8.6,1.8.7,1.9.1,1.9.2,ree,jruby,rbx-head rake -f script/FullBuildRakeFile build | tee tmp/full_build.out
+rvm 1.8.6,1.8.7,1.9.1,1.9.2,ree,jruby,rbx rake -f script/FullBuildRakeFile build | tee tmp/full_build.out

data/spec/cassette_spec.rb

@@ -52,11 +52,11 @@ describe VCR::Cassette do
   describe 'on creation' do
     it 'raises an error with a helpful message when loading an old unsupported cassette' do
       VCR::Config.cassette_library_dir = File.expand_path(File.dirname(__FILE__) + "/fixtures/#{YAML_SERIALIZATION_VERSION}")
-      lambda { VCR::Cassette.new('0_3_1_cassette') }.should raise_error(/The VCR cassette 0_3_1_cassette.yml uses an old format that is now deprecated/)
+      expect { VCR::Cassette.new('0_3_1_cassette') }.to raise_error(/The VCR cassette 0_3_1_cassette.yml uses an old format that is now deprecated/)
     end
 
     it "raises an error if given an invalid record mode" do
-      lambda { VCR::Cassette.new(:test, :record => :not_a_record_mode) }.should raise_error(ArgumentError)
+      expect { VCR::Cassette.new(:test, :record => :not_a_record_mode) }.to raise_error(ArgumentError)
     end
 
     it 'raises an error if given invalid options' do
@@ -266,7 +266,7 @@ describe VCR::Cassette do
       cassette = VCR::Cassette.new(:eject_test)
       cassette.stub!(:new_recorded_interactions).and_return(recorded_interactions)
 
-      lambda { cassette.eject }.should change { File.exist?(cassette.file) }.from(false).to(true)
+      expect { cassette.eject }.to change { File.exist?(cassette.file) }.from(false).to(true)
       saved_recorded_interactions = File.open(cassette.file, "r") { |f| YAML.load(f.read) }
       saved_recorded_interactions.should == recorded_interactions
     end
@@ -276,7 +276,7 @@ describe VCR::Cassette do
       cassette = VCR::Cassette.new('subdirectory/test_cassette')
       cassette.stub!(:new_recorded_interactions).and_return(recorded_interactions)
 
-      lambda { cassette.eject }.should change { File.exist?(cassette.file) }.from(false).to(true)
+      expect { cassette.eject }.to change { File.exist?(cassette.file) }.from(false).to(true)
       saved_recorded_interactions = File.open(cassette.file, "r") { |f| YAML.load(f.read) }
       saved_recorded_interactions.should == recorded_interactions
     end
@@ -300,7 +300,7 @@ describe VCR::Cassette do
         it "does not re-write to disk the previously recorded interactions if there are no new ones" do
           yaml_file = subject.file
           File.should_not_receive(:open).with(subject.file, 'w')
-          lambda { subject.eject }.should_not change { File.mtime(yaml_file) }
+          expect { subject.eject }.to_not change { File.mtime(yaml_file) }
         end
 
         context 'when some new interactions have been recorded' do

data/spec/config_spec.rb

@@ -5,11 +5,11 @@ describe VCR::Config do
     temp_dir(File.expand_path(File.dirname(__FILE__) + '/fixtures/config_spec'))
 
     it 'creates the directory if it does not exist' do
-      lambda { VCR::Config.cassette_library_dir = @temp_dir }.should change { File.exist?(@temp_dir) }.from(false).to(true)
+      expect { VCR::Config.cassette_library_dir = @temp_dir }.to change { File.exist?(@temp_dir) }.from(false).to(true)
     end
 
     it 'does not raise an error if given nil' do
-      lambda { VCR::Config.cassette_library_dir = nil }.should_not raise_error
+      expect { VCR::Config.cassette_library_dir = nil }.to_not raise_error
     end
   end
 
@@ -35,6 +35,13 @@ describe VCR::Config do
     end
   end
 
+  describe '.http_stubbing_libraries' do
+    it 'returns an empty array even when the variable is nil' do
+      VCR::Config.send(:remove_instance_variable, :@http_stubbing_libraries)
+      VCR::Config.http_stubbing_libraries.should == []
+    end
+  end
+
   describe '#ignore_localhost' do
     it 'sets VCR.http_stubbing_adapter.ignore_localhost?' do
       [true, false].each do |val|

data/spec/extensions/net_http_response_spec.rb

@@ -42,7 +42,7 @@ describe VCR::Net::HTTPResponse do
     end
   end
 
-  { :get => /You have reached this web page by typing.*example\.com/, :head => /\A\z/ }.each do |http_verb, expected_body_regex|
+  { :get => /GET to root/, :head => /\A\z/ }.each do |http_verb, expected_body_regex|
     context "for a #{http_verb.to_s.upcase} request" do
       let(:http_verb_method) { :"request_#{http_verb}" }
 
@@ -53,7 +53,7 @@ describe VCR::Net::HTTPResponse do
         end
 
         @response ||= begin
-          http = Net::HTTP.new('example.com', 80)
+          http = Net::HTTP.new('localhost', VCR::SinatraApp.port)
           res = http.send(http_verb_method, '/', &block)
           res.should_not be_a(VCR::Net::HTTPResponse)
           res.should_not be_a(::WebMock::Net::HTTPResponse)

data/spec/extensions/net_http_spec.rb

@@ -3,12 +3,14 @@ require 'spec_helper'
 describe "Net::HTTP Extensions" do
   without_webmock_callbacks
 
-  let(:uri) { URI.parse('http://example.com') }
+  before(:all) { VCR::SinatraApp.port } # ensure the server is started before instantiating any Net::HTTP instances
+
+  let(:uri) { URI.parse("http://localhost:#{VCR::SinatraApp.port}/") }
   before(:each) { VCR.stub(:http_stubbing_adapter).and_return(VCR::HttpStubbingAdapters::FakeWeb) }
 
   it 'checks if the request is stubbed using a VCR::Request' do
     VCR.http_stubbing_adapter.should_receive(:request_stubbed?) do |request, _|
-      request.uri.should == 'http://example.com:80/'
+      request.uri.should == "http://localhost:#{VCR::SinatraApp.port}/"
       request.method.should == :get
       true
     end
@@ -33,7 +35,7 @@ describe "Net::HTTP Extensions" do
     end
 
     def perform_get_with_returning_block
-      Net::HTTP.new('example.com', 80).request(Net::HTTP::Get.new('/', {})) do |response|
+      Net::HTTP.new('localhost', VCR::SinatraApp.port).request(Net::HTTP::Get.new('/', {})) do |response|
         return response
       end
     end
@@ -43,7 +45,7 @@ describe "Net::HTTP Extensions" do
         interaction.request.headers.should_not have_key('content-type')
         interaction.request.headers.should_not have_key('host')
       end
-      Net::HTTP.new('example.com', 80).send_request('POST', '/', '', { 'x-http-user' => 'me' })
+      Net::HTTP.new('localhost', VCR::SinatraApp.port).send_request('POST', '/', '', { 'x-http-user' => 'me' })
     end
 
     it "records headers for which Net::HTTP usually sets defaults when the user manually sets their values" do
@@ -51,7 +53,7 @@ describe "Net::HTTP Extensions" do
         interaction.request.headers['content-type'].should == ['foo/bar']
         interaction.request.headers['host'].should == ['my-example.com']
       end
-      Net::HTTP.new('example.com', 80).send_request('POST', '/', '', { 'Content-Type' => 'foo/bar', 'Host' => 'my-example.com' })
+      Net::HTTP.new('localhost', VCR::SinatraApp.port).send_request('POST', '/', '', { 'Content-Type' => 'foo/bar', 'Host' => 'my-example.com' })
     end
 
     it 'calls VCR.record_http_interaction' do
@@ -61,7 +63,7 @@ describe "Net::HTTP Extensions" do
 
     it 'calls #record_http_interaction only once, even when Net::HTTP internally recursively calls #request' do
       VCR.should_receive(:record_http_interaction).once
-      Net::HTTP.new('example.com', 80).post('/', nil)
+      Net::HTTP.new('localhost', VCR::SinatraApp.port).post('/', nil)
     end
 
     it 'calls #record_http_interaction when Net::HTTP#request is called with a block with a return statement' do

data/spec/support/http_library_adapters.rb

@@ -200,29 +200,31 @@ module HttpLibrarySpecs
       end
 
       def self.test_real_http_request(http_allowed)
+        let(:url) { "http://localhost:#{VCR::SinatraApp.port}/foo" }
+
         if http_allowed
 
           it 'allows real http requests' do
-            get_body_string(make_http_request(:get, 'http://example.com/foo')).should =~ /The requested URL \/foo was not found/
+            get_body_string(make_http_request(:get, url)).should == 'FOO!'
           end
 
           it 'records new http requests' do
             VCR.should_receive(:record_http_interaction) do |interaction|
-              interaction.request.uri.should == 'http://example.com:80/foo'
+              interaction.request.uri.should == url
               interaction.request.method.should == :get
-              interaction.response.status.code.should == 404
-              interaction.response.status.message.should == 'Not Found'
-              interaction.response.body.should =~ /The requested URL \/foo was not found/
-              interaction.response.headers['content-type'].should == ["text/html; charset=iso-8859-1"]
+              interaction.response.status.code.should == 200
+              interaction.response.status.message.should == 'OK'
+              interaction.response.body.should == 'FOO!'
+              interaction.response.headers['content-type'].should == ["text/html;charset=utf-8"]
             end
 
-            make_http_request(:get, 'http://example.com/foo')
+            make_http_request(:get, url)
           end
 
         else
           it 'does not allow real HTTP requests or record them' do
             VCR.should_receive(:record_http_interaction).never
-            lambda { make_http_request(:get, 'http://example.com/foo') }.should raise_error(NET_CONNECT_NOT_ALLOWED_ERROR)
+            expect { make_http_request(:get, url) }.to raise_error(NET_CONNECT_NOT_ALLOWED_ERROR)
           end
         end
       end
@@ -248,16 +250,14 @@ module HttpLibrarySpecs
 
           unless http_allowed
             describe '.ignore_localhost =' do
-              let(:localhost_response) { 'A localhost response!' }
-              let(:localhost_server)   { VCR::LocalhostServer::STATIC_SERVERS[localhost_response] }
+              localhost_response = "Localhost response"
 
               VCR::LOCALHOST_ALIASES.each do |localhost_alias|
                 describe 'when set to true' do
-                  extend PendingOnHeroku
                   before(:each) { subject.ignore_localhost = true }
 
                   it "allows requests to #{localhost_alias}" do
-                    get_body_string(make_http_request(:get, "http://#{localhost_alias}:#{localhost_server.port}/")).should == localhost_response
+                    get_body_string(make_http_request(:get, "http://#{localhost_alias}:#{VCR::SinatraApp.port}/localhost_test")).should == localhost_response
                   end
                 end
 
@@ -265,7 +265,7 @@ module HttpLibrarySpecs
                   before(:each) { subject.ignore_localhost = false }
 
                   it "does not allow requests to #{localhost_alias}" do
-                    expect { make_http_request(:get, "http://#{localhost_alias}:#{localhost_server.port}/") }.to raise_error(NET_CONNECT_NOT_ALLOWED_ERROR)
+                    expect { make_http_request(:get, "http://#{localhost_alias}:#{VCR::SinatraApp.port}/localhost_test") }.to raise_error(NET_CONNECT_NOT_ALLOWED_ERROR)
                   end
                 end
               end

data/spec/support/sinatra_app.rb

@@ -0,0 +1,25 @@
+require 'sinatra'
+
+module VCR
+  class SinatraApp < ::Sinatra::Base
+    get '/' do
+      "GET to root"
+    end
+
+    get '/localhost_test' do
+      "Localhost response"
+    end
+
+    get '/foo' do
+      "FOO!"
+    end
+
+    def self.port
+      server.port
+    end
+
+    def self.server
+      @server ||= VCR::LocalhostServer.new(new)
+    end
+  end
+end

data/spec/support/vcr_localhost_server.rb

@@ -92,10 +92,6 @@ module VCR
         sleep(0.05)
       end
     end
-
-    STATIC_SERVERS = Hash.new do |h, k|
-      h[k] = new(lambda { |env| [200, {}, StringIO.new(k)] })
-    end
   end
 end
 

data/spec/vcr_spec.rb

@@ -32,7 +32,7 @@ describe VCR do
 
     it 'returns the #current_cassette to the previous one' do
       cassette1, cassette2 = insert_cassette, insert_cassette
-      lambda { VCR.eject_cassette }.should change(VCR, :current_cassette).from(cassette2).to(cassette1)
+      expect { VCR.eject_cassette }.to change(VCR, :current_cassette).from(cassette2).to(cassette1)
     end
   end
 
@@ -56,13 +56,13 @@ describe VCR do
 
     it 'ejects the cassette even if there is an error' do
       VCR.should_receive(:eject_cassette)
-      lambda { VCR.use_cassette(:cassette_test) { raise StandardError } }.should raise_error
+      expect { VCR.use_cassette(:cassette_test) { raise StandardError } }.to raise_error
     end
 
     it 'does not eject a cassette if there was an error inserting it' do
       VCR.should_receive(:insert_cassette).and_raise(StandardError.new('Boom!'))
       VCR.should_not_receive(:eject_cassette)
-      lambda { VCR.use_cassette(:test) { } }.should raise_error(StandardError, 'Boom!')
+      expect { VCR.use_cassette(:test) { } }.to raise_error(StandardError, 'Boom!')
     end
   end
 

data/vcr.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.5'
 
   {
-    'bundler'         => '~> 1.0.0',
+    'bundler'         => '~> 1.0.7',
     'rake'            => '~> 0.8.7',
 
     'rspec'           => '~> 2.1.0',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -08:00
+date: 2010-11-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +30,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id001
   type: :development
   name: fakeweb
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +47,12 @@ dependencies:
         - 5
         - 2
         version: 2.1.5.2
-  requirement: *id002
   type: :development
   name: httpclient
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +63,12 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id003
   type: :development
   name: rake
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +79,12 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  requirement: *id004
   type: :development
   name: timecop
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +95,12 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id005
   type: :development
   name: rspec
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -111,12 +111,12 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id006
   type: :development
   name: rack
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -127,12 +127,12 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
-  requirement: *id007
   type: :development
   name: aruba
   prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,28 +143,28 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id008
   type: :development
   name: sinatra
   prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 25
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
-  requirement: *id009
+        - 7
+        version: 1.0.7
   type: :development
   name: bundler
   prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -175,12 +175,12 @@ dependencies:
         - 9
         - 4
         version: 0.9.4
-  requirement: *id010
   type: :development
   name: cucumber
   prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -191,12 +191,12 @@ dependencies:
         - 6
         - 0
         version: 1.6.0
-  requirement: *id011
   type: :development
   name: webmock
   prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -207,12 +207,12 @@ dependencies:
         - 7
         - 8
         version: 0.7.8
-  requirement: *id012
   type: :development
   name: curb
   prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -223,12 +223,12 @@ dependencies:
         - 4
         - 6
         version: 0.4.6
-  requirement: *id013
   type: :development
   name: patron
   prerelease: false
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -239,12 +239,12 @@ dependencies:
         - 2
         - 7
         version: 0.2.7
-  requirement: *id014
   type: :development
   name: em-http-request
   prerelease: false
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -255,10 +255,10 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  requirement: *id015
   type: :development
   name: typhoeus
   prerelease: false
+  version_requirements: *id015
 description: VCR provides helpers to record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests.  It works with any ruby testing framework, and provides built-in support for cucumber.
 email: myron.marston@gmail.com
 executables: []
@@ -366,8 +366,8 @@ files:
 - spec/support/fixnum_extension.rb
 - spec/support/http_library_adapters.rb
 - spec/support/http_stubbing_adapter.rb
-- spec/support/pending_on_heroku.rb
 - spec/support/ruby_interpreter.rb
+- spec/support/sinatra_app.rb
 - spec/support/temp_cassette_library_dir.rb
 - spec/support/vcr_localhost_server.rb
 - spec/support/version_checker.rb
@@ -478,8 +478,8 @@ test_files:
 - spec/support/fixnum_extension.rb
 - spec/support/http_library_adapters.rb
 - spec/support/http_stubbing_adapter.rb
-- spec/support/pending_on_heroku.rb
 - spec/support/ruby_interpreter.rb
+- spec/support/sinatra_app.rb
 - spec/support/temp_cassette_library_dir.rb
 - spec/support/vcr_localhost_server.rb
 - spec/support/version_checker.rb

data/spec/support/pending_on_heroku.rb

@@ -1,14 +0,0 @@
-# The VCR test suite spawns a localhost webserver in a separate process, but it appears that
-# heroku does not support this.  I'm using heroku for my CI server, so we disable these specs
-# as pending specs when we're running on heroku.
-module PendingOnHeroku
-  if ENV.keys.include?('HEROKU_SLUG')
-    def it(*args, &block)
-      super description, *args do
-        pending('pending on heroku because heroku does not allow the spawning of a localhost webserver') do
-          instance_eval(&block)
-        end
-      end
-    end
-  end
-end