From eb82548452e818ce3416184e1bfbfeeff84d0f40 Mon Sep 17 00:00:00 2001
From: Jacques Crocker <railsjedi@gmail.com>
Date: Sun, 25 Jul 2010 18:59:03 -0700
Subject: [PATCH] Fixing up dependencies (httparty/crack) and adding autotest

---
 Gemfile              |  6 +++---
 Gemfile.lock         | 23 ++++++++++++-----------
 autotest/discover.rb |  2 ++
 3 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 autotest/discover.rb

diff --git a/Gemfile b/Gemfile
index 0199ff26..f6cf5b68 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,8 +7,8 @@ gem 'rails', '3.0.0.beta4'
 gem 'liquid', '2.0.0'
 gem 'bson_ext', '>= 1.0.1'
 gem 'mongo_ext'
-# gem 'mongoid', :git => 'git@github.com:did/mongoid.git'
 gem 'mongoid-locomotive'
+# gem 'mongoid', "2.0.0.beta11"
 gem 'mongoid_acts_as_tree', '0.1.5'
 gem 'mongo_session_store', '2.0.0.pre'
 gem 'warden'
@@ -17,12 +17,11 @@ gem 'haml', '3.0.13'
 gem 'rmagick', '2.12.2'
 gem 'aws'
 gem 'mimetype-fu', :require => 'mimetype_fu'
-# gem 'formtastic-rails3', :require => 'formtastic'
 gem "formtastic", :git => "http://github.com/justinfrench/formtastic.git", :branch => "rails3"
 gem 'carrierwave-rails3', :require => 'carrierwave'
 gem 'actionmailer-with-request', :require => 'actionmailer_with_request'
 gem 'heroku'
-gem 'httparty', '0.6.0'
+gem 'httparty', '0.6.1'
 gem 'RedCloth'
 gem 'inherited_resources', '1.1.2'
 gem 'jeweler'
@@ -41,6 +40,7 @@ group :test, :development do
 end
 
 group :test do
+  gem "autotest"
   gem 'rspec-rails', '2.0.0.beta.18'
   gem 'factory_girl_rails'
   gem 'capybara'
diff --git a/Gemfile.lock b/Gemfile.lock
index e51409c8..eab7bb14 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,6 +50,7 @@ GEM
     activesupport (3.0.0.beta4)
     arel (0.4.0)
       activesupport (>= 3.0.0.beta)
+    autotest (4.3.2)
     aws (2.3.13)
       http_connection
       uuidtools
@@ -68,7 +69,7 @@ GEM
     cgi_multipart_eof_fix (2.5.0)
     columnize (0.3.1)
     configuration (1.1.0)
-    crack (0.1.7)
+    crack (0.1.8)
     cucumber (0.8.5)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
@@ -82,7 +83,6 @@ GEM
     devise (1.1.rc1)
       warden (~> 0.10.3)
     diff-lcs (1.1.2)
-    durran-validatable (2.0.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (1.3.1)
@@ -104,8 +104,8 @@ GEM
       launchy (~> 0.3.2)
       rest-client (~> 1.4.0)
     http_connection (1.3.0)
-    httparty (0.6.0)
-      crack (= 0.1.7)
+    httparty (0.6.1)
+      crack (= 0.1.8)
     i18n (0.4.1)
     inherited_resources (1.1.2)
       has_scope (~> 0.5.0)
@@ -118,7 +118,6 @@ GEM
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    leshill-will_paginate (2.3.11)
     linecache (0.43)
     liquid (2.0.0)
     mail (2.2.5)
@@ -132,11 +131,12 @@ GEM
     mongo_ext (0.19.3)
     mongo_session_store (2.0.0.pre)
       actionpack (~> 3.0)
-    mongoid (1.0.6)
-      activesupport (>= 2.2.2)
-      durran-validatable (>= 2.0.1)
-      leshill-will_paginate (>= 2.3.11)
-      mongo (>= 0.18.2)
+    mongoid (2.0.0.beta11)
+      activemodel (~> 3.0.0.beta)
+      bson (~> 1.0.4)
+      mongo (~> 1.0.5)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
     mongoid-locomotive (2.0.0.beta9)
       activemodel (~> 3.0.0.beta)
       bson (~> 1.0.4)
@@ -226,6 +226,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   actionmailer-with-request
+  autotest
   aws
   bson_ext (>= 1.0.1)
   capybara
@@ -239,7 +240,7 @@ DEPENDENCIES
   formtastic!
   haml (= 3.0.13)
   heroku
-  httparty (= 0.6.0)
+  httparty (= 0.6.1)
   inherited_resources (= 1.1.2)
   jeweler
   launchy
diff --git a/autotest/discover.rb b/autotest/discover.rb
new file mode 100644
index 00000000..9f224307
--- /dev/null
+++ b/autotest/discover.rb
@@ -0,0 +1,2 @@
+Autotest.add_discovery { "rails" }
+Autotest.add_discovery { "rspec2" }
\ No newline at end of file