From a5f6b6512d53b9252e049443561dd567d6ad425a Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Sun, 27 Mar 2011 10:46:38 -0700
Subject: [PATCH] Upgrade cucumber version

---
 Gemfile.lock | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6712ef5dc..adf9621aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,6 +121,7 @@ GEM
     carrierwave (0.5.2)
       activesupport (~> 3.0)
     cgi_multipart_eof_fix (2.5.0)
+    chalofa_ruby-progressbar (0.0.9.1)
     chef (0.9.12)
       bunny (>= 0.6.0)
       erubis
@@ -143,12 +144,12 @@ GEM
     columnize (0.3.2)
     configuration (1.2.0)
     crack (0.1.8)
-    cucumber (0.10.0)
+    cucumber (0.10.2)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
     culerity (0.2.15)
@@ -188,14 +189,14 @@ GEM
       nokogiri (~> 1.4.3.1)
       ruby-hmac
     foreigner (0.9.1)
-    formatador (0.0.16)
-    fuubar (0.0.3)
+    formatador (0.1.2)
+    fuubar (0.0.4)
+      chalofa_ruby-progressbar (~> 0.0.9)
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.4)
-      ruby-progressbar (~> 0.0.9)
     gem_plugin (0.2.3)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
+    gherkin (2.3.5)
+      json (>= 1.4.6)
     haml (3.0.25)
     hashie (0.4.0)
     highline (1.6.1)
@@ -236,7 +237,7 @@ GEM
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
     multi_json (0.0.5)
-    multi_xml (0.2.1)
+    multi_xml (0.2.2)
     multipart-post (1.1.0)
     mysql2 (0.2.6)
     net-ldap (0.1.1)
@@ -290,7 +291,7 @@ GEM
       oa-openid (= 0.1.6)
     polyglot (0.3.1)
     pyu-ruby-sasl (0.0.3.2)
-    rack (1.2.1)
+    rack (1.2.2)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
     rack-openid (1.2.0)
@@ -346,7 +347,6 @@ GEM
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
-    ruby-progressbar (0.0.9)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
     selenium-client (1.2.18)
@@ -358,7 +358,7 @@ GEM
       json_pure
       rubyzip
     simple_oauth (0.1.4)
-    sinatra (1.2.0)
+    sinatra (1.2.1)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
     subexec (0.0.4)
@@ -375,7 +375,7 @@ GEM
     typhoeus (0.2.4)
       mime-types
       mime-types
-    tzinfo (0.3.24)
+    tzinfo (0.3.25)
     uuidtools (2.1.2)
     vegas (0.1.8)
       rack (>= 1.0.0)