From 804aac2c7c553dde2f904add8f6803bc4b0876f9 Mon Sep 17 00:00:00 2001
From: Nathan Broadbent <nathan.f77@gmail.com>
Date: Tue, 29 May 2012 13:17:26 +1200
Subject: [PATCH] Fixed ruby-debug conditional in Gemfile

---
 Gemfile      | 4 ++--
 Gemfile.lock | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index fb28dfb..b4ef20b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,9 +36,9 @@ gem 'json', '~> 1.4.6'
 group :development, :test do
   gem 'rspec-rails', '~> 2.6'
   gem 'webmock', :require => false
-  unless ENV['TRAVIS']
+  unless ENV["CI"]
     gem 'ruby-debug', :platform => :mri_18
-    # gem 'ruby-debug19', :platform => :mri_19, :require => 'ruby-debug'
+    gem (RUBY_VERSION == "1.9.2" ? 'ruby-debug19' : 'debugger'), :platform => :mri_19
   end
   # gem 'rpm_contrib', :git => "git://github.com/bensymonds/rpm_contrib.git", :branch => "mongo-1.4.0_update"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 2aadb81..4cf3455 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -45,6 +45,13 @@ GEM
       addressable
       rdoc
     database_cleaner (0.6.7)
+    debugger (1.1.3)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.2)
+    debugger-linecache (1.1.1)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.2)
     devise (1.5.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
@@ -214,6 +221,7 @@ DEPENDENCIES
   bson (= 1.3.1)
   bson_ext (= 1.3.1)
   database_cleaner (~> 0.6.0)
+  debugger
   devise (~> 1.5.3)
   email_spec
   fabrication (~> 1.3.0)
--
libgit2 0.21.2