From d5bd4b259fa07aba81effaebfe2874ddfdf91bf5 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Mon, 5 Sep 2016 22:14:55 +0200 Subject: Run engine commands through command infrastructure. --- railties/lib/rails/engine/commands.rb | 6 ++---- railties/lib/rails/engine/commands_tasks.rb | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'railties/lib/rails/engine') diff --git a/railties/lib/rails/engine/commands.rb b/railties/lib/rails/engine/commands.rb index dfbeea36b8..a23ae44b0b 100644 --- a/railties/lib/rails/engine/commands.rb +++ b/railties/lib/rails/engine/commands.rb @@ -1,6 +1,4 @@ -require "rails/engine/commands_tasks" - -ARGV << "--help" if ARGV.empty? +require "rails/command" aliases = { "g" => "generate", @@ -11,4 +9,4 @@ aliases = { command = ARGV.shift command = aliases[command] || command -Rails::Engine::CommandsTasks.new(ARGV).run_command!(command) +Rails::Command.invoke command, ARGV diff --git a/railties/lib/rails/engine/commands_tasks.rb b/railties/lib/rails/engine/commands_tasks.rb index d6effdb732..65dd274793 100644 --- a/railties/lib/rails/engine/commands_tasks.rb +++ b/railties/lib/rails/engine/commands_tasks.rb @@ -26,7 +26,7 @@ module Rails def help_message <<-EOT.strip_heredoc - Usage: rails COMMAND [ARGS] + Usage: bin/rails COMMAND [ARGS] The common Rails commands available for engines are: generate Generate new code (short-cut alias: "g") -- cgit v1.2.3 From 03c982fa3417fc49a380eeb88fdd26fdd4bae46b Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Mon, 12 Sep 2016 21:59:26 +0200 Subject: Remove the old command files. Wash out your old! These adhoc scripts are replaced by the new commands. --- railties/lib/rails/engine/commands_tasks.rb | 62 ----------------------------- 1 file changed, 62 deletions(-) delete mode 100644 railties/lib/rails/engine/commands_tasks.rb (limited to 'railties/lib/rails/engine') diff --git a/railties/lib/rails/engine/commands_tasks.rb b/railties/lib/rails/engine/commands_tasks.rb deleted file mode 100644 index 65dd274793..0000000000 --- a/railties/lib/rails/engine/commands_tasks.rb +++ /dev/null @@ -1,62 +0,0 @@ -require "rails/commands/rake_proxy" -require "rails/commands/common_commands_tasks" -require "active_support/core_ext/string/strip" - -module Rails - class Engine - class CommandsTasks # :nodoc: - include Rails::RakeProxy - include Rails::CommonCommandsTasks - - attr_reader :argv - - def initialize(argv) - @argv = argv - end - - private - - def commands - formatted_rake_tasks - end - - def command_whitelist - %w(generate destroy version help test) - end - - def help_message - <<-EOT.strip_heredoc - Usage: bin/rails COMMAND [ARGS] - - The common Rails commands available for engines are: - generate Generate new code (short-cut alias: "g") - destroy Undo code generated with "generate" (short-cut alias: "d") - test Run tests (short-cut alias: "t") - - All commands can be run with -h for more information. - - If you want to run any commands that need to be run in context - of the application, like `rails server` or `rails console`, - you should do it from application's directory (typically test/dummy). - - In addition to those commands, there are: - EOT - end - - def require_application_and_environment! - require ENGINE_PATH - end - - def load_tasks - Rake.application.init("rails") - Rake.application.load_rakefile - end - - def load_generators - engine = ::Rails::Engine.find(ENGINE_ROOT) - Rails::Generators.namespace = engine.railtie_namespace - engine.load_generators - end - end - end -end -- cgit v1.2.3