vcr 2.2.1 → 2.2.2

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.0...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.2...master)
+
+## 2.2.2 (June 15, 2012)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v2.2.1...v2.2.2)
+
+Bug Fixes:
+
+* Fix `VCR.eject_cassette` so that it always pops a cassette off the
+  cassette stack even if an error occurs while ejecting the cassette.
+  This is important to keep things consistent, so that a cassette for
+  one test doesn't remain in place for another test.
 
 ## 2.2.1 (June 13, 2012)
 

data/lib/vcr.rb

@@ -134,6 +134,8 @@ module VCR
   def eject_cassette
     cassette = cassettes.last
     cassette.eject if cassette
+    cassette
+  ensure
     cassettes.pop
   end
 
@@ -229,7 +231,7 @@ module VCR
   #
   # @param options [Hash] hash of options
   # @option options :ignore_cassettes [Boolean] controls what happens when a cassette is
-  #  inserted while VCR is turned off. If +true+ is passed, the cassette insertion
+  #  inserted while VCR is turned off. If `true` is passed, the cassette insertion
   #  will be ignored; otherwise a {VCR::Errors::TurnedOffError} will be raised.
   #
   # @return [void]
@@ -237,7 +239,8 @@ module VCR
   # @raise [ArgumentError] if you pass an invalid option
   def turn_off!(options = {})
     if VCR.current_cassette
-      raise CassetteInUseError.new("A VCR cassette is currently in use.  You must eject it before you can turn VCR off.")
+      raise CassetteInUseError, "A VCR cassette is currently in use (#{VCR.current_cassette.name}). " +
+                                "You must eject it before you can turn VCR off."
     end
 
     @ignore_cassettes = options[:ignore_cassettes]

data/lib/vcr/errors.rb

@@ -31,7 +31,7 @@ module VCR
     # Error raised when a VCR 1.x cassette is used with VCR 2.
     class InvalidCassetteFormatError < Error; end
 
-    # Error raised when an +around_http_request+ hook is used improperly.
+    # Error raised when an `around_http_request` hook is used improperly.
     # @see VCR::Configuration#around_http_request
     class AroundHTTPRequestHookError < Error; end
 

data/lib/vcr/test_frameworks/cucumber.rb

@@ -20,11 +20,13 @@ module VCR
       @main_object = main_object
     end
 
-    # Adds +Before+ and +After+ cucumber hooks for the named tags that
+    # Adds `Before` and `After` cucumber hooks for the named tags that
     # will cause a VCR cassette to be used for scenarios with matching tags.
     #
     # @param [Array<String>] tag_names the cucumber scenario tags
-    # @param [(optional) Hash] options the cassette options. Specify :use_scenario_name => true to automatically name the cassette according to the scenario name.
+    # @param [(optional) Hash] options the cassette options. Specify
+    #   `:use_scenario_name => true` to automatically name the
+    #   cassette according to the scenario name.
     def tags(*tag_names)
       original_options = tag_names.last.is_a?(::Hash) ? tag_names.pop : {}
       tag_names.each do |tag_name|

data/lib/vcr/version.rb

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

data/spec/vcr_spec.rb

@@ -52,6 +52,13 @@ describe VCR do
       current.should be(cassette)
       VCR.current_cassette.should_not be(cassette)
     end
+
+    it 'properly pops the cassette off the stack even if an error occurs' do
+      cassette = insert_cassette
+      cassette.stub(:eject) { raise "boom" }
+      expect { VCR.eject_cassette }.to raise_error("boom")
+      VCR.current_cassette.should be_nil
+    end
   end
 
   describe '.use_cassette' do
@@ -259,7 +266,7 @@ describe VCR do
       VCR.insert_cassette('foo')
       expect {
         VCR.turn_off!
-      }.to raise_error(VCR::CassetteInUseError)
+      }.to raise_error(VCR::CassetteInUseError, /foo/)
     end
 
     it 'causes an error to be raised if you insert a cassette while VCR is turned off' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-13 00:00:00 Z
+date: 2012-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement