5 files changed, 15 insertions, 74 deletions
diff --git a/railties/lib/rails/commands/application.rb b/railties/lib/rails/commands/application.rb
index 2d9708e5b5..2ff29418c6 100644
--- a/railties/lib/rails/commands/application.rb
+++ b/railties/lib/rails/commands/application.rb
@@ -9,12 +9,19 @@ if ARGV.first != "new"
   ARGV[0] = "--help"
 else
   ARGV.shift
-  railsrc = File.join(File.expand_path("~"), ".railsrc")
-  if File.exist?(railsrc)
-    extra_args_string = File.open(railsrc).read
-    extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
-    puts "Using #{extra_args.join(" ")} from #{railsrc}"
-    ARGV.insert(1, *extra_args)
+  unless ARGV.delete("--no-rc")
+    customrc = ARGV.index{ |x| x.include?("--rc=") }
+    railsrc = if customrc
+                File.expand_path(ARGV.delete_at(customrc).gsub(/--rc=/, ""))
+              else
+                File.join(File.expand_path("~"), '.railsrc')
+              end
+    if File.exist?(railsrc)
+      extra_args_string = File.read(railsrc)
+      extra_args = extra_args_string.split(/\n+/).map {|l| l.split}.flatten
+      puts "Using #{extra_args.join(" ")} from #{railsrc}"
+      ARGV.insert(1, *extra_args)
+    end
   end
 end
 
diff --git a/railties/lib/rails/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb
deleted file mode 100644
index b745b45e17..0000000000
--- a/railties/lib/rails/commands/benchmarker.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'optparse'
-require 'rails/test_help'
-require 'rails/performance_test_help'
-
-ARGV.push('--benchmark') # HAX
-require 'active_support/testing/performance'
-ARGV.pop
-
-def options
-  options = {}
-  defaults = ActiveSupport::Testing::Performance::DEFAULTS
-
-  OptionParser.new do |opt|
-    opt.banner = "Usage: rails benchmarker 'Ruby.code' 'Ruby.more_code' ... [OPTS]"
-    opt.on('-r', '--runs N', Numeric, 'Number of runs.', "Default: #{defaults[:runs]}") { |r| options[:runs] = r }
-    opt.on('-o', '--output PATH', String, 'Directory to use when writing the results.', "Default: #{defaults[:output]}") { |o| options[:output] = o }
-    opt.on('-m', '--metrics a,b,c', Array, 'Metrics to use.', "Default: #{defaults[:metrics].join(",")}") { |m| options[:metrics] = m.map(&:to_sym) }
-    opt.parse!(ARGV)
-  end
-
-  options
-end
-
-class BenchmarkerTest < ActionDispatch::PerformanceTest #:nodoc:
-  self.profile_options = options
-
-  ARGV.each do |expression|
-    eval <<-RUBY
-      def test_#{expression.parameterize('_')}
-        #{expression}
-      end
-    RUBY
-  end
-end
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 4497ef61df..86ab1aabbf 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -91,7 +91,7 @@ module Rails
     def require_debugger
       require 'debugger'
       puts "=> Debugger enabled"
-    rescue Exception
+    rescue LoadError
       puts "You're missing the 'debugger' gem. Add it to your Gemfile, bundle, and try again."
       exit
     end
diff --git a/railties/lib/rails/commands/profiler.rb b/railties/lib/rails/commands/profiler.rb
deleted file mode 100644
index 315bcccf61..0000000000
--- a/railties/lib/rails/commands/profiler.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'optparse'
-require 'rails/test_help'
-require 'rails/performance_test_help'
-require 'active_support/testing/performance'
-
-def options
-  options = {}
-  defaults = ActiveSupport::Testing::Performance::DEFAULTS
-
-  OptionParser.new do |opt|
-    opt.banner = "Usage: rails profiler 'Ruby.code' 'Ruby.more_code' ... [OPTS]"
-    opt.on('-r', '--runs N', Numeric, 'Number of runs.', "Default: #{defaults[:runs]}") { |r| options[:runs] = r }
-    opt.on('-o', '--output PATH', String, 'Directory to use when writing the results.', "Default: #{defaults[:output]}") { |o| options[:output] = o }
-    opt.on('-m', '--metrics a,b,c', Array, 'Metrics to use.', "Default: #{defaults[:metrics].join(",")}") { |m| options[:metrics] = m.map(&:to_sym) }
-    opt.on('-f', '--formats x,y,z', Array, 'Formats to output to.', "Default: #{defaults[:formats].join(",")}") { |m| options[:formats] = m.map(&:to_sym) }
-    opt.parse!(ARGV)
-  end
-
-  options
-end
-
-class ProfilerTest < ActionDispatch::PerformanceTest #:nodoc:
-  self.profile_options = options
-
-  ARGV.each do |expression|
-    eval <<-RUBY
-      def test_#{expression.parameterize('_')}
-        #{expression}
-      end
-    RUBY
-  end
-end
diff --git a/railties/lib/rails/commands/runner.rb b/railties/lib/rails/commands/runner.rb
index 6adbdc6e0b..c4622d6a2d 100644
--- a/railties/lib/rails/commands/runner.rb
+++ b/railties/lib/rails/commands/runner.rb
@@ -24,7 +24,7 @@ ARGV.clone.options do |opts|
 
   if RbConfig::CONFIG['host_os'] !~ /mswin|mingw/
     opts.separator ""
-    opts.separator "You can also use runner as a shebang line for your scripts like this:"
+    opts.separator "You can also use runner as a shebang line for your executables:"
     opts.separator "-------------------------------------------------------------"
     opts.separator "#!/usr/bin/env #{File.expand_path($0)} runner"
     opts.separator ""