diff options
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/commands/perform.rb | 5 | ||||
-rw-r--r-- | railties/lib/commands/perform/benchmark.rb (renamed from railties/lib/commands/perform/benchmarker.rb) | 0 | ||||
-rw-r--r-- | railties/lib/commands/perform/profile.rb (renamed from railties/lib/commands/perform/profiler.rb) | 0 | ||||
-rw-r--r-- | railties/lib/commands/process.rb | 5 | ||||
-rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 5 |
5 files changed, 3 insertions, 12 deletions
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 |