aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands.rb
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-11-15 13:09:05 -0600
committerJosé Valim <jose.valim@gmail.com>2010-11-16 00:04:35 +0100
commitb0665345f85e4b7f3b3367ee36fa205e7ff78d12 (patch)
treedb237874e758668e689d805f6b08a04173d480e1 /railties/lib/rails/commands.rb
parent4da6d956043337c3c14d4f74cbbf05c3a50b4e9b (diff)
downloadrails-b0665345f85e4b7f3b3367ee36fa205e7ff78d12.tar.gz
rails-b0665345f85e4b7f3b3367ee36fa205e7ff78d12.tar.bz2
rails-b0665345f85e4b7f3b3367ee36fa205e7ff78d12.zip
Allow running `rails plugin new` command inside rails application
Diffstat (limited to 'railties/lib/rails/commands.rb')
-rw-r--r--railties/lib/rails/commands.rb17
1 files changed, 11 insertions, 6 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb
index e3aa6d7c3e..c8a33c1266 100644
--- a/railties/lib/rails/commands.rb
+++ b/railties/lib/rails/commands.rb
@@ -12,14 +12,19 @@ command = aliases[command] || command
case command
when 'generate', 'destroy', 'plugin'
- require APP_PATH
- Rails.application.require_environment!
+ if command == "plugin" && ARGV.first == "new"
+ require "rails/commands/plugin_new"
+ else
+ require APP_PATH
+ Rails.application.require_environment!
- if defined?(ENGINE_PATH)
- engine = Rails.application.railties.engines.find { |r| r.root.to_s == ENGINE_PATH }
- Rails.application = engine
+ if defined?(ENGINE_PATH)
+ engine = Rails.application.railties.engines.find { |r| r.root.to_s == ENGINE_PATH }
+ Rails.application = engine
+ end
+
+ require "rails/commands/#{command}"
end
- require "rails/commands/#{command}"
when 'benchmarker', 'profiler'
require APP_PATH