13 files changed, 20 insertions, 20 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index a2c44876e1..a0b1f5b325 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -28,7 +28,7 @@ RUBY_FORGE_USER    = "webster132"
 # end
 
 
-BASE_DIRS   = %w( app config/environments components db doc log lib lib/tasks public script test vendor vendor/plugins )
+BASE_DIRS   = %w( app config/environments components db doc log lib lib/tasks public script script/perform script/process test vendor vendor/plugins )
 APP_DIRS    = %w( apis models controllers helpers views views/layouts )
 PUBLIC_DIRS = %w( images javascripts stylesheets )
 TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/test )
@@ -38,7 +38,7 @@ HTML_FILES   = %w( 404.html 500.html index.html robots.txt favicon.ico
                    javascripts/prototype.js javascripts/scriptaculous.js
                    javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js
                    javascripts/util.js javascripts/slider.js )
-BIN_FILES    = %w( breakpointer console destroy generate perform process runner server )
+BIN_FILES    = %w( breakpointer console destroy generate perform/benchmark perform/profile process/reaper process/spawner process/spinner runner server )
 
 VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
 
diff --git a/railties/bin/perform b/railties/bin/perform
deleted file mode 100644
index 5eb8ab0f87..0000000000
--- a/railties/bin/perform
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/local/bin/ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/perform'
\ No newline at end of file
diff --git a/railties/bin/perform/benchmark b/railties/bin/perform/benchmark
new file mode 100644
index 0000000000..c787fae8ad
--- /dev/null
+++ b/railties/bin/perform/benchmark
@@ -0,0 +1,3 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/perform/benchmark'
diff --git a/railties/bin/perform/profile b/railties/bin/perform/profile
new file mode 100644
index 0000000000..743262e56c
--- /dev/null
+++ b/railties/bin/perform/profile
@@ -0,0 +1,3 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/perform/profile'
diff --git a/railties/bin/process b/railties/bin/process
deleted file mode 100644
index 13df54f90f..0000000000
--- a/railties/bin/process
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/local/bin/ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/process'
\ No newline at end of file
diff --git a/railties/bin/process/reaper b/railties/bin/process/reaper
new file mode 100644
index 0000000000..3bcfb48347
--- /dev/null
+++ b/railties/bin/process/reaper
@@ -0,0 +1,3 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/reaper'
diff --git a/railties/bin/process/spawner b/railties/bin/process/spawner
new file mode 100644
index 0000000000..73a98128eb
--- /dev/null
+++ b/railties/bin/process/spawner
@@ -0,0 +1,3 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/spawner'
diff --git a/railties/bin/process/spinner b/railties/bin/process/spinner
new file mode 100644
index 0000000000..0b546dd0a3
--- /dev/null
+++ b/railties/bin/process/spinner
@@ -0,0 +1,3 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/spinner'
diff --git a/railties/lib/commands/perform.rb b/railties/lib/commands/perform.rb
deleted file mode 100644
index 784837780c..0000000000
--- a/railties/lib/commands/perform.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-if %w( benchmarker profiler ).include?(ARGV.first)
-  require "#{File.dirname(__FILE__)}/perform/#{ARGV.shift}"
-else
-  puts "Usage: ./script/perform [benchmarker|profiler]"
-end
diff --git a/railties/lib/commands/perform/benchmarker.rb b/railties/lib/commands/perform/benchmark.rb
index b12cf57215..b12cf57215 100644
--- a/railties/lib/commands/perform/benchmarker.rb
+++ b/railties/lib/commands/perform/benchmark.rb
diff --git a/railties/lib/commands/perform/profiler.rb b/railties/lib/commands/perform/profile.rb
index f599ad6635..f599ad6635 100644
--- a/railties/lib/commands/perform/profiler.rb
+++ b/railties/lib/commands/perform/profile.rb
diff --git a/railties/lib/commands/process.rb b/railties/lib/commands/process.rb
deleted file mode 100644
index 87b4b158cd..0000000000
--- a/railties/lib/commands/process.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-if %w( reaper spawner spinner ).include?(ARGV.first)
-  require "#{File.dirname(__FILE__)}/process/#{ARGV.shift}"
-else
-  puts "Choose either reaper, spawner, or spinner"
-end
\ No newline at end of file
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 87fe7973ee..73348f51d3 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -44,7 +44,7 @@ class AppGenerator < Rails::Generator::Base
       m.file "environments/test.rb",        "config/environments/test.rb"
 
       # Scripts
-      %w( breakpointer console destroy generate perform process runner server ).each do |file|
+      %w( breakpointer console destroy generate perform/benchmark perform/profile process/reaper process/spawner process/spinner runner server ).each do |file|
         m.file "bin/#{file}", "script/#{file}", script_options
       end
 
@@ -114,7 +114,8 @@ class AppGenerator < Rails::Generator::Base
     public/images
     public/javascripts
     public/stylesheets
-    script
+    script/perform
+    script/process
     test/fixtures
     test/functional
     test/mocks/development