diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-02-23 18:15:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-23 18:15:28 +0100 |
commit | fbee4e3ce37674eb928298490a35d3dfd1921e67 (patch) | |
tree | 53fb0bb589c7351688c711ddc1ecbb10b7415951 /railties/lib/rails/command/base.rb | |
parent | 4734d23c74fb4193aafe7cb04256bb745680d97f (diff) | |
download | rails-fbee4e3ce37674eb928298490a35d3dfd1921e67.tar.gz rails-fbee4e3ce37674eb928298490a35d3dfd1921e67.tar.bz2 rails-fbee4e3ce37674eb928298490a35d3dfd1921e67.zip |
Revert "Revert "Add encrypted secrets""
Diffstat (limited to 'railties/lib/rails/command/base.rb')
-rw-r--r-- | railties/lib/rails/command/base.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/railties/lib/rails/command/base.rb b/railties/lib/rails/command/base.rb index 1435792536..db20c71861 100644 --- a/railties/lib/rails/command/base.rb +++ b/railties/lib/rails/command/base.rb @@ -56,7 +56,9 @@ module Rails end def perform(command, args, config) # :nodoc: - command = nil if Rails::Command::HELP_MAPPINGS.include?(args.first) + if Rails::Command::HELP_MAPPINGS.include?(args.first) + command, args = "help", [] + end dispatch(command, args.dup, nil, config) end @@ -111,7 +113,7 @@ module Rails # For a `Rails::Command::TestCommand` placed in `rails/command/test_command.rb` # would return `rails/test`. def default_command_root - path = File.expand_path(File.join("../commands", command_name), __dir__) + path = File.expand_path(File.join("../commands", command_root_namespace), __dir__) path if File.exist?(path) end @@ -129,6 +131,10 @@ module Rails super end end + + def command_root_namespace + (namespace.split(":") - %w( rails )).first + end end def help |