From cdb8154fed536b4e59023d32117eafe47da218a8 Mon Sep 17 00:00:00 2001
From: Akash Manohar J <akash@akash.im>
Date: Wed, 28 Mar 2012 21:11:26 +0530
Subject: [PATCH] Adds bushido-faye

Signed-off-by: Akash Manohar J <akash@akash.im>
---
 Gemfile      |  2 +-
 Gemfile.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 81d0d138..e5927d5d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'bushido'
 
 # Server/transport gems
 gem 'thin'
-gem 'faye'
+gem 'bushido-faye'
 
 # Helper gems
 gem 'kaminari'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2cc925d3..173b248b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,6 +56,13 @@ GEM
       json (>= 1.4.6)
       orm_adapter (~> 0.0.3)
       rest-client (>= 1.6.1)
+    bushido-faye (0.8.1)
+      cookiejar (>= 0.3.0)
+      em-http-request (>= 0.3.0)
+      eventmachine (>= 0.12.0)
+      faye-websocket (>= 0.4.0)
+      rack (>= 1.0.0)
+      yajl-ruby (>= 1.0.0)
     cocaine (0.2.1)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -93,13 +100,6 @@ GEM
     factory_girl_rails (1.7.0)
       factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
-    faye (0.8.1)
-      cookiejar (>= 0.3.0)
-      em-http-request (>= 0.3.0)
-      eventmachine (>= 0.12.0)
-      faye-websocket (>= 0.4.0)
-      rack (>= 1.0.0)
-      yajl-ruby (>= 1.0.0)
     faye-websocket (0.4.4)
       eventmachine (>= 0.12.0)
     highline (1.6.11)
@@ -213,13 +213,13 @@ DEPENDENCIES
   aws-sdk
   bourbon
   bushido
+  bushido-faye
   coffee-rails (~> 3.2.1)
   devise
   devise_bushido_authenticatable
   eco
   execjs
   factory_girl_rails
-  faye
   jquery-rails
   kaminari
   paperclip