vcr 1.11.1 → 1.11.2

data/spec/vcr/util/hooks_spec.rb

@@ -32,7 +32,7 @@ describe VCR::Hooks do
 
         invocations.should be_empty
         subject.invoke_hook(:before_foo, :green)
-        invocations.should == [:callback_1, :callback_2]
+        invocations.should eq([:callback_1, :callback_2])
       end
 
       it 'invokes each of the :before_foo callbacks with no tag' do
@@ -40,7 +40,7 @@ describe VCR::Hooks do
         subject.before_foo { invocations << :no_tag_2 }
 
         subject.invoke_hook(:before_foo, :green)
-        invocations.should == [:no_tag_1, :no_tag_2]
+        invocations.should eq([:no_tag_1, :no_tag_2])
       end
 
       it 'does not invoke any callbacks with a different tag' do
@@ -57,7 +57,7 @@ describe VCR::Hooks do
 
         invocations.should be_empty
         subject.invoke_hook(:before_foo, nil)
-        invocations.should == [:callback_1, :callback_2]
+        invocations.should eq([:callback_1, :callback_2])
       end
 
       it 'does not invoke :before_bar callbacks' do
@@ -73,21 +73,21 @@ describe VCR::Hooks do
       end
 
       it 'passes along the provided arguments to the callback' do
-        subject.before_foo &lambda { |a, b| invocations << [a, b] }
+        subject.before_foo(&lambda { |a, b| invocations << [a, b] })
         subject.invoke_hook(:before_foo, nil, :arg1, :arg2)
-        invocations.flatten.should == [:arg1, :arg2]
+        invocations.flatten.should eq([:arg1, :arg2])
       end
 
       it 'only passes along 1 argument when the block accepts only 1 arguments' do
-        subject.before_foo &lambda { |a| invocations << a }
+        subject.before_foo(&lambda { |a| invocations << a })
         subject.invoke_hook(:before_foo, nil, :arg1, :arg2)
-        invocations.flatten.should == [:arg1]
+        invocations.flatten.should eq([:arg1])
       end
 
       it 'passes along all arguments when the block accepts a variable number of args' do
-        subject.before_foo &lambda { |*a| invocations << a }
+        subject.before_foo(&lambda { |*a| invocations << a })
         subject.invoke_hook(:before_foo, nil, :arg1, :arg2)
-        invocations.flatten.should == [:arg1, :arg2]
+        invocations.flatten.should eq([:arg1, :arg2])
       end
     end
   end

data/spec/vcr_spec.rb

@@ -13,8 +13,8 @@ describe VCR do
     it 'takes over as the #current_cassette' do
       orig_cassette = VCR.current_cassette
       new_cassette = insert_cassette
-      new_cassette.should_not == orig_cassette
-      VCR.current_cassette.should == new_cassette
+      new_cassette.should_not eq(orig_cassette)
+      VCR.current_cassette.should eq(new_cassette)
     end
 
     it 'raises an error if the stack of inserted cassettes already contains a cassette with the same name' do
@@ -34,7 +34,7 @@ describe VCR do
 
     it 'returns the ejected cassette' do
       cassette = insert_cassette
-      VCR.eject_cassette.should == cassette
+      VCR.eject_cassette.should eq(cassette)
     end
 
     it 'returns the #current_cassette to the previous one' do
@@ -64,7 +64,7 @@ describe VCR do
 
     it 'yields the cassette instance if the block expects a variable number of args' do
       VCR.use_cassette('name', :record => :new_episodes) do |*args|
-        args.size.should == 1
+        args.size.should eq(1)
         args.first.should equal(VCR.current_cassette)
       end
     end
@@ -92,7 +92,7 @@ describe VCR do
       VCR.config do |obj|
         yielded_object = obj
       end
-      yielded_object.should == VCR::Config
+      yielded_object.should eq(VCR::Config)
     end
 
     it "sets http_stubbing_adapter.http_connections_allowed to the configured default" do
@@ -116,7 +116,7 @@ describe VCR do
         c.ignore_hosts 'example.com', 'example.org'
       end
 
-      VCR::HttpStubbingAdapters::FakeWeb.send(:ignored_hosts).should == %w[example.com example.org]
+      VCR::HttpStubbingAdapters::FakeWeb.send(:ignored_hosts).should eq(%w[example.com example.org])
     end
   end
 
