The rake task :environment now loads config/environment.rb instead of initializing the application on its own. This fixes [#4492 state:resolved] and also avoids the application being initialized twice in some rake tasks.

2 files changed, 0 insertions, 69 deletions

diff --git a/railties/lib/rails/commands/performance/benchmarker.rb b/railties/lib/rails/commands/performance/benchmarker.rb
deleted file mode 100644
index 0432261802..0000000000
--- a/railties/lib/rails/commands/performance/benchmarker.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-if [nil, "-h", "--help"].include?(ARGV.first)
-  puts "Usage: rails benchmarker [times] 'Person.expensive_way' 'Person.another_expensive_way' ..."
-  exit 1
-end
-
-begin
-  N = Integer(ARGV.first)
-  ARGV.shift
-rescue ArgumentError
-  N = 1
-end
-
-require 'benchmark'
-include Benchmark
-
-# Don't include compilation in the benchmark
-ARGV.each { |expression| eval(expression) }
-
-bm(6) do |x|
-  ARGV.each_with_index do |expression, idx|
-    x.report("##{idx + 1}") { N.times { eval(expression) } }
-  end
-end
diff --git a/railties/lib/rails/commands/performance/profiler.rb b/railties/lib/rails/commands/performance/profiler.rb
deleted file mode 100644
index 6d9717b5cd..0000000000
--- a/railties/lib/rails/commands/performance/profiler.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-if [nil, "-h", "--help"].include?(ARGV.first)
-  $stderr.puts "Usage: rails profiler 'Person.expensive_method(10)' [times] [flat|graph|graph_html]"
-  exit(1)
-end
-
-# Define a method to profile.
-if ARGV[1] and ARGV[1].to_i > 1
-  eval "def profile_me() #{ARGV[1]}.times { #{ARGV[0]} } end"
-else
-  eval "def profile_me() #{ARGV[0]} end"
-end
-
-# Use the ruby-prof extension if available.  Fall back to stdlib profiler.
-begin
-  begin
-    require "ruby-prof"
-    $stderr.puts 'Using the ruby-prof extension.'
-    RubyProf.measure_mode = RubyProf::WALL_TIME
-    RubyProf.start
-    profile_me
-    results = RubyProf.stop
-    if ARGV[2]
-      printer_class = RubyProf.const_get((ARGV[2] + "_printer").classify)
-    else
-      printer_class = RubyProf::FlatPrinter
-    end
-    printer = printer_class.new(results)
-    printer.print($stderr)
-  rescue LoadError
-    require "prof"
-    $stderr.puts 'Using the old ruby-prof extension.'
-    Prof.clock_mode = Prof::GETTIMEOFDAY
-    Prof.start
-    profile_me
-    results = Prof.stop
-    require 'rubyprof_ext'
-    Prof.print_profile(results, $stderr)
-  end
-rescue LoadError
-  require 'profiler'
-  $stderr.puts 'Using the standard Ruby profiler.'
-  Profiler__.start_profile
-  profile_me
-  Profiler__.stop_profile
-  Profiler__.print_profile($stderr)
-end