From 4f89f957f10ac251c6b8659fa45ca70b5efbf09b Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Mon, 27 Sep 2010 10:51:29 -0700
Subject: [PATCH] Putting in version switches for gems that don't work in 1.9
---
Gemfile | 3 ++-
Gemfile.lock | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/Gemfile b/Gemfile
index 9560f07d1f..55e340dec1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,6 +38,7 @@ gem 'mini_magick'
group :test, :development do
gem 'factory_girl_rails'
+ gem 'ruby-debug' if RUBY_VERSION.include? "1.8"
end
group :test do
@@ -46,7 +47,7 @@ group :test do
gem 'rspec', '>= 2.0.0.beta.17'
gem 'rspec-rails', '2.0.0.beta.17'
gem 'mocha'
- gem 'redgreen'
+ gem 'redgreen' if RUBY_VERSION.include? "1.8"
gem 'autotest'
gem 'database_cleaner'
gem 'webmock'
diff --git a/Gemfile.lock b/Gemfile.lock
index 71e42e422d..a56760270f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -116,6 +116,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.3)
+ columnize (0.3.1)
crack (0.1.8)
cucumber (0.9.0)
builder (~> 2.1.2)
@@ -151,6 +152,7 @@ GEM
i18n (0.4.1)
json (1.4.6)
json_pure (1.4.6)
+ linecache (0.43)
mail (2.2.6.1)
activesupport (>= 2.3.6)
mime-types
@@ -212,6 +214,11 @@ GEM
rspec-rails (2.0.0.beta.17)
rspec (>= 2.0.0.beta.14)
webrat (>= 0.7.0)
+ ruby-debug (0.10.3)
+ columnize (>= 0.1)
+ ruby-debug-base (~> 0.10.3.0)
+ ruby-debug-base (0.10.3)
+ linecache (>= 0.3)
rubyzip (0.9.4)
selenium-webdriver (0.0.28)
ffi (>= 0.6.1)
@@ -271,6 +278,7 @@ DEPENDENCIES
roxml!
rspec (>= 2.0.0.beta.17)
rspec-rails (= 2.0.0.beta.17)
+ ruby-debug
sprinkle!
thin
webmock
--
GitLab