aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails/commands.rb')
-rw-r--r--railties/lib/rails/commands.rb16
1 files changed, 7 insertions, 9 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index 48007dd2ab..3e8163490f 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -35,19 +35,17 @@ command = ARGV.shift
command = aliases[command] || command
case command
-when 'generate', 'destroy', 'plugin'
+when 'plugin'
+ require "rails/commands/plugin"
+when 'generate', 'destroy'
require 'rails/generators'
- if command == 'plugin' && ARGV.first == 'new'
- require "rails/commands/plugin_new"
- else
- require APP_PATH
- Rails.application.require_environment!
+ require APP_PATH
+ Rails.application.require_environment!
- Rails.application.load_generators
+ Rails.application.load_generators
- require "rails/commands/#{command}"
- end
+ require "rails/commands/#{command}"
when 'console'
require 'rails/commands/console'