aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAditya Sanghi <asanghi@me.com>2012-04-17 15:00:33 +0530
committerAditya Sanghi <asanghi@me.com>2012-04-17 15:00:33 +0530
commit56674dbfc1718c35c33ee35baba349fc752f6725 (patch)
tree91a332853c0fdd4817df88adf89e128acbc0a34e /railties
parent9a97699460e9b35a4c9e7a9694cf444fa75c7861 (diff)
downloadrails-56674dbfc1718c35c33ee35baba349fc752f6725.tar.gz
rails-56674dbfc1718c35c33ee35baba349fc752f6725.tar.bz2
rails-56674dbfc1718c35c33ee35baba349fc752f6725.zip
Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more maintained debugger gem
Diffstat (limited to 'railties')
-rw-r--r--railties/guides/code/getting_started/Gemfile2
-rw-r--r--railties/guides/source/debugging_rails_applications.textile2
-rw-r--r--railties/lib/rails/generators/app_base.rb2
-rw-r--r--railties/test/generators/app_generator_test.rb4
4 files changed, 5 insertions, 5 deletions
diff --git a/railties/guides/code/getting_started/Gemfile b/railties/guides/code/getting_started/Gemfile
index 768985070c..582a176a44 100644
--- a/railties/guides/code/getting_started/Gemfile
+++ b/railties/guides/code/getting_started/Gemfile
@@ -35,4 +35,4 @@ gem 'jquery-rails'
# gem 'capistrano'
# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
+# gem 'debugger'
diff --git a/railties/guides/source/debugging_rails_applications.textile b/railties/guides/source/debugging_rails_applications.textile
index 57c7786636..ef0f496870 100644
--- a/railties/guides/source/debugging_rails_applications.textile
+++ b/railties/guides/source/debugging_rails_applications.textile
@@ -205,7 +205,7 @@ The debugger used by Rails, +ruby-debug+, comes as a gem. To install it, just ru
$ sudo gem install ruby-debug
</shell>
-TIP: If you are using Ruby 1.9, you can install a compatible version of +ruby-debug+ by running +sudo gem install ruby-debug19+
+TIP: If you are using Ruby 1.9, you can install a compatible version of +debugger+ by running +sudo gem install debugger+
In case you want to download a particular version or get the source code, refer to the "project's page on rubyforge":http://rubyforge.org/projects/ruby-debug/.
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 2843ac8c1a..4b7decee5c 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -188,7 +188,7 @@ module Rails
if RUBY_VERSION < "1.9"
"gem 'ruby-debug'"
else
- "gem 'ruby-debug19', :require => 'ruby-debug'"
+ "gem 'debugger'"
end
end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 0803fd0fc5..5bf1dbda8d 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -308,10 +308,10 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
end
- def test_inclusion_of_ruby_debug19_if_ruby19
+ def test_inclusion_of_debugger_if_ruby19
run_generator
assert_file "Gemfile" do |contents|
- assert_match(/gem 'ruby-debug19', :require => 'ruby-debug'/, contents) unless RUBY_VERSION < '1.9'
+ assert_match(/gem 'debugger'/, contents) unless RUBY_VERSION < '1.9'
end
end