@@ -138,10 +138,10 @@ describe VCR do
 
     it 'returns a multi object proxy for the configured stubbing libraries when multiple libs are configured', :unless => RUBY_PLATFORM == 'java' do
       VCR::Config.stub_with :fakeweb, :typhoeus
-      VCR.http_stubbing_adapter.proxied_objects.should == [
+      VCR.http_stubbing_adapter.proxied_objects.should eq([
         VCR::HttpStubbingAdapters::FakeWeb,
         VCR::HttpStubbingAdapters::Typhoeus
-      ]
+      ])
     end
 
     {
@@ -152,7 +152,7 @@ describe VCR do
     }.each do |symbol, klass|
       it "returns #{klass} for :#{symbol}" do
         VCR::Config.stub_with symbol
-        VCR.http_stubbing_adapter.should == klass
+        VCR.http_stubbing_adapter.should eq(klass)
       end
     end
 
@@ -296,7 +296,7 @@ describe VCR do
         VCR.should_not be_turned_on
       end
 
-      yielded.should == true
+      yielded.should eq(true)
       VCR.should be_turned_on
     end
 
@@ -308,13 +308,7 @@ describe VCR do
 
   describe '.turned_on?' do
     it 'is on by default' do
-      # clear internal state
-      VCR.instance_eval do
-        instance_variables.each do |var|
-          remove_instance_variable(var)
-        end
-      end
-
+      VCR.send(:initialize_ivars) # clear internal state
       VCR.should be_turned_on
     end
   end

data/vcr.gemspec

