4 files changed, 23 insertions, 6 deletions
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 60e94486bb..ffc2d6e081 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -31,10 +31,9 @@ module Rails
       # root otherwise uses a default description.
       def self.desc(description=nil)
         return super if description
-        usage = source_root && File.expand_path("../USAGE", source_root)
 
-        @desc ||= if usage && File.exist?(usage)
-          ERB.new(File.read(usage)).result(binding)
+        @desc ||= if usage_path
+          ERB.new(File.read(usage_path)).result(binding)
         else
           "Description:\n    Create #{base_name.humanize.downcase} files for #{generator_name} generator."
         end
@@ -213,7 +212,8 @@ module Rails
       # root, you should use source_root.
       def self.default_source_root
         return unless base_name && generator_name
-        path = File.expand_path(File.join(base_name, generator_name, 'templates'), base_root)
+        return unless default_generator_root
+        path = File.join(default_generator_root, 'templates')
         path if File.exists?(path)
       end
 
@@ -373,6 +373,19 @@ module Rails
           }
         end
 
+        def self.usage_path
+          paths = [
+            source_root && File.expand_path("../USAGE", source_root),
+            default_generator_root && File.join(default_generator_root, "USAGE")
+          ]
+          paths.compact.detect { |path| File.exists? path }
+        end
+
+        def self.default_generator_root
+          path = File.expand_path(File.join(base_name, generator_name), base_root)
+          path if File.exists?(path)
+        end
+
     end
   end
 end
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index e9bd0f181e..dd1790299d 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -160,7 +160,7 @@ module Rails
       end
 
       def each(&block)
-        @paths.each &block
+        @paths.each(&block)
       end
 
       def <<(path)
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index d8887a6471..128854e4ad 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -302,7 +302,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_default_usage
-    File.expects(:exist?).returns(false)
+    Rails::Generators::AppGenerator.expects(:usage_path).returns(nil)
     assert_match(/Create rails files for app generator/, Rails::Generators::AppGenerator.desc)
   end
 
diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb
index fd84164340..b320e40654 100644
--- a/railties/test/generators/migration_generator_test.rb
+++ b/railties/test/generators/migration_generator_test.rb
@@ -152,4 +152,8 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
       end
     end
   end
+
+  def test_properly_identifies_usage_file
+    assert generator_class.send(:usage_path)
+  end
 end