aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-01-18 05:16:39 +0000
committerPratik Naik <pratiknaik@gmail.com>2009-01-18 05:20:39 +0000
commit41af606db385abe429888c5aca8b2e86c8830c24 (patch)
tree99d0439cc270061b985acbf32af20b65ede0e656 /railties
parentc2e7851fb20d24f49b55b5276cc3056082721dc4 (diff)
downloadrails-41af606db385abe429888c5aca8b2e86c8830c24.tar.gz
rails-41af606db385abe429888c5aca8b2e86c8830c24.tar.bz2
rails-41af606db385abe429888c5aca8b2e86c8830c24.zip
Remove script/performance/profiler in favour of performance integration tests.
To continue using script/performance/profiler, install the request_profiler plugin : script/plugin install git://github.com/rails/request_profiler.git
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG6
-rwxr-xr-xrailties/bin/performance/request3
-rwxr-xr-xrailties/lib/commands/performance/request.rb6
-rw-r--r--railties/lib/rails_generator/generators/applications/app/app_generator.rb2
4 files changed, 7 insertions, 10 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index b313f082a3..b36f57f75d 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,11 @@
*2.3.0 [Edge]*
+* Remove script/performance/profiler in favour of performance integration tests. [Pratik Naik]
+
+ To continue using script/performance/profiler, install the request_profiler plugin :
+
+ script/plugin install git://github.com/rails/request_profiler.git
+
* Add a rake task to apply a template to an existing application : rake rails:template LOCATION=~/template.rb [Pratik Naik]
* Add "-m/--template" option to Rails generator to apply a template to the generated application. [Jeremy McAnally]
diff --git a/railties/bin/performance/request b/railties/bin/performance/request
deleted file mode 100755
index ae3f38c74b..0000000000
--- a/railties/bin/performance/request
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
-require 'commands/performance/request'
diff --git a/railties/lib/commands/performance/request.rb b/railties/lib/commands/performance/request.rb
deleted file mode 100755
index 1773886487..0000000000
--- a/railties/lib/commands/performance/request.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-require 'config/environment'
-require 'application'
-require 'action_controller/request_profiler'
-
-ActionController::RequestProfiler.run(ARGV)
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 795a0d7653..2c31d89538 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -151,7 +151,7 @@ class AppGenerator < Rails::Generator::Base
def create_script_files(m)
%w(
about console dbconsole destroy generate runner server plugin
- performance/benchmarker performance/profiler performance/request
+ performance/benchmarker performance/profiler
).each do |file|
m.file "bin/#{file}", "script/#{file}", {
:chmod => 0755,