Clean up the act of commands

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2412 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/lib/commands.rb

@@ -1,5 +1,7 @@
-if %w( console perform process runner server ).include?(ARGV.first)
-  require "#{File.dirname(__FILE__)}/process/#{ARGV.shift}"
+commands = Dir["#{File.dirname(__FILE__)}/commands/*.rb"].collect { |file_path| File.basename(file_path).split(".").first }
+
+if commands.include?(ARGV.first)
+  require "#{File.dirname(__FILE__)}/commands/#{ARGV.shift}"
 else
-  puts "Choose: console perform process runner server"
+  puts "Choose: #{commands.join(", ")}"
 end

railties/lib/commands/breakpointer

@@ -1,3 +0,0 @@
-#!/usr/local/bin/ruby
-$LOAD_PATH << File.dirname(__FILE__) + '/../vendor/railties/lib'
-require 'breakpoint_client'

railties/lib/commands/breakpointer.rb

@@ -0,0 +1 @@
+require 'breakpoint_client'

railties/lib/commands/console.rb

@@ -9,7 +9,7 @@
 end
 
 libs =  " -r irb/completion"
-libs << " -r #{File.dirname(__FILE__)}/../config/environment"
+libs << " -r #{RAILS_ROOT}/config/environment"
 libs << " -r console_sandbox" if options[:sandbox]
 
 ENV['RAILS_ENV'] = ARGV.first || 'development'

railties/lib/commands/destroy.rb

@@ -1,5 +1,4 @@
-#!/usr/local/bin/ruby
-require File.dirname(__FILE__) + '/../config/environment'
+require "#{RAILS_ROOT}/config/environment"
 require 'rails_generator'
 require 'rails_generator/scripts/destroy'
 

railties/lib/commands/generate.rb

@@ -1,5 +1,4 @@
-#!/usr/local/bin/ruby
-require File.dirname(__FILE__) + '/../config/environment'
+require "#{RAILS_ROOT}/config/environment"
 require 'rails_generator'
 require 'rails_generator/scripts/generate'
 

railties/lib/commands/server.rb

@@ -5,7 +5,7 @@
   :port            => 3000,
   :ip              => "0.0.0.0",
   :environment     => "development",
-  :server_root     => File.expand_path(File.dirname(__FILE__) + "/../public/"),
+  :server_root     => File.expand_path(RAILS_ROOT + "/public/"),
   :server_type     => WEBrick::SimpleServer,
   :charset         => "UTF-8",
   :mime_types      => WEBrick::HTTPUtils::DefaultMimeTypes
@@ -47,7 +47,7 @@
 end
 
 ENV["RAILS_ENV"] = OPTIONS[:environment]
-require File.dirname(__FILE__) + "/../config/environment"
+require RAILS_ROOT + "/config/environment"
 require 'webrick_server'
 
 OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)

railties/lib/commands/update.rb

@@ -1,5 +1,4 @@
-#!/usr/local/bin/ruby
-require File.dirname(__FILE__) + '/../config/environment'
+require "#{RAILS_ROOT}/config/environment"
 require 'rails_generator'
 require 'rails_generator/scripts/update'
 Rails::Generator::Scripts::Update.new.run(ARGV)