From 1d1889d155a20028cdb19c9a18f5bde5f5e89d9d Mon Sep 17 00:00:00 2001
From: did <didier@nocoffee.fr>
Date: Thu, 23 Jun 2011 23:17:36 +0200
Subject: [PATCH] new bushido gem version

---
 Gemfile      |  2 +-
 Gemfile.lock | 37 ++++++++++++++++---------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/Gemfile b/Gemfile
index d5779565..dd90b913 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,7 @@ group :test do
   gem 'rspec-rails', '2.3.1'
   gem 'factory_girl_rails'
   gem 'pickle'
-  gem 'xpath',            :git => 'https://github.com/wunderbread/xpath.git'
+  gem 'xpath', '0.1.3'
   gem 'capybara'
 
   gem 'database_cleaner'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8d8f2c55..1651565e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,13 +11,6 @@ GIT
   specs:
     mocha (0.9.12.20110213002255)
 
-GIT
-  remote: https://github.com/wunderbread/xpath.git
-  revision: d04da707886287e7dfe82705fda5b3d4f65e94c3
-  specs:
-    xpath (0.1.2)
-      nokogiri (~> 1.4)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -65,11 +58,11 @@ GEM
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (2.1.2)
-    bushido (0.0.25)
+    bushido (0.0.29)
       highline (>= 1.6.1)
       json (>= 1.4.6)
       rest-client (>= 1.6.1)
-    capybara (0.4.0)
+    capybara (0.4.1.2)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -77,12 +70,12 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.2)
+      xpath (~> 0.1.3)
     celerity (0.8.9)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
     columnize (0.3.3)
-    configuration (1.2.0)
+    configuration (1.3.1)
     crack (0.1.8)
     cucumber (0.8.5)
       builder (~> 2.1.2)
@@ -93,10 +86,10 @@ GEM
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
     culerity (0.2.15)
-    custom_fields (1.0.0.beta.17)
+    custom_fields (1.0.0.beta.18)
       activesupport (>= 3.0.7)
       mongoid (= 2.0.2)
-    daemons (1.1.3)
+    daemons (1.1.4)
     database_cleaner (0.6.7)
     delayed_job (2.1.4)
       activesupport (~> 3.0)
@@ -139,7 +132,7 @@ GEM
     heroku (1.19.1)
       activesupport (>= 2.1.0)
       launchy (~> 0.3.2)
-      rest-client (< 1.7.0, >= 1.4.0)
+      rest-client (>= 1.4.0, < 1.7.0)
     highline (1.6.2)
     httparty (0.7.8)
       crack (= 0.1.8)
@@ -149,9 +142,9 @@ GEM
       responders (~> 0.6.0)
     jammit (0.6.3)
       yui-compressor (>= 0.9.3)
-    json (1.5.2)
+    json (1.5.3)
     json_pure (1.4.6)
-    kgio (2.4.2)
+    kgio (2.5.0)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
@@ -182,7 +175,7 @@ GEM
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     net-ssh (2.1.4)
-    nokogiri (1.4.5)
+    nokogiri (1.4.6)
     open4 (1.0.1)
     orm_adapter (0.0.5)
     pickle (0.4.7)
@@ -248,8 +241,8 @@ GEM
     s3 (0.3.8)
       proxies (~> 0.2.0)
     sass (3.1.2)
-    selenium-webdriver (0.2.1)
-      childprocess (>= 0.1.7)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
@@ -266,6 +259,8 @@ GEM
     warden (1.0.4)
       rack (>= 1.0)
     will_paginate (2.3.15)
+    xpath (0.1.3)
+      nokogiri (~> 1.3)
     yui-compressor (0.9.6)
       POpen4 (>= 0.1.4)
 
@@ -284,7 +279,7 @@ DEPENDENCIES
   capybara
   cucumber (= 0.8.5)
   cucumber-rails
-  custom_fields (= 1.0.0.beta.17)
+  custom_fields (= 1.0.0.beta.18)
   database_cleaner
   delayed_job (= 2.1.4)
   delayed_job_mongoid (= 1.0.2)
@@ -319,4 +314,4 @@ DEPENDENCIES
   unicorn
   warden
   will_paginate
-  xpath!
+  xpath (= 0.1.3)