Merge commit 'rails/master'

Conflicts:
	railties/guides/source/index.html.erb

1 files changed, 23 insertions, 0 deletions

diff --git a/railties/lib/rails/commands/benchmarker.rb b/railties/lib/rails/commands/benchmarker.rb
new file mode 100644
index 0000000000..0432261802
--- /dev/null
+++ b/railties/lib/rails/commands/benchmarker.rb
@@ -0,0 +1,23 @@
+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