From 0232543e0d885902b5b3ea9c4cf0638d76583a35 Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Tue, 17 Apr 2012 15:31:05 +0530 Subject: stamp out ruby-debug19 with extreme prejudice :) --- railties/lib/rails/commands/console.rb | 6 +++--- railties/lib/rails/commands/server.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'railties/lib/rails/commands') diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb index d7c9e820dc..37befdf697 100644 --- a/railties/lib/rails/commands/console.rb +++ b/railties/lib/rails/commands/console.rb @@ -27,7 +27,7 @@ module Rails opt.on("-e", "--environment=name", String, "Specifies the environment to run this console under (test/development/production).", "Default: development") { |v| options[:environment] = v.strip } - opt.on("--debugger", 'Enable ruby-debugging for the console.') { |v| options[:debugger] = v } + opt.on("--debugger", 'Enable ruby debugging for the console.') { |v| options[:debugger] = v } opt.parse!(arguments) end @@ -73,10 +73,10 @@ module Rails def require_debugger begin - require 'ruby-debug' + require 'debugger' puts "=> Debugger enabled" rescue Exception - puts "You need to install ruby-debug19 to run the console in debugging mode. With gems, use 'gem install ruby-debug19'" + puts "You need to install debugger to run the console in debugging mode. With gems, use 'gem install debugger'" exit end end diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 721a47a974..2dea456386 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -17,7 +17,7 @@ module Rails opts.on("-c", "--config=file", String, "Use custom rackup configuration file") { |v| options[:config] = v } opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true } - opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = true } + opts.on("-u", "--debugger", "Enable ruby debugging for the server.") { options[:debugger] = true } opts.on("-e", "--environment=name", String, "Specifies the environment to run this server under (test/development/production).", "Default: development") { |v| options[:environment] = v } -- cgit v1.2.3 From 67ede880550836ce9f66164c56c8afeb397a54da Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Wed, 18 Apr 2012 02:24:44 +0530 Subject: another attempt at the language --- railties/lib/rails/commands/console.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails/commands') diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb index 37befdf697..4213be94d1 100644 --- a/railties/lib/rails/commands/console.rb +++ b/railties/lib/rails/commands/console.rb @@ -76,7 +76,7 @@ module Rails require 'debugger' puts "=> Debugger enabled" rescue Exception - puts "You need to install debugger to run the console in debugging mode. With gems, use 'gem install debugger'" + puts "You need to install a debugger to run the console in debugging mode. With gems, use 'gem install debugger'" exit end end -- cgit v1.2.3 From d6c831c198baee2542a070c62f1608f88fe60e34 Mon Sep 17 00:00:00 2001 From: Aditya Sanghi Date: Tue, 24 Apr 2012 21:56:41 -0500 Subject: and one more time --- railties/lib/rails/commands/console.rb | 4 ++-- railties/lib/rails/commands/server.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'railties/lib/rails/commands') diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb index 4213be94d1..cd6a03fe51 100644 --- a/railties/lib/rails/commands/console.rb +++ b/railties/lib/rails/commands/console.rb @@ -27,7 +27,7 @@ module Rails opt.on("-e", "--environment=name", String, "Specifies the environment to run this console under (test/development/production).", "Default: development") { |v| options[:environment] = v.strip } - opt.on("--debugger", 'Enable ruby debugging for the console.') { |v| options[:debugger] = v } + opt.on("--debugger", 'Enable the debugger.') { |v| options[:debugger] = v } opt.parse!(arguments) end @@ -76,7 +76,7 @@ module Rails require 'debugger' puts "=> Debugger enabled" rescue Exception - puts "You need to install a debugger to run the console in debugging mode. With gems, use 'gem install debugger'" + puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle, and try again." exit end end diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 2dea456386..4c4caad69f 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -17,7 +17,7 @@ module Rails opts.on("-c", "--config=file", String, "Use custom rackup configuration file") { |v| options[:config] = v } opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true } - opts.on("-u", "--debugger", "Enable ruby debugging for the server.") { options[:debugger] = true } + opts.on("-u", "--debugger", "Enable the debugger") { options[:debugger] = true } opts.on("-e", "--environment=name", String, "Specifies the environment to run this server under (test/development/production).", "Default: development") { |v| options[:environment] = v } -- cgit v1.2.3