From 29d4c2b36f92b333b66091869b5cf61e2a480a36 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 14 Oct 2005 21:25:40 +0000
Subject: Finished move

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2591 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/lib/commands/performance/benchmark.rb   | 26 ------------------
 railties/lib/commands/performance/benchmarker.rb | 26 ++++++++++++++++++
 railties/lib/commands/performance/profile.rb     | 35 ------------------------
 railties/lib/commands/performance/profiler.rb    | 35 ++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 railties/lib/commands/performance/benchmark.rb
 create mode 100644 railties/lib/commands/performance/benchmarker.rb
 delete mode 100644 railties/lib/commands/performance/profile.rb
 create mode 100644 railties/lib/commands/performance/profiler.rb

(limited to 'railties/lib')

diff --git a/railties/lib/commands/performance/benchmark.rb b/railties/lib/commands/performance/benchmark.rb
deleted file mode 100644
index b12cf57215..0000000000
--- a/railties/lib/commands/performance/benchmark.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/local/bin/ruby
-
-if ARGV.empty?
-  puts "Usage: ./script/perform 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 RAILS_ROOT + '/config/environment'
-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/commands/performance/benchmarker.rb b/railties/lib/commands/performance/benchmarker.rb
new file mode 100644
index 0000000000..b12cf57215
--- /dev/null
+++ b/railties/lib/commands/performance/benchmarker.rb
@@ -0,0 +1,26 @@
+#!/usr/local/bin/ruby
+
+if ARGV.empty?
+  puts "Usage: ./script/perform 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 RAILS_ROOT + '/config/environment'
+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/commands/performance/profile.rb b/railties/lib/commands/performance/profile.rb
deleted file mode 100644
index f599ad6635..0000000000
--- a/railties/lib/commands/performance/profile.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/local/bin/ruby
-if ARGV.empty?
-  $stderr.puts "Usage: ./script/perform profiler 'Person.expensive_method(10)' [times]"
-  exit(1)
-end
-
-# Keep the expensive require out of the profile.
-$stderr.puts 'Loading Rails...'
-require RAILS_ROOT + '/config/environment'
-
-# 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
-  require 'prof'
-  $stderr.puts 'Using the ruby-prof extension.'
-  Prof.clock_mode = Prof::GETTIMEOFDAY
-  Prof.start
-  profile_me
-  results = Prof.stop
-  require 'rubyprof_ext'
-  Prof.print_profile(results, $stderr)
-rescue LoadError
-  require 'profiler'
-  $stderr.puts 'Using the standard Ruby profiler.'
-  Profiler__.start_profile
-  profile_me
-  Profiler__.stop_profile
-  Profiler__.print_profile($stderr)
-end
diff --git a/railties/lib/commands/performance/profiler.rb b/railties/lib/commands/performance/profiler.rb
new file mode 100644
index 0000000000..f599ad6635
--- /dev/null
+++ b/railties/lib/commands/performance/profiler.rb
@@ -0,0 +1,35 @@
+#!/usr/local/bin/ruby
+if ARGV.empty?
+  $stderr.puts "Usage: ./script/perform profiler 'Person.expensive_method(10)' [times]"
+  exit(1)
+end
+
+# Keep the expensive require out of the profile.
+$stderr.puts 'Loading Rails...'
+require RAILS_ROOT + '/config/environment'
+
+# 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
+  require 'prof'
+  $stderr.puts 'Using the ruby-prof extension.'
+  Prof.clock_mode = Prof::GETTIMEOFDAY
+  Prof.start
+  profile_me
+  results = Prof.stop
+  require 'rubyprof_ext'
+  Prof.print_profile(results, $stderr)
+rescue LoadError
+  require 'profiler'
+  $stderr.puts 'Using the standard Ruby profiler.'
+  Profiler__.start_profile
+  profile_me
+  Profiler__.stop_profile
+  Profiler__.print_profile($stderr)
+end
-- 
cgit v1.2.3