@@ -19,11 +19,9 @@ Gem::Specification.new do |s|
 
   {
     'bundler'         => '~> 1.0.7',
-    'rake'            => '~> 0.8.7',
+    'rake'            => '~> 0.9.2',
 
     'rspec'           => '~> 2.6',
-    'cucumber'        => '~> 0.9.4',
-    'aruba'           => '0.2.4',
     'shoulda'         => '~> 2.9.2',
 
     'fakeweb'         => '~> 1.3.0',
@@ -41,10 +39,18 @@ Gem::Specification.new do |s|
     s.add_development_dependency lib, version
   end
 
+  # Cucumber 1.0.2 seems to have issues installing on 1.8.6 :(.
   {
-    'patron'          => '0.4.9',
+    'cucumber'        => '~> 1.0.2',
+    'aruba'           => '~> 0.4.6',
+  }.each do |lib, version|
+    s.add_development_dependency lib, version
+  end unless RUBY_VERSION == '1.8.6'
+
+  {
+    'patron'          => '~> 0.4.15',
     'em-http-request' => '~> 0.3.0',
-    'curb'            => '0.7.8',
+    'curb'            => '~> 0.7.15',
     'typhoeus'        => '~> 0.2.1'
   }.each do |lib, version|
     s.add_development_dependency lib, version

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vcr
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 1
   - 11
-  - 1
-  version: 1.11.1
+  - 2
+  version: 1.11.2
 platform: ruby
 authors: 
 - Myron Marston
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 Z
+date: 2011-08-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -72,12 +72,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 63
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
+        - 9
+        - 2
+        version: 0.9.2
   name: rake
   type: :development
   prerelease: false
@@ -163,22 +163,6 @@ dependencies:
   requirement: *id009
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 2
-        - 4
-        version: 0.2.4
-  name: aruba
-  type: :development
-  prerelease: false
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -192,9 +176,9 @@ dependencies:
   name: sinatra
   type: :development
   prerelease: false
-  requirement: *id011
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -208,9 +192,9 @@ dependencies:
   name: bundler
   type: :development
   prerelease: false
-  requirement: *id012
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -224,6 +208,22 @@ dependencies:
   name: excon
   type: :development
   prerelease: false
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 7
+        - 4
+        version: 1.7.4
+  name: webmock
+  type: :development
+  prerelease: false
   requirement: *id013
 - !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
@@ -231,13 +231,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 3
         segments: 
         - 0
-        - 9
         - 4
-        version: 0.9.4
-  name: cucumber
+        - 6
+        version: 0.4.6
+  name: aruba
   type: :development
   prerelease: false
   requirement: *id014
@@ -247,13 +247,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
         - 1
-        - 7
-        - 4
-        version: 1.7.4
-  name: webmock
+        - 0
+        - 2
+        version: 1.0.2
+  name: cucumber
   type: :development
   prerelease: false
   requirement: *id015
@@ -261,14 +261,14 @@ dependencies:
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 29
         segments: 
         - 0
         - 7
-        - 8
-        version: 0.7.8
+        - 15
+        version: 0.7.15
   name: curb
   type: :development
   prerelease: false
@@ -277,14 +277,14 @@ dependencies:
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 17
         segments: 
         - 0
         - 4
-        - 9
-        version: 0.4.9
+        - 15
+        version: 0.4.15
   name: patron
   type: :development
   prerelease: false
@@ -371,8 +371,6 @@ files:
 - features/record_modes/none.feature
 - features/record_modes/once.feature
 - features/step_definitions/cli_steps.rb
-- features/support/aruba_workaround/aruba_patches.rb
-- features/support/aruba_workaround/background_process.rb
 - features/support/env.rb
 - features/support/http_lib_filters.rb
 - features/support/vcr_cucumber_helpers.rb
@@ -424,6 +422,7 @@ files:
 - script/FullBuildRakeFile
 - script/full_build
 - script/spec
+- spec/capture_warnings.rb
 - spec/fixtures/1.9.1/0_3_1_cassette.yml
 - spec/fixtures/1.9.1/cassette_spec/empty.yml
 - spec/fixtures/1.9.1/cassette_spec/example.yml
@@ -548,8 +547,6 @@ test_files:
 - features/record_modes/none.feature
 - features/record_modes/once.feature
 - features/step_definitions/cli_steps.rb
-- features/support/aruba_workaround/aruba_patches.rb
-- features/support/aruba_workaround/background_process.rb
 - features/support/env.rb
 - features/support/http_lib_filters.rb
 - features/support/vcr_cucumber_helpers.rb
@@ -557,6 +554,7 @@ test_files:
 - features/test_frameworks/rspec.feature
 - features/test_frameworks/shoulda.feature
 - features/test_frameworks/test_unit.feature
+- spec/capture_warnings.rb
 - spec/fixtures/1.9.1/0_3_1_cassette.yml
 - spec/fixtures/1.9.1/cassette_spec/empty.yml
 - spec/fixtures/1.9.1/cassette_spec/example.yml

data/features/support/aruba_workaround/aruba_patches.rb

@@ -1,36 +0,0 @@
-# Aruba::Api#run in aruba 0.2.4 does not work w/ JRuby or Rubinius.
-# This is the version from 0.2.2 before aruba relied upon
-# BackgroundProcess (which is not jruby/rbx compatible).
-require 'tempfile'
-
-Aruba::Api.module_eval do
-  def run(cmd, fail_on_error=true)
-    cmd = detect_ruby(cmd)
-
-    stderr_file = Tempfile.new('cucumber')
-    stderr_file.close
-    in_current_dir do
-      announce_or_puts("$ cd #{Dir.pwd}") if @announce_dir
-      announce_or_puts("$ #{cmd}") if @announce_cmd
-
-      mode = RUBY_VERSION =~ /^1\.9/ ? {:external_encoding=>"UTF-8"} : 'r'
-      
-      IO.popen("#{cmd} 2> #{stderr_file.path}", mode) do |io|
-        @last_stdout = io.read
-        announce_or_puts(@last_stdout) if @announce_stdout
-      end
-
-      @last_exit_status = $?.exitstatus
-    end
-    @last_stderr = IO.read(stderr_file.path)
-
-    announce_or_puts(@last_stderr) if @announce_stderr
-
-    if(@last_exit_status != 0 && fail_on_error)
-      fail("Exit status was #{@last_exit_status}. Output:\n#{combined_output}")
-    end
-
-    @last_stderr
-  end
-end
-

data/features/support/aruba_workaround/background_process.rb

@@ -1,4 +0,0 @@
-# Don't do anything--this is just here to allow aruba to run on JRuby/rbx.
-# It requires background_process, but that doesn't work on JRuby/rbx.
-# So on JRuby/rbx, we add this file's dir to the load path, in order to fake out aruba
-# and force it to load this file instaed.