From 9bcebbd6ab32faea10a581b2a8425b240fc6f747 Mon Sep 17 00:00:00 2001 From: dinedine Date: Fri, 17 Dec 2010 11:58:59 +0100 Subject: [PATCH] pickle as a gem --- Gemfile | 2 +- Gemfile.lock | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 85260334..69f13742 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ group :test do gem 'growl-glue' gem 'rspec-rails', '>= 2.0.0.beta.18' gem 'factory_girl_rails' - gem 'pickle', :git => 'http://github.com/ianwhite/pickle.git' + gem 'pickle' gem 'capybara' gem 'database_cleaner' diff --git a/Gemfile.lock b/Gemfile.lock index df7d86c5..e334acaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,16 +5,6 @@ GIT mocha (0.9.10.20101125155727) rake -GIT - remote: http://github.com/ianwhite/pickle.git - revision: 02483df89b513a9598f73be500af96fe8a398dda - specs: - pickle (0.4.4) - cucumber (>= 0.8) - rake - rspec (>= 1.3) - yard - GEM remote: http://rubygems.org/ specs: @@ -65,7 +55,7 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (>= 0.0.27) xpath (~> 0.1.2) - celerity (0.8.5) + celerity (0.8.6) childprocess (0.1.4) ffi (~> 0.6.3) closure-compiler (0.3.3) @@ -174,6 +164,11 @@ GEM will_paginate (~> 3.0.pre) net-ssh (2.0.23) nokogiri (1.4.3.1) + pickle (0.4.4) + cucumber (>= 0.8) + rake + rspec (>= 1.3) + yard polyglot (0.3.1) proxies (0.2.1) rack (1.2.1) @@ -203,11 +198,11 @@ GEM rspec-core (~> 2.3.0) rspec-expectations (~> 2.3.0) rspec-mocks (~> 2.3.0) - rspec-core (2.3.0) + rspec-core (2.3.1) rspec-expectations (2.3.0) diff-lcs (~> 1.1.2) rspec-mocks (2.3.0) - rspec-rails (2.3.0) + rspec-rails (2.3.1) actionpack (~> 3.0) activesupport (~> 3.0) railties (~> 3.0) @@ -286,7 +281,7 @@ DEPENDENCIES mimetype-fu mocha! mongoid (= 2.0.0.beta.19) - pickle! + pickle rails (>= 3.0.0) rmagick (= 2.12.2) rspec-rails (>= 2.0.0.beta.18)