Merge pull request #27601 from y-yagi/make_work_all_commands_from_engine

Make all rails commands work in engine

2 files changed, 8 insertions, 16 deletions

diff --git a/railties/lib/rails/commands/help/USAGE b/railties/lib/rails/commands/help/USAGE
index 348f41861f..c5f8ab72bb 100644
--- a/railties/lib/rails/commands/help/USAGE
+++ b/railties/lib/rails/commands/help/USAGE
@@ -1,16 +1,3 @@
-Usage: bin/rails COMMAND [args] [options]
-<% if engine? %>
-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 `bin/rails server` or `bin/rails console`,
-you should do it from the application's directory (typically test/dummy).
-<% else %>
 The most common rails commands are:
  generate    Generate new code (short-cut alias: "g")
  console     Start the Rails console (short-cut alias: "c")
@@ -18,10 +5,11 @@ The most common rails commands are:
  test        Run tests (short-cut alias: "t")
  dbconsole   Start a console for the database specified in config/database.yml
              (short-cut alias: "db")
+<% unless engine? %>
  new         Create a new Rails application. "rails new my_app" creates a
              new application called MyApp in "./my_app"
+<% end %>
 
 All commands can be run with -h (or --help) for more information.
-<% end %>
 In addition to those commands, there are:
 
diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index 15c636103b..d58721f648 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -95,7 +95,7 @@ module Rails
 
   module Command
     class ServerCommand < Base # :nodoc:
-      DEFAULT_PID_PATH = File.expand_path("tmp/pids/server.pid").freeze
+      DEFAULT_PID_PATH = "tmp/pids/server.pid".freeze
 
       class_option :port, aliases: "-p", type: :numeric,
         desc: "Runs Rails on the specified port.", banner: :port, default: 3000
@@ -141,7 +141,7 @@ module Rails
             config:             options[:config],
             environment:        environment,
             daemonize:          options[:daemon],
-            pid:                options[:pid],
+            pid:                pid,
             caching:            options["dev-caching"],
             restart_cmd:        restart_command
           }
@@ -165,6 +165,10 @@ module Rails
           "bin/rails server #{@server} #{@original_options.join(" ")}"
         end
 
+        def pid
+          File.expand_path(options[:pid])
+        end
+
         def self.banner(*)
           "rails server [puma, thin etc] [options]"
         end