From 7b3d921aceec3227e7ad22a472d53ab9883c44b2 Mon Sep 17 00:00:00 2001
From: Helge Rausch <helge@rausch.io>
Date: Sat, 5 May 2012 11:50:25 +0200
Subject: [PATCH] adding 'debugger' gem to Gemfile

It fixes a lot of the issues ruby-debug19 has.
---
 Gemfile      | 11 +++++++----
 Gemfile.lock | 28 ++++++++--------------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1c6e2fce9..65d098434 100644
--- a/Gemfile
+++ b/Gemfile
@@ -169,10 +169,13 @@ group :test do
 end
 
 group :test, :development do
-  # Use the latest Jasmine from github for asset pipeline compatibility
-  gem 'ruby-debug-base19', '0.11.23' if RUBY_VERSION.include? '1.9.1'
-  gem 'ruby-debug19', :platforms => :ruby_19
-  gem 'ruby-debug', :platforms => :mri_18
+  if RUBY_VERSION[/1\.9\.[23]/]
+    gem 'debugger'
+  else
+    gem 'ruby-debug-base19', '0.11.23' if RUBY_VERSION.include? '1.9.1'
+    gem 'ruby-debug19', :platforms => :ruby_19
+    gem 'ruby-debug', :platforms => :mri_18
+  end
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index e632ce2f5..9ece023aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,7 +83,6 @@ GEM
     airbrake (3.0.9)
       activesupport
       builder
-    archive-tar-minitar (0.5.2)
     arel (2.2.3)
     asset_sync (0.3.1)
       activemodel
@@ -137,6 +136,13 @@ GEM
       nokogiri (>= 1.5.0)
     daemons (1.1.8)
     database_cleaner (0.7.1)
+    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)
@@ -255,8 +261,6 @@ GEM
     launchy (2.0.3)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -407,24 +411,9 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.9.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
     ruby-hmac (0.4.0)
     ruby-oembed (0.8.7)
     ruby-progressbar (0.0.10)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.7)
     sass (3.1.15)
     sass-rails (3.1.4)
@@ -513,6 +502,7 @@ DEPENDENCIES
   client_side_validations
   cucumber-rails (= 1.3.0)
   database_cleaner (= 0.7.1)
+  debugger
   devise (= 1.5.3)
   diaspora-client!
   em-synchrony (= 1.0.0)
@@ -575,8 +565,6 @@ DEPENDENCIES
   rspec-core (~> 2.9.0)
   rspec-instafail (>= 0.1.7)
   rspec-rails (~> 2.9.0)
-  ruby-debug
-  ruby-debug19
   ruby-oembed (~> 0.8.7)
   sass-rails (= 3.1.4)
   selenium-webdriver