Merge remote branch 'aavalam/rails3' into rails3

.gitignore

@@ -29,6 +29,7 @@ index/**/*
 *.tmproj
 *.autobackupbyrefinery.*
 /refinerycms-*.gem
+.autotest
 
 # Mac
 .DS_Store

Gemfile

@@ -69,14 +69,15 @@ gem 'dragonfly',        :git => 'git://github.com/parndt/dragonfly.git',
 
 # REFINERY CMS DEVELOPMENT ====================================================
 
-group :test do
+group :test, :development do
   gem 'json_pure',          '= 1.4.6', :require => 'json/pure'
 
   gem 'rspec',              (RSPEC_VERSION = '~> 2.0.0.beta.19')
   gem 'rspec-core',         RSPEC_VERSION, :require => 'rspec/core'
   gem 'rspec-expectations', RSPEC_VERSION, :require => 'rspec/expectations'
   gem 'rspec-mocks',        RSPEC_VERSION, :require => 'rspec/mocks'
-  gem 'rspec-rails',        RSPEC_VERSION
+  #  gem 'rspec-rails',        RSPEC_VERSION
+  gem 'rspec-rails', '>= 2.0.0.beta.19' 
   gem 'capybara'
   gem 'database_cleaner'
   gem 'cucumber-rails'
@@ -88,4 +89,9 @@ group :test do
   gem 'ruby-prof'
 end
 
-# END REFINERY CMS DEVELOPMENT =================================================
+# END REFINERY CMS DEVELOPMENT =================================================
+
+# Added by vhgiii
+gem 'autotest-rails'
+gem 'autotest'
+

autotest.example

@@ -0,0 +1,14 @@
+###  uncomment any of the following requires applicable for your system
+###  and then copy this to .autotest if you are using the ZenTest autotest.
+# require "autotest/restart"
+# require "test_notifier/runner/autotest"
+# require "redgreen/autotest"
+# require "autotest/timestamp"
+
+# adds exceptions from .gitignore file, please modify exceptions there!
+imported_exceptions =  IO.readlines('.gitignore').inject([]) {|acc, line| acc << line.strip if line.to_s[0] != '#' && line.strip != ''; acc }
+Autotest.add_hook :initialize do |autotest|
+  imported_exceptions.each do |exception|
+    autotest.add_exception(exception) 
+  end
+end