From 7a2ab42948716e44c5614f2131582e2dea02d0df Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Sun, 22 May 2011 17:51:53 -0700
Subject: [PATCH] Locking to older version of rspec-core as new version has
 invalid specification

---
 Gemfile      |  1 +
 Gemfile.lock | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index a1af70f74..0076b62e5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,6 +79,7 @@ group :test do
   gem 'capybara', '~> 0.3.9'
   gem 'cucumber-rails', '0.3.2'
   gem 'rspec', '>= 2.0.0'
+  gem 'rspec-core', '2.6.0'
   gem 'rspec-rails', '>= 2.0.0'
   gem 'rcov', :require => false
   gem 'database_cleaner', '0.6.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index e2c6e116a..df6e73be4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -97,7 +97,7 @@ GEM
       activesupport (= 3.0.3)
     activesupport (3.0.3)
     addressable (2.2.2)
-    arel (2.0.9)
+    arel (2.0.10)
     aws (2.3.32)
       activesupport
       http_connection
@@ -124,20 +124,19 @@ 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
       extlib
       highline
-      json (<= 1.4.6, >= 1.4.4)
+      json (>= 1.4.4, <= 1.4.6)
       mixlib-authentication (>= 1.1.0)
       mixlib-cli (>= 1.1.0)
       mixlib-config (>= 1.1.2)
       mixlib-log (>= 1.2.0)
       moneta
       ohai (>= 0.5.7)
-      rest-client (< 1.7.0, >= 1.0.4)
+      rest-client (>= 1.0.4, < 1.7.0)
       uuidtools
     childprocess (0.1.7)
       ffi (~> 0.6.3)
@@ -164,7 +163,7 @@ GEM
       warden (~> 1.0.3)
     devise_invitable (0.5.0)
       devise (~> 1.3.1)
-      rails (<= 3.2, >= 3.0.0)
+      rails (>= 3.0.0, <= 3.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -178,7 +177,7 @@ GEM
     faraday (0.5.4)
       addressable (~> 2.2.2)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     faraday_middleware (0.3.2)
       faraday (~> 0.5.4)
     fastercsv (1.5.4)
@@ -196,11 +195,11 @@ GEM
       nokogiri (~> 1.4.3.1)
       ruby-hmac
     foreigner (0.9.1)
-    formatador (0.1.3)
-    fuubar (0.0.4)
-      chalofa_ruby-progressbar (~> 0.0.9)
+    formatador (0.1.4)
+    fuubar (0.0.5)
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.4)
+      ruby-progressbar (~> 0.0.10)
     gem_plugin (0.2.3)
     gherkin (2.3.8)
       json (>= 1.4.6)
@@ -208,7 +207,7 @@ GEM
     hashie (0.4.0)
     highline (1.6.2)
     http_connection (1.4.1)
-    i18n (0.5.0)
+    i18n (0.6.0)
     i18n-inflector (2.5.1)
       i18n (>= 0.4.1)
     i18n-inflector-rails (1.0.3)
@@ -285,7 +284,7 @@ GEM
       multi_json (~> 0.0.4)
     ohai (0.5.8)
       extlib
-      json (<= 1.4.6, >= 1.4.4)
+      json (>= 1.4.4, <= 1.4.6)
       mixlib-cli
       mixlib-config
       mixlib-log
@@ -356,6 +355,7 @@ GEM
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
+    ruby-progressbar (0.0.10)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
     selenium-client (1.2.18)
@@ -369,7 +369,7 @@ GEM
     simple_oauth (0.1.5)
     sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
+      tilt (>= 1.2.2, < 2.0)
     subexec (0.0.4)
     systemu (2.2.0)
     term-ansicolor (1.0.5)
@@ -378,7 +378,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
-    tilt (1.3)
+    tilt (1.3.1)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     typhoeus (0.2.4)
@@ -444,6 +444,7 @@ DEPENDENCIES
   rest-client (= 1.6.1)
   roxml!
   rspec (>= 2.0.0)
+  rspec-core (= 2.6.0)
   rspec-instafail (>= 0.1.7)
   rspec-rails (>= 2.0.0)
   ruby-debug