--- /dev/null
+++ b/vendor/plugins/rspec/.autotest
@@ -0,0 +1,3 @@
+Autotest.add_hook :initialize do |at|
+  at.add_exception("spec/interop/test/unit/resources")
+end
\ No newline at end of file

--- a/vendor/plugins/rspec/CHANGES
+++ b/vendor/plugins/rspec/CHANGES
@@ -1,3 +1,73 @@
+== Version 1.1.4 (trunk)
+
+Maintenance release.
+Note: we've removed the metaclass method from Object. There were some generated specs that
+used it, and they will now break. Just replace the metaclass call with (class << self; self; end)
+and all will be well.
+
+* Applied patch from Zach Dennis to merge :steps functionality to :steps_for. Closes #324.
+* Applied patch from Pat Maddox to handle redirect_to w/ SSL. Closes #320.
+* Applied patch from Ryan Davis to add eval of block passed to raise_error matcher. Closes #321.
+* alias :context :describe in example_group_methods. Closes #312.
+* Applied patch from Ben Mabey to make the Story runner exit with a non-0 exit code on failing stories. Closes #228.
+* Added #helper and #assigns to helper specs.
+* Applied patch from Bryan Helmkamp to tweak format of generated spec.opts to be more obvious. Closes #162.
+* Tweaked list of exceptions (ignores) for autotest with rspec_on_rails.
+* Applied patch from Coda Hale to get the :red hook called in autotest. Closes #279.
+* Applied patch from Patrick Ritchie to support --drb in spec.opts. Closes #274, #293.
+* Applied patch from Rick Olson to get rspec_on_rails working with rails edge (>= 8862)
+* Moved metaclass method from Object to an internal module which gets included where it is needed.
+* Applied patch from Dayo Esho: and_yield clobbers return value from block. Closes #217.
+* Applied patch from Bob Cotton:  ExampleGroupFactory.default resets previously registered types. Closes #222.
+* Applied patch from Mike Williams to support the lib directory in rails apps with the Textmate Alternate File command. Closes #276.
+* ExampleGroupMethods#xspecify aliases #xit
+* A SharedExampleGroup can be created within another ExampleGroup.
+* Applied patch from Bob Cotton: Nested ExampleGroups do not have a spec_path. Closes #224.
+* Applied patch from Wincent Colaiuta to invert sense of "spec --diff". Closes #281.
+* Allow any type of render in view specs. Closes #57.
+* Applied patch from Ian White to get rspec working with edge rails (8804). Closes #271.
+
+== Version 1.1.3
+
+Maintenance release.
+Notice to autotest users: you must also upgrade to ZenTest-3.9.0.
+
+* Tightened up exceptions list in autotest/rails_spec. Closes #264.
+* Applied patch from Ryan Davis for ZenTest-3.9.0 compatibility
+* Applied patch from Kero to add step_upcoming to story listeners. Closes #253.
+* Fixed bug where the wrong named error was not always caught by "should raise_error"
+* Applied patch from Luis Lavena: No coloured output on Windows due missing RUBYOPT. Closes #244.
+* Applied patch from Craig Demyanovich to add support for "should_not render_template" to rspec_on_rails. Closes #241.
+* Added --pattern (-p for short) option to control what files get loaded. Defaults to '**/*_spec.rb'
+* Exit with non-0 exit code if examples *or tests* (in test/unit interop mode) fail. Closes #203.
+* Moved at_exit hook to a method in Spec::Runner which only runs if specs get loaded. Closes #242.
+* Applied patch from kakutani ensuring that base_view_path gets cleared after each view example. Closes #235.
+* More tweaks to regexp step names
+* Fixed focused specs in nested ExampleGroups. Closes #225.
+
+== Version 1.1.2
+
+Minor bug fixes/enhancements.
+Notice to autotest users: you must also upgrade to ZenTest-3.8.0.
+
+* RSpec's Autotest subclasses compatible with ZenTest-3.8.0 (thanks to Ryan Davis for making it easier on Autotest subs).
+* Applied patch from idl to add spec/lib to rake stats. Closes #226.
+* calling setup_fixtures and teardown_fixtures for Rails >= r8570. Closes #219.
+* Applied patch from Josh Knowles using ActiveSupport's Inflector (when available) to make 'should have' read a bit better. Closes #197.
+* Fixed regression in 1.1 that caused failing examples to fail to generate their own names. Closes #209.
+* Applied doc patch from Jens Krämer for capturing content_for
+* Applied patch from Alexander Lang to clean up story steps after each story. Closes #198.
+* Applied patch from Josh Knowles to support 'string_or_response.should have_text(...)'. Closes #193.
+* Applied patch from Ian Dees to quiet the Story Runner backtrace. Closes #183.
+* Complete support for defining steps with regexp 'names'.
+
+== Version 1.1.1
+
+Bug fix release.
+
+* Fix regression in 1.1.0 that caused transactions to not get rolled back between examples.
+* Applied patch from Bob Cotton to reintroduce ExampleGroup.description_options. Closes LH[#186]
+
 == Version 1.1.0
 
 The "tell me a story and go nest yourself" release.
@@ -5,7 +75,7 @@ The "tell me a story and go nest yourself" release.
 * Applied patch from Mike Vincent to handle generators rails > 2.0.1. Closes LH[#181]
 * Formatter.pending signature changed so it gets passed an ExampleGroup instance instead of the name ( LH[#180])
 * Fixed LH[#180] Spec::Rails::Example::ModelExampleGroup and friends show up in rspec/rails output
-* Spec::Rails no longer loads ActiveRecord extensions if it's disablet in config/boot.rb
+* Spec::Rails no longer loads ActiveRecord extensions if it's disabled in config/boot.rb
 * Applied LH[#178] small annoyances running specs with warnings enabled (Patch from Mikko Lehtonen)
 * Tighter integration with Rails fixtures. Take advantage of fixture caching to get performance improvements (Thanks to Pat Maddox, Nick Kallen, Jonathan Barnes, and Curtis)
 
@@ -39,6 +109,7 @@ rspec_on_rails users - don't forget to run script/generate rspec
 * Applied LH[#134] Only load spec inside spec_helper.rb (Patch from Mark Van Holstyn)
 * RSpec now bails immediately if there are examples with identical names.
 * Applied LH[#132]  Plain Text stories should support Given and Given: (Patch from Jarkko Laine)
+* Applied patch from Pat Maddox: Story Mediator - the glue that binds the plain text story parser with the rest of the system
 * Applied LH[#16] Have SimpleMatchers expose their description for specdocs (Patch from Bryan Helmkamp)
 * Stories now support --colour
 * Changed the DSL modules to Example (i.e. Spec::Example instead of Spec::DSL)

--- a/vendor/plugins/rspec/README
+++ b/vendor/plugins/rspec/README
@@ -38,9 +38,8 @@ In order to run RSpec's full suite of specs (rake pre_commit) you must install t
 
 * rake          # Runs the build script
 * rcov          # Verifies that the code is 100% covered by specs
-* webgen        # Generates the static HTML website
-* RedCloth      # Required by webgen
-* syntax        # Required by our own custom webgen extension to highlight ruby code
+* webby         # Generates the static HTML website
+* syntax        # Required to highlight ruby code
 * diff-lcs      # Required if you use the --diff switch
 * win32console  # Required by the --colour switch if you're on Windows
 * meta_project  # Required in order to make releases at RubyForge
@@ -66,7 +65,7 @@ and stdlib - with a few exceptions:
 * The spec command line uses heckle when --heckle is specified.
 * The Spec::Rake::SpecTask needs RCov if RCov is enabled in the task.
 
-See http://rspec.rubyforge.org for further documentation.
+See http://rspec.info for further documentation.
 
 == Contributing
 

--- a/vendor/plugins/rspec/Rakefile
+++ b/vendor/plugins/rspec/Rakefile
@@ -7,7 +7,7 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 require 'spec/version'
 dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(File.expand_path("#{dir}/../pre_commit/lib"))
+$LOAD_PATH.unshift(File.expand_path("#{dir}/pre_commit/lib"))
 require "pre_commit"
 
 # Some of the tasks are in separate files since they are also part of the website documentation
@@ -22,10 +22,13 @@ PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',
   'lib/**/*.rb', 
-  'spec/**/*.rb', 
+  'spec/**/*',
   'examples/**/*',
+  'failing_examples/**/*',
   'plugins/**/*',
-  'stories/**/*'
+  'stories/**/*',
+  'pre_commit/**/*',
+  'rake_tasks/**/*'
 ]
 
 task :default => [:verify_rcov]
@@ -34,7 +37,7 @@ task :verify_rcov => [:spec, :stories]
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['--options', 'spec.opts']
+  t.spec_opts = ['--options', 'spec/spec.opts']
   unless ENV['NO_RCOV']
     t.rcov = true
     t.rcov_dir = '../doc/output/coverage'
@@ -87,7 +90,6 @@ spec = Gem::Specification.new do |s|
   s.rdoc_options = rd.options
   s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$|^EXAMPLES.rd$/ }.to_a
 
-  s.autorequire = 'spec'
   s.bindir = 'bin'
   s.executables = ['spec', 'spec_translator']
   s.default_executable = 'spec'
@@ -126,7 +128,7 @@ task :clobber do
   core.clobber
 end
 
-task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_website, :publish_news]
+task :release => [:clobber, :verify_committed, :verify_user, :spec, :publish_packages, :tag, :publish_news]
 
 desc "Verifies that there is no uncommitted code"
 task :verify_committed do

--- a/vendor/plugins/rspec/bin/spec
+++ b/vendor/plugins/rspec/bin/spec
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'spec'
 exit ::Spec::Runner::CommandLine.run(rspec_options)

--- a/vendor/plugins/rspec/examples/pure/helper_method_example.rb
+++ b/vendor/plugins/rspec/examples/pure/helper_method_example.rb
@@ -1,11 +1,14 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "a context with helper a method" do
-  def helper_method
-    "received call"
-  end
+module HelperMethodExample
+  describe "an example group with helper a method" do
+    def helper_method
+      "received call"
+    end
   
-  it "should make that method available to specs" do
-    helper_method.should == "received call"
+    it "should make that method available to specs" do
+      helper_method.should == "received call"
+    end
   end
 end
+

--- a/vendor/plugins/rspec/examples/pure/shared_example_group_example.rb
+++ b/vendor/plugins/rspec/examples/pure/shared_example_group_example.rb
@@ -19,9 +19,9 @@ module SharedExampleGroupExample
     end
   end
   
-  # A SharedExampleGroup is a module, so you can assign
-  # it to a constant if you want ....
-  AllThings = shared_examples_for "All Things" do
+  # A SharedExampleGroup is an example group that doesn't get run.
+  # You can create one like this:
+  share_examples_for "most things" do
     def helper_method
       "helper method"
     end
@@ -30,17 +30,24 @@ module SharedExampleGroupExample
       @thing.what_things_do.should == "stuff"
     end
   end
-  
-  # TODO - it would be nice to be able to say this instead of the above:
-  
-  # class AllThings < Spec::SharedExampleGroup
-  #   ...
-  # end
 
+  # A SharedExampleGroup is also module. If you create one like this
+  # it gets assigned to the constant AllThings
+  share_as :MostThings do
+    def helper_method
+      "helper method"
+    end
+    
+    it "should do what things do" do
+      @thing.what_things_do.should == "stuff"
+    end
+  end
+  
   describe OneThing do
-    # ... then you can include the example group like this, which 
+    # Now you can include the shared example group like this, which 
     # feels more like what you might say ...
-    it_should_behave_like "All Things"
+    it_should_behave_like "most things"
+    
     before(:each) { @thing = OneThing.new }
     
     it "should have access to helper methods defined in the shared example group" do
@@ -51,16 +58,24 @@ module SharedExampleGroupExample
   describe AnotherThing do
     # ... or you can include the example group like this, which
     # feels more like the programming language we love.
-    it_should_behave_like AllThings
+    it_should_behave_like MostThings
     
     before(:each) { @thing = AnotherThing.new }
+
+    it "should have access to helper methods defined in the shared example group" do
+      helper_method.should == "helper method"
+    end
   end
 
   describe YetAnotherThing do
     # ... or you can include the example group like this, which
     # feels more like the programming language we love.
-    include AllThings
+    include MostThings
     
     before(:each) { @thing = AnotherThing.new }
+
+    it "should have access to helper methods defined in the shared example group" do
+      helper_method.should == "helper method"
+    end
   end
 end

--- a/vendor/plugins/rspec/examples/stories/calculator.rb
+++ b/vendor/plugins/rspec/examples/stories/calculator.rb
@@ -27,7 +27,7 @@ Story "addition", %{
   As an accountant
   I want to add numbers
   So that I can count some beans
-}, :steps => steps do
+}, :steps_for => steps do
   Scenario "2 + 3" do
     Given "an addend of 2"
     And "an addend of 3"

--- /dev/null
+++ b/vendor/plugins/rspec/failing_examples/README.txt
@@ -0,0 +1,7 @@
+"Why have failing examples?", you might ask.
+
+They allow us to see failure messages. RSpec wants to provide meaningful and helpful failure messages. The failures in this directory not only provide you a way of seeing the failure messages, but they provide RSpec's own specs a way of describing what they should look like and ensuring they stay correct.
+
+To see the types of messages you can expect, stand in this directory and run:
+
+../bin/spec ./*.rb
\ No newline at end of file

--- /dev/null
+++ b/vendor/plugins/rspec/failing_examples/failing_autogenerated_docstrings_example.rb
@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+# Run spec w/ -fs to see the output of this file
+
+describe "Failing examples with no descriptions" do
+  
+  # description is auto-generated as "should equal(5)" based on the last #should
+  it do
+    3.should equal(2)
+    5.should equal(5)
+  end
+  
+  it { 3.should be > 5 }
+  
+  it { ["a"].should include("b") }
+  
+  it { [1,2,3].should_not respond_to(:size) }
+  
+end