Revert "Merge pull request #15293 from schneems/schneems/generator-output-in-error"

This reverts commit 7466d6a9f989a1a8f90899b79b34f1152e440b7c, reversing
changes made to b850c4c540e8f0c15742f67c532f521a4a123655.

This was an accidental merge. A new PR will follow.

/cc @schneems

1 files changed, 12 insertions, 16 deletions

diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 0ad3dbaeaa..dce734b54e 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -156,8 +156,7 @@ module Rails
         args << "--help" if args.empty? && klass.arguments.any? { |a| a.required? }
         klass.start(args, config)
       else
-        puts "Could not find generator #{namespace.inspect}."
-        print_generators
+        puts "Could not find generator #{namespace}."
       end
     end
 
@@ -200,6 +199,17 @@ module Rails
 
     # Show help message with available generators.
     def self.help(command = 'generate')
+      lookup!
+
+      namespaces = subclasses.map{ |k| k.namespace }
+      namespaces.sort!
+
+      groups = Hash.new { |h,k| h[k] = [] }
+      namespaces.each do |namespace|
+        base = namespace.split(':').first
+        groups[base] << namespace
+      end
+
       puts "Usage: rails #{command} GENERATOR [args] [options]"
       puts
       puts "General options:"
@@ -212,20 +222,6 @@ module Rails
       puts "Please choose a generator below."
       puts
 
-      print_generators
-    end
-
-    def self.print_generators
-      lookup!
-
-      namespaces = subclasses.map{ |k| k.namespace }
-      namespaces.sort!
-
-      groups = Hash.new { |h,k| h[k] = [] }
-      namespaces.each do |namespace|
-        base = namespace.split(':').first
-        groups[base] << namespace
-      end
       # Print Rails defaults first.
       rails = groups.delete("rails")
       rails.map! { |n| n.sub(/^rails:/, '') }