From fb3e63e74c15c86087eec885a1ee9892e63a235b Mon Sep 17 00:00:00 2001
From: Samuel Cochran <sj26@sj26.com>
Date: Thu, 22 Mar 2012 11:43:42 +0800
Subject: [PATCH] Update gems, remove deprecated guard-ego

---
 Gemfile      |  3 +--
 Gemfile.lock | 21 +++++++++------------
 Guardfile    |  4 ----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8336de9..d42e2d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,6 @@ gemspec
 
 group :guard do
   gem 'guard'
-  gem 'guard-ego'
   gem 'guard-compass'
   gem 'guard-coffeescript'
 end
@@ -12,4 +11,4 @@ end
 group :guard_mac do
   gem 'rb-fsevent'
   gem 'growl'
-end
\ No newline at end of file
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 9bacf3d..6e13861 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,7 +14,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.0)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     chunky_png (1.2.5)
@@ -26,42 +26,40 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    daemons (1.1.6)
+    daemons (1.1.8)
     eventmachine (0.12.10)
     execjs (1.3.0)
       multi_json (~> 1.0)
     ffi (1.0.11)
     fssm (0.2.8.1)
     growl (1.0.3)
-    guard (1.0.0)
+    guard (1.0.1)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
-    guard-coffeescript (0.5.4)
+    guard-coffeescript (0.5.6)
       coffee-script (>= 2.2.0)
       guard (>= 0.8.3)
     guard-compass (0.0.6)
       compass (>= 0.10.5)
       guard (>= 0.2.1)
-    guard-ego (0.0.1)
-      guard (>= 0.2.1)
     haml (3.1.4)
     i18n (0.6.0)
     json (1.6.5)
-    mail (2.4.1)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
+    mime-types (1.18)
+    multi_json (1.1.0)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
     rake (0.9.2.2)
-    rb-fsevent (0.4.3.1)
+    rb-fsevent (0.9.0)
     rdoc (3.12)
       json (~> 1.4)
-    sass (3.1.12)
+    sass (3.1.15)
     sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
@@ -90,7 +88,6 @@ DEPENDENCIES
   guard
   guard-coffeescript
   guard-compass
-  guard-ego
   mailcatcher!
   rake
   rb-fsevent
diff --git a/Guardfile b/Guardfile
index eeef22d..5777792 100644
--- a/Guardfile
+++ b/Guardfile
@@ -1,10 +1,6 @@
 # Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'ego' do
-  watch 'Guardfile'
-end
-
 guard 'compass', :sass_dir => "public/stylesheets", :line_comments => false, :css_dir => "public/stylesheets" do
   watch %r{^public/stylesheets/.+\.s[ac]ss}
 end