From 00656979fed99d4d16eefc795067a576ab1a1a91 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 14 Oct 2005 18:58:07 +0000 Subject: r3619@sedna: jeremy | 2005-10-14 14:41:24 -0700 move scripts r3622@sedna: jeremy | 2005-10-14 14:54:48 -0700 remove script/perform and script/process in favor of script/perform/profile, etc. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2587 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/Rakefile | 4 +-- railties/bin/perform | 3 -- railties/bin/perform/benchmark | 3 ++ railties/bin/perform/profile | 3 ++ railties/bin/process | 3 -- railties/bin/process/reaper | 3 ++ railties/bin/process/spawner | 3 ++ railties/bin/process/spinner | 3 ++ railties/lib/commands/perform.rb | 5 ---- railties/lib/commands/perform/benchmark.rb | 26 ++++++++++++++++ railties/lib/commands/perform/benchmarker.rb | 26 ---------------- railties/lib/commands/perform/profile.rb | 35 ++++++++++++++++++++++ railties/lib/commands/perform/profiler.rb | 35 ---------------------- railties/lib/commands/process.rb | 5 ---- .../generators/applications/app/app_generator.rb | 5 ++-- 15 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 railties/bin/perform create mode 100644 railties/bin/perform/benchmark create mode 100644 railties/bin/perform/profile delete mode 100644 railties/bin/process create mode 100644 railties/bin/process/reaper create mode 100644 railties/bin/process/spawner create mode 100644 railties/bin/process/spinner delete mode 100644 railties/lib/commands/perform.rb create mode 100644 railties/lib/commands/perform/benchmark.rb delete mode 100644 railties/lib/commands/perform/benchmarker.rb create mode 100644 railties/lib/commands/perform/profile.rb delete mode 100644 railties/lib/commands/perform/profiler.rb delete mode 100644 railties/lib/commands/process.rb 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/benchmark.rb b/railties/lib/commands/perform/benchmark.rb new file mode 100644 index 0000000000..b12cf57215 --- /dev/null +++ b/railties/lib/commands/perform/benchmark.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/perform/benchmarker.rb b/railties/lib/commands/perform/benchmarker.rb deleted file mode 100644 index b12cf57215..0000000000 --- a/railties/lib/commands/perform/benchmarker.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/perform/profile.rb b/railties/lib/commands/perform/profile.rb new file mode 100644 index 0000000000..f599ad6635 --- /dev/null +++ b/railties/lib/commands/perform/profile.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 diff --git a/railties/lib/commands/perform/profiler.rb b/railties/lib/commands/perform/profiler.rb deleted file mode 100644 index f599ad6635..0000000000 --- a/railties/lib/commands/perform/profiler.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/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 -- cgit v1.2.3