Rely on Rails::Command's help output.

We end up with:

```
Usage:
  bin/rails routes [options]

Options:
  -c, [--controller=CONTROLLER]      # Filter by a specific controller, e.g. PostsController or Admin::PostsController.
  -g, [--grep=GREP]                  # Grep routes by a specific pattern.
  -E, [--expanded], [--no-expanded]  # Print routes expanded vertically with parts explained.
```

which does miss the bit about routes being printed in order.

Also:

* Renames options to ease help output readability, then clarifies each option.
* Fixes a bunch of indentation.

2 files changed, 63 insertions, 72 deletions

diff --git a/railties/lib/rails/commands/routes/routes_command.rb b/railties/lib/rails/commands/routes/routes_command.rb
index 41162a4425..b592a5212f 100644
--- a/railties/lib/rails/commands/routes/routes_command.rb
+++ b/railties/lib/rails/commands/routes/routes_command.rb
@@ -5,19 +5,9 @@ require "rails/command"
 module Rails
   module Command
     class RoutesCommand < Base # :nodoc:
-      class_option :controller, aliases: "-c", type: :string, desc: "Specifies the controller."
-      class_option :grep_pattern, aliases: "-g", type: :string, desc: "Specifies grep pattern."
-      class_option :expanded_format, aliases: "--expanded", type: :string, desc: "Turn on expanded format mode."
-
-      no_commands do
-        def help
-          say "Usage: Print out all defined routes in match order, with names."
-          say ""
-          say "Target specific controller with -c option, or grep routes using -g option"
-          say "Use expanded format with --expanded option"
-          say ""
-        end
-      end
+      class_option :controller, aliases: "-c", desc: "Filter by a specific controller, e.g. PostsController or Admin::PostsController."
+      class_option :grep, aliases: "-g", desc: "Grep routes by a specific pattern."
+      class_option :expanded, type: :boolean, aliases: "-E", desc: "Print routes expanded vertically with parts explained."
 
       def perform(*)
         require_application_and_environment!
@@ -32,7 +22,7 @@ module Rails
         end
 
         def formatter
-          if options.key?("expanded_format")
+          if options.key?("expanded")
             ActionDispatch::Routing::ConsoleFormatter::Expanded.new
           else
             ActionDispatch::Routing::ConsoleFormatter::Sheet.new
@@ -40,7 +30,7 @@ module Rails
         end
 
         def routes_filter
-          options.symbolize_keys.slice(:controller, :grep_pattern)
+          options.symbolize_keys.slice(:controller, :grep)
         end
     end
   end
diff --git a/railties/test/commands/routes_test.rb b/railties/test/commands/routes_test.rb
index 73a183ccb3..77ed2bda61 100644
--- a/railties/test/commands/routes_test.rb
+++ b/railties/test/commands/routes_test.rb
@@ -40,18 +40,18 @@ class Rails::Command::RoutesTest < ActiveSupport::TestCase
 
     output = run_routes_command(["-g", "show"])
     assert_equal <<~MESSAGE, output
-                                 Prefix Verb URI Pattern                                                                              Controller#Action
-                                   cart GET  /cart(.:format)                                                                          cart#show
-                     rails_service_blob GET  /rails/active_storage/blobs/:signed_id/*filename(.:format)                               active_storage/blobs#show
-              rails_blob_representation GET  /rails/active_storage/representations/:signed_blob_id/:variation_key/*filename(.:format) active_storage/representations#show
-                     rails_disk_service GET  /rails/active_storage/disk/:encoded_key/*filename(.:format)                              active_storage/disk#show
+                         Prefix Verb URI Pattern                                                                              Controller#Action
+                           cart GET  /cart(.:format)                                                                          cart#show
+             rails_service_blob GET  /rails/active_storage/blobs/:signed_id/*filename(.:format)                               active_storage/blobs#show
+      rails_blob_representation GET  /rails/active_storage/representations/:signed_blob_id/:variation_key/*filename(.:format) active_storage/representations#show
+             rails_disk_service GET  /rails/active_storage/disk/:encoded_key/*filename(.:format)                              active_storage/disk#show
     MESSAGE
 
     output = run_routes_command(["-g", "POST"])
     assert_equal <<~MESSAGE, output
-                            Prefix Verb URI Pattern                                    Controller#Action
-                                   POST /cart(.:format)                                cart#create
-              rails_direct_uploads POST /rails/active_storage/direct_uploads(.:format) active_storage/direct_uploads#create
+                    Prefix Verb URI Pattern                                    Controller#Action
+                           POST /cart(.:format)                                cart#create
+      rails_direct_uploads POST /rails/active_storage/direct_uploads(.:format) active_storage/direct_uploads#create
     MESSAGE
 
     output = run_routes_command(["-g", "basketballs"])
@@ -61,10 +61,10 @@ class Rails::Command::RoutesTest < ActiveSupport::TestCase
 
   test "rails routes with controller search key" do
     app_file "config/routes.rb", <<-RUBY
-        Rails.application.routes.draw do
-          get '/cart', to: 'cart#show'
-          get '/basketball', to: 'basketball#index'
-        end
+      Rails.application.routes.draw do
+        get '/cart', to: 'cart#show'
+        get '/basketball', to: 'basketball#index'
+      end
     RUBY
 
     output = run_routes_command(["-c", "cart"])
@@ -79,12 +79,13 @@ class Rails::Command::RoutesTest < ActiveSupport::TestCase
 
   test "rails routes with namespaced controller search key" do
     app_file "config/routes.rb", <<-RUBY
-        Rails.application.routes.draw do
-          namespace :admin do
-            resource :post
-          end
+      Rails.application.routes.draw do
+        namespace :admin do
+          resource :post
         end
+      end
     RUBY
+
     expected_output = ["         Prefix Verb   URI Pattern                Controller#Action",
                        " new_admin_post GET    /admin/post/new(.:format)  admin/posts#new",
                        "edit_admin_post GET    /admin/post/edit(.:format) admin/posts#edit",
@@ -103,17 +104,17 @@ class Rails::Command::RoutesTest < ActiveSupport::TestCase
 
   test "rails routes displays message when no routes are defined" do
     app_file "config/routes.rb", <<-RUBY
-        Rails.application.routes.draw do
-        end
+      Rails.application.routes.draw do
+      end
     RUBY
 
     assert_equal <<~MESSAGE, run_routes_command
-                                   Prefix Verb URI Pattern                                                                              Controller#Action
-                       rails_service_blob GET  /rails/active_storage/blobs/:signed_id/*filename(.:format)                               active_storage/blobs#show
-                rails_blob_representation GET  /rails/active_storage/representations/:signed_blob_id/:variation_key/*filename(.:format) active_storage/representations#show
-                       rails_disk_service GET  /rails/active_storage/disk/:encoded_key/*filename(.:format)                              active_storage/disk#show
-                update_rails_disk_service PUT  /rails/active_storage/disk/:encoded_token(.:format)                                      active_storage/disk#update
-                     rails_direct_uploads POST /rails/active_storage/direct_uploads(.:format)                                           active_storage/direct_uploads#create
+                         Prefix Verb URI Pattern                                                                              Controller#Action
+             rails_service_blob GET  /rails/active_storage/blobs/:signed_id/*filename(.:format)                               active_storage/blobs#show
+      rails_blob_representation GET  /rails/active_storage/representations/:signed_blob_id/:variation_key/*filename(.:format) active_storage/representations#show
+             rails_disk_service GET  /rails/active_storage/disk/:encoded_key/*filename(.:format)                              active_storage/disk#show
+      update_rails_disk_service PUT  /rails/active_storage/disk/:encoded_token(.:format)                                      active_storage/disk#update
+           rails_direct_uploads POST /rails/active_storage/direct_uploads(.:format)                                           active_storage/direct_uploads#create
     MESSAGE
   end
 
@@ -123,44 +124,44 @@ class Rails::Command::RoutesTest < ActiveSupport::TestCase
       IO.console.winsize = [0, 27]
 
       app_file "config/routes.rb", <<-RUBY
-          Rails.application.routes.draw do
-            get '/cart', to: 'cart#show'
-          end
+        Rails.application.routes.draw do
+          get '/cart', to: 'cart#show'
+        end
       RUBY
 
       output = run_routes_command(["--expanded"])
 
       assert_equal <<~MESSAGE, output
-      --[ Route 1 ]--------------
-      Prefix            | cart
-      Verb              | GET
-      URI               | /cart(.:format)
-      Controller#Action | cart#show
-      --[ Route 2 ]--------------
-      Prefix            | rails_service_blob
-      Verb              | GET
-      URI               | /rails/active_storage/blobs/:signed_id/*filename(.:format)
-      Controller#Action | active_storage/blobs#show
-      --[ Route 3 ]--------------
-      Prefix            | rails_blob_representation
-      Verb              | GET
-      URI               | /rails/active_storage/representations/:signed_blob_id/:variation_key/*filename(.:format)
-      Controller#Action | active_storage/representations#show
-      --[ Route 4 ]--------------
-      Prefix            | rails_disk_service
-      Verb              | GET
-      URI               | /rails/active_storage/disk/:encoded_key/*filename(.:format)
-      Controller#Action | active_storage/disk#show
-      --[ Route 5 ]--------------
-      Prefix            | update_rails_disk_service
-      Verb              | PUT
-      URI               | /rails/active_storage/disk/:encoded_token(.:format)
-      Controller#Action | active_storage/disk#update
-      --[ Route 6 ]--------------
-      Prefix            | rails_direct_uploads
-      Verb              | POST
-      URI               | /rails/active_storage/direct_uploads(.:format)
-      Controller#Action | active_storage/direct_uploads#create
+        --[ Route 1 ]--------------
+        Prefix            | cart
+        Verb              | GET
+        URI               | /cart(.:format)
+        Controller#Action | cart#show
+        --[ Route 2 ]--------------
+        Prefix            | rails_service_blob
+        Verb              | GET
+        URI               | /rails/active_storage/blobs/:signed_id/*filename(.:format)
+        Controller#Action | active_storage/blobs#show
+        --[ Route 3 ]--------------
+        Prefix            | rails_blob_representation
+        Verb              | GET
+        URI               | /rails/active_storage/representations/:signed_blob_id/:variation_key/*filename(.:format)
+        Controller#Action | active_storage/representations#show
+        --[ Route 4 ]--------------
+        Prefix            | rails_disk_service
+        Verb              | GET
+        URI               | /rails/active_storage/disk/:encoded_key/*filename(.:format)
+        Controller#Action | active_storage/disk#show
+        --[ Route 5 ]--------------
+        Prefix            | update_rails_disk_service
+        Verb              | PUT
+        URI               | /rails/active_storage/disk/:encoded_token(.:format)
+        Controller#Action | active_storage/disk#update
+        --[ Route 6 ]--------------
+        Prefix            | rails_direct_uploads
+        Verb              | POST
+        URI               | /rails/active_storage/direct_uploads(.:format)
+        Controller#Action | active_storage/direct_uploads#create
       MESSAGE
     ensure
       IO.console.winsize = previous_console_winsize