--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-*/.DS_STORE
+*/.DS_Store
+.DS_Store
 coverage/*
\ No newline at end of file

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

--- a/script/spec_server
+++ b/script/spec_server
@@ -6,27 +6,41 @@ require 'drb/drb'
 require 'rbconfig'
 require 'spec'
 require 'optparse'
-specmate = ENV['HOME'] + "/Library/Application\ Support/TextMate/Bundles/RSpec.tmbundle/Support/lib"
-if File.directory?(specmate)
-  $LOAD_PATH.unshift(specmate) 
-  require 'text_mate_formatter'
-end
 
 # This is based on Florian Weber's TDDMate
-
 module Spec
   module Runner
     class RailsSpecServer
-      def run(args, stderr, stdout)
-    	$stdout = stdout
-    	$stderr = stderr
+      def run(argv, stderr, stdout)
+        $stdout = stdout
+        $stderr = stderr
+
+        base = ActiveRecord::Base
+        def base.clear_reloadable_connections!
+          active_connections.each do |name, conn|
+            if conn.requires_reloading?
+              conn.disconnect!
+              active_connections.delete(name)
+            end
+          end
+        end        
 
-        ::Dispatcher.reset_application!
+        if ::Dispatcher.respond_to?(:cleanup_application)
+          ::Dispatcher.cleanup_application
+        elsif ::Dispatcher.respond_to?(:reset_application!)
+          ::Dispatcher.reset_application!
+        end
         ::Dependencies.mechanism = :load
         require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
         load File.dirname(__FILE__) + '/../spec/spec_helper.rb'
-    
-        ::Spec::Runner::CommandLine.run(args, stderr, stdout, false, true)
+
+        ::Spec::Runner::CommandLine.run(
+          ::Spec::Runner::OptionParser.parse(
+            argv,
+            $stderr,
+            $stdout
+          )
+        )
       end
     end
   end
@@ -43,7 +57,7 @@ def restart_test_server
   ruby         = File::join(config['bindir'], config['ruby_install_name']) + config['EXEEXT']
   command_line = [ruby, $0, ARGV].flatten.join(' ')
   exec(command_line)
-end  
+end
 
 def daemonize(pid_file = nil)
   return yield if $DEBUG
@@ -83,4 +97,3 @@ if options[:daemon]
 else
   exec_server.call
 end
-

--- /dev/null
+++ b/spec/rcov.opts
@@ -0,0 +1,2 @@
+--exclude "spec/*,gems/*" 
+--rails
\ No newline at end of file

--- /dev/null
+++ b/stories/all.rb
@@ -0,0 +1,4 @@
+dir = File.dirname(__FILE__)
+Dir[File.expand_path("#{dir}/**/*.rb")].uniq.each do |file|
+  require file
+end
\ No newline at end of file

--- /dev/null
+++ b/stories/helper.rb
@@ -0,0 +1,3 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'spec/rails/story_adapter'
\ No newline at end of file