aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/cli.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-09-26 20:28:40 +0200
committerGitHub <noreply@github.com>2016-09-26 20:28:40 +0200
commitc994a893c18c0456fd2a30efe4debfc2b18e2508 (patch)
tree0253b1343a1760dc4701f7d2ee2ff8cdd1d1b290 /railties/lib/rails/cli.rb
parenta6da7938017647dd6e19e23d3d47126cb7a3e1fe (diff)
parentc0c73738bd04c86fbcf6d22c961fec0d33aa2bf6 (diff)
downloadrails-c994a893c18c0456fd2a30efe4debfc2b18e2508.tar.gz
rails-c994a893c18c0456fd2a30efe4debfc2b18e2508.tar.bz2
rails-c994a893c18c0456fd2a30efe4debfc2b18e2508.zip
Merge pull request #26414 from rails/rails-commands
Initial Rails Commands Infrastructure
Diffstat (limited to 'railties/lib/rails/cli.rb')
-rw-r--r--railties/lib/rails/cli.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/cli.rb b/railties/lib/rails/cli.rb
index 26ef3822ba..973b746068 100644
--- a/railties/lib/rails/cli.rb
+++ b/railties/lib/rails/cli.rb
@@ -7,9 +7,11 @@ Rails::AppLoader.exec_app
require "rails/ruby_version_check"
Signal.trap("INT") { puts; exit(1) }
+require "rails/command"
+
if ARGV.first == "plugin"
ARGV.shift
- require "rails/commands/plugin"
+ Rails::Command.invoke :plugin, ARGV
else
- require "rails/commands/application"
+ Rails::Command.invoke :application, ARGV
end