vcr 1.11.1 → 1.11.2

data/.travis.yml

@@ -1,7 +1,10 @@
+env: CUCUMBER_FORMAT=progress
+bundler_args: --without extras
 script: "bundle exec rake ci:build"
 rvm:
   - 1.8.6
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ree
   - jruby

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## In git
 
-[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.11.1...master)
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.11.2...master)
+
+## 1.11.2 (August 28, 2011)
+
+[Full Changelog](http://github.com/myronmarston/vcr/compare/v1.11.1...v1.11.2)
+
+* Updated rake, cucumber and aruba dev dependencies to latest releases.
+* Fix all warnings originating from VCR.  VCR is now warning-free!
 
 ## 1.11.1 (August 18, 2011)
 
@@ -33,10 +40,10 @@
 
 [Full Changelog](http://github.com/myronmarston/vcr/compare/v1.10.0...v1.10.1)
 
-* Fix typo in error message [Bradley](https://github.com/bradleyisotope).
+* Fix typo in error message.  Fix provided by [Bradley](https://github.com/bradleyisotope).
 * Fix excon adapter to properly handle queries specified as a hash.
-* Fix excon adapter to stub a response with a hash as excon expects
-  [Wesley Beary](https://github.com/geemus).
+* Fix excon adapter to stub a response with a hash as excon expects.
+  Fix provided by [Wesley Beary](https://github.com/geemus).
 * Fix excon adapter so that it records a response even when excon raises
   an error due to an unexpected response.
 

data/Gemfile

@@ -4,9 +4,9 @@ gemspec
 group :development do
   # patron and em-http-request can't install on JRuby, so we have to limit their platform here.
   platforms :ruby do
-    gem 'patron',           '0.4.9'
+    gem 'patron',           '~> 0.4.15'
     gem 'em-http-request',  '~> 0.3.0'
-    gem 'curb',             '0.7.8'
+    gem 'curb',             '~> 0.7.15'
     gem 'typhoeus',         '~> 0.2.1'
   end
 
@@ -22,6 +22,7 @@ group :extras do
   gem 'growl'
   gem 'relish'
   gem 'fuubar'
+  gem 'fuubar-cucumber'
 
   platforms :mri do
     gem 'rcov'
@@ -37,6 +38,6 @@ group :extras do
     gem 'linecache19', '0.5.11' # 0.5.12 cannot install on 1.9.1, and 0.5.11 appears to work with both 1.9.1 & 1.9.2
     gem 'ruby-debug19'
     gem 'ruby-debug-base19', RUBY_VERSION == '1.9.1' ? '0.11.23' : '~> 0.11.24'
-  end
-end unless ENV['CI']
+  end unless RUBY_VERSION == '1.9.3'
+end
 

data/Rakefile

@@ -11,7 +11,11 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.verbose = false
-  t.skip_bundler = true unless using_git
+  t.ruby_opts = "-w -r./spec/capture_warnings"
+
+  # I'm not sure why, but bundler seems to silence warnings...
+  t.skip_bundler = true
+
   t.rspec_opts = %w[--format progress] if (ENV['FULL_BUILD'] || !using_git)
 end
 
@@ -25,8 +29,10 @@ task :cleanup_rcov_files do
   rm_rf 'coverage.data'
 end
 
-require 'cucumber/rake/task'
-Cucumber::Rake::Task.new
+unless RUBY_VERSION == '1.8.6'
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new
+end
 
 task :default => [:spec, :cucumber]
 
@@ -40,11 +46,16 @@ namespace :ci do
 
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.verbose = true
+    t.ruby_opts = "-w -r./spec/capture_warnings"
+    # I'm not sure why, but bundler seems to silence warnings...
+    t.skip_bundler = true
     t.rspec_opts = %w[--format progress --backtrace]
   end
 
+  ci_tasks = [:setup, :spec]
+  ci_tasks << :cucumber if %w[ 1.8.7 1.9.2 1.9.3 ].include?(RUBY_VERSION) && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby')
   desc "Run a ci build"
-  task :build => [:setup, :spec]
+  task :build => ci_tasks
 end
 
 def ensure_relish_doc_symlinked(filename)
@@ -86,3 +97,11 @@ task :release => [:require_ruby_18, :prep_relish_release, :relish]
 
 # For gem-test: http://gem-testers.org/
 task :test => :spec
+
+task :fix_should_eq do
+  Dir["spec/**/*.rb"].each do |spec_file|
+    contents = File.read(spec_file)
+    contents.gsub!(/should == (.*)$/, 'should eq(\1)')
+    File.open(spec_file, 'w') { |f| f.write(contents) }
+  end
+end

data/cucumber.yml

@@ -1,7 +1,7 @@
 <%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
-rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'Cucumber::Formatter::Fuubar'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'Cucumber::Formatter::Fuubar'} --strict --tags ~@wip"
 interp_opts = if defined?(RUBY_ENGINE)
   " --tags ~@exclude-#{RUBY_ENGINE}"
 else

data/features/cassettes/automatic_re_recording.feature

@@ -52,7 +52,7 @@ Feature: Automatic Re-recording
 
   Scenario: Cassette is not re-recorded when not enough time has passed
     Given 6 days have passed since the cassette was recorded
-    When I run "ruby re_record.rb"
+    When I run `ruby re_record.rb`
     Then the output should contain "Old Response"
     But the output should not contain "New Response"
     And the file "cassettes/example.yml" should contain "body: Old Response"
@@ -60,7 +60,7 @@ Feature: Automatic Re-recording
 
   Scenario: Cassette is re-recorded when enough time has passed
     Given 8 days have passed since the cassette was recorded
-    When I run "ruby re_record.rb"
+    When I run `ruby re_record.rb`
     Then the output should contain "New Response"
     But the output should not contain "Old Response"
     And the file "cassettes/example.yml" should contain "body: New Response"

data/features/cassettes/dynamic_erb.feature

@@ -46,7 +46,7 @@ Feature: Dynamic ERB cassettes
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby dynamic_erb_example.rb"
+    When I run `ruby dynamic_erb_example.rb`
     Then it should pass with "Response: Hello bas"
 
   Scenario: Pass arguments to the ERB using :erb => { ... }
@@ -86,5 +86,5 @@ Feature: Dynamic ERB cassettes
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby dynamic_erb_example.rb"
+    When I run `ruby dynamic_erb_example.rb`
     Then it should pass with "Response: Hello baz"

data/features/cassettes/format.feature

@@ -40,7 +40,7 @@ Feature: Cassette format
         make_http_request(:get, "http://localhost:7777/bar")
       end
       """
-    When I run "ruby cassette_format.rb 'Hello'"
+    When I run `ruby cassette_format.rb 'Hello'`
     Then the file "cassettes/example.yml" should contain YAML like:
       """
       --- 

data/features/cassettes/naming.feature

@@ -25,5 +25,5 @@ Feature: Naming
       end
       """
      And the directory "cassettes" does not exist
-    When I run "ruby name_sanitizing.rb"
+    When I run `ruby name_sanitizing.rb`
     Then the file "cassettes/Fee_Fi_Fo_Fum.yml" should contain "body: Hello"

data/features/cassettes/no_cassette.feature

@@ -34,7 +34,7 @@ Feature: Error for HTTP request made when no cassette is in use
 
       response_body_for(:get, 'http://example.com/')
       """
-    When I run "ruby no_cassette_error.rb"
+    When I run `ruby no_cassette_error.rb`
     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. |
@@ -85,7 +85,7 @@ Feature: Error for HTTP request made when no cassette is in use
       VCR.turn_on!
       make_request "After calling VCR.turn_on!"
       """
-    When I run "ruby turn_off_vcr.rb"
+    When I run `ruby turn_off_vcr.rb`
     Then the output should contain:
       """
       In VCR.turned_off block
@@ -119,7 +119,7 @@ Feature: Error for HTTP request made when no cassette is in use
       VCR.turn_off!
       VCR.insert_cassette('example')
       """
-    When I run "ruby turn_off_vcr_and_insert_cassette.rb"
+    When I run `ruby turn_off_vcr_and_insert_cassette.rb`
     Then it should fail with "VCR is turned off.  You must turn it on before you can insert a cassette."
 
   Scenario: Turning VCR off with `:ignore_cassettes => true` ignores cassettes
@@ -145,7 +145,7 @@ Feature: Error for HTTP request made when no cassette is in use
         puts "Response: #{response}"
       end
       """
-    When I run "ruby turn_off_vcr_and_insert_cassette.rb"
+    When I run `ruby turn_off_vcr_and_insert_cassette.rb`
     Then it should pass with "Response: Hello"
      And the file "cassettes/example.yml" should not exist
 

data/features/cassettes/request_matching.feature

@@ -79,7 +79,7 @@ Feature: Request matching
         puts response_body_for(:get, 'http://example.com/foo')
       end
       """
-    When I run "ruby rotate_responses.rb"
+    When I run `ruby rotate_responses.rb`
     Then it should pass with:
       """
       Response 1
@@ -149,7 +149,7 @@ Feature: Request matching
         puts response_body_for(:put,  "http://bar.com/foo?date=#{Date.today.to_s}")
       end
       """
-    When I run "ruby host_path_matching.rb"
+    When I run `ruby host_path_matching.rb`
     Then it should pass with:
       """
       foo.com response
@@ -223,7 +223,7 @@ Feature: Request matching
         puts response_body_for(:post, "http://example.com/", 'a=1')
       end
       """
-    When I run "ruby body_matching.rb"
+    When I run `ruby body_matching.rb`
     Then it should pass with:
       """
       a=2 response
@@ -296,7 +296,7 @@ Feature: Request matching
         puts response_body_for(:get, "http://example.com/dashboard", nil, 'X-User-Id' => '17')
       end
       """
-    When I run "ruby header_matching.rb"
+    When I run `ruby header_matching.rb`
     Then it should pass with:
       """
       user 42 response
@@ -365,7 +365,7 @@ Feature: Request matching
         puts response_body_for(:get, "http://bar.com/foo?date=#{Date.today.to_s}")
       end
       """
-    When I run "ruby uri_regex_matching.rb"
+    When I run `ruby uri_regex_matching.rb`
     Then it should pass with:
       """
       foo.com response

data/features/cassettes/update_content_length_header.feature

@@ -65,7 +65,7 @@ Feature: Update content_length header
         make_request_and_print_results
       end
       """
-    When I run "ruby default.rb"
+    When I run `ruby default.rb`
     Then the output should contain:
       """
       Body length: 16
@@ -81,7 +81,7 @@ Feature: Update content_length header
         make_request_and_print_results
       end
       """
-    When I run "ruby false.rb"
+    When I run `ruby false.rb`
     Then the output should contain:
       """
       Body length: 16
@@ -97,7 +97,7 @@ Feature: Update content_length header
         make_request_and_print_results
       end
       """
-    When I run "ruby true.rb"
+    When I run `ruby true.rb`
     Then the output should contain:
       """
       Body length: 16

data/features/configuration/allow_http_connections_when_no_cassette.feature

@@ -33,7 +33,7 @@ Feature: Allow HTTP connections when no cassette
 
       puts "Response: " + Net::HTTP.get_response('localhost', '/', 7777).body
       """
-    When I run "ruby no_cassette.rb --with-server"
+    When I run `ruby no_cassette.rb --with-server`
     Then the output should contain "Response: Hello"
 
   Scenario: Cassettes record and replay as normal
@@ -45,10 +45,10 @@ Feature: Allow HTTP connections when no cassette
         puts "Response: " + Net::HTTP.get_response('localhost', '/', 7777).body
       end
       """
-    When I run "ruby record_replay_cassette.rb --with-server"
+    When I run `ruby record_replay_cassette.rb --with-server`
     Then the output should contain "Response: Hello"
     And the file "cassettes/localhost.yml" should contain "body: Hello"
 
-    When I run "ruby record_replay_cassette.rb"
+    When I run `ruby record_replay_cassette.rb`
     Then the output should contain "Response: Hello"
 

data/features/configuration/cassette_library_dir.feature

@@ -24,5 +24,5 @@ Feature: cassette_library_dir
       end
       """
      And the directory "vcr/cassettes" does not exist
-    When I run "ruby cassette_library_dir.rb"
+    When I run `ruby cassette_library_dir.rb`
     Then the file "vcr/cassettes/localhost.yml" should exist

data/features/configuration/default_cassette_options.feature

@@ -31,7 +31,7 @@ Feature: default_cassette_options
         puts "ERB: #{VCR.current_cassette.erb}"
       end
       """
-    When I run "ruby default_cassette_options.rb"
+    When I run `ruby default_cassette_options.rb`
     Then the output should contain:
       """
       Record Mode: new_episodes
@@ -47,7 +47,7 @@ Feature: default_cassette_options
         puts "Match Requests On: #{VCR.current_cassette.match_requests_on.inspect}"
       end
       """
-    When I run "ruby default_cassette_options.rb"
+    When I run `ruby default_cassette_options.rb`
     Then the output should contain "Match Requests On: [:method, :uri]"
 
   Scenario: `:record` defaults to `:once` when it has not been set
@@ -65,7 +65,7 @@ Feature: default_cassette_options
         puts "Record mode: #{VCR.current_cassette.record_mode.inspect}"
       end
       """
-    When I run "ruby default_record_mode.rb"
+    When I run `ruby default_record_mode.rb`
     Then the output should contain "Record mode: :once"
 
   Scenario: cassettes can set their own options
@@ -77,7 +77,7 @@ Feature: default_cassette_options
         puts "Re-record Interval: #{VCR.current_cassette.re_record_interval}"
       end
       """
-    When I run "ruby default_cassette_options.rb"
+    When I run `ruby default_cassette_options.rb`
     Then the output should contain "Re-record Interval: 10000"
 
   Scenario: cassettes can override default options
@@ -90,7 +90,7 @@ Feature: default_cassette_options
         puts "ERB: #{VCR.current_cassette.erb}"
       end
       """
-    When I run "ruby default_cassette_options.rb"
+    When I run `ruby default_cassette_options.rb`
     Then the output should contain:
       """
       Record Mode: none

data/features/configuration/filter_sensitive_data.feature

@@ -48,13 +48,13 @@ Feature: Filter sensitive data
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby filtering.rb --with-server"
+    When I run `ruby filtering.rb --with-server`
     Then the output should contain "Response: Hello World"
      And the file "cassettes/filtering.yml" should contain "body: <GREETING> <LOCATION>"
      And the file "cassettes/filtering.yml" should not contain "Hello"
      And the file "cassettes/filtering.yml" should not contain "World"
 
-    When I run "ruby filtering.rb"
+    When I run `ruby filtering.rb`
     Then the output should contain "Hello World"
 
   Scenario: Filter tagged cassettes
@@ -87,14 +87,14 @@ Feature: Filter sensitive data
         puts "Untagged Response: #{response.body}"
       end
       """
-    When I run "ruby tagged_filtering.rb --with-server"
+    When I run `ruby tagged_filtering.rb --with-server`
     Then the output should contain each of the following:
       | Tagged Response: Hello World 1   |
       | Untagged Response: Hello World 2 |
      And the file "cassettes/tagged.yml" should contain "body: Hello <LOCATION> 1"
      And the file "cassettes/untagged.yml" should contain "body: Hello World 2"
 
-    When I run "ruby tagged_filtering.rb"
+    When I run `ruby tagged_filtering.rb`
     Then the output should contain each of the following:
       | Tagged Response: Hello World 1   |
       | Untagged Response: Hello World 2 |
@@ -141,7 +141,7 @@ Feature: Filter sensitive data
         )
       end
       """
-    When I run "ruby dynamic_filtering.rb --with-server"
+    When I run `ruby dynamic_filtering.rb --with-server`
     Then the output should contain "john.doe/monkey"
     And the file "cassettes/example.yml" should contain "body: john.doe/<PASSWORD>"
     And the file "cassettes/example.yml" should contain a YAML fragment like:
@@ -150,5 +150,5 @@ Feature: Filter sensitive data
       - <PASSWORD>
       """
 
-    When I run "ruby dynamic_filtering.rb"
+    When I run `ruby dynamic_filtering.rb`
     Then the output should contain "john.doe/monkey"

data/features/configuration/hooks.feature

@@ -83,7 +83,7 @@ Feature: Hooks
         Net::HTTP.get_response('localhost', '/', 7777)
       end
       """
-    When I run "ruby before_record_example.rb"
+    When I run `ruby before_record_example.rb`
     Then the file "cassettes/recording_example.yml" should contain "body: Hello World"
      And the file "cassettes/recording_example.yml" should not contain "secret"
 
@@ -109,7 +109,7 @@ Feature: Hooks
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby before_record_ignore.rb"
+    When I run `ruby before_record_ignore.rb`
     Then it should pass with "Response: Hello World"
     And the file "cassettes/recording_example.yml" should not exist
 
@@ -132,7 +132,7 @@ Feature: Hooks
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby before_playback_example.rb"
+    When I run `ruby before_playback_example.rb`
     Then it should pass with "Response: response from before_playback"
 
   Scenario: Prevent playback by ignoring interaction in before_playback hook
@@ -178,7 +178,7 @@ Feature: Hooks
         puts "Response: #{response.body}"
       end
       """
-    When I run "ruby before_playback_ignore.rb"
+    When I run `ruby before_playback_ignore.rb`
     Then it should pass with "Response: sinatra response"
 
   Scenario: Multiple hooks are run in order
@@ -211,7 +211,7 @@ Feature: Hooks
         puts "Response 2: #{response.body}"
       end
       """
-    When I run "ruby multiple_hooks.rb"
+    When I run `ruby multiple_hooks.rb`
     Then it should pass with:
       """
       In before_playback hook 1
@@ -254,7 +254,7 @@ Feature: Hooks
         end
       end
       """
-    When I run "ruby tagged_hooks.rb"
+    When I run `ruby tagged_hooks.rb`
     Then it should pass with:
       """
       Using tag: :tag_1