diff options
-rw-r--r-- | railties/CHANGELOG | 4 | ||||
-rw-r--r-- | railties/lib/tasks/documentation.rake | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 4329ee9efe..32bd48cbf7 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,6 +1,8 @@ *SVN* -* The PostgreSQL :db_structure_dump task limits its dump to the schema search path in database.yml. [Anatol Pomozov <anatol.pomozov@gmail.com>] +* The *_plugindoc Rake tasks look deeper into the plugins' lib directories. #2652 [bellis@deepthought.org] + +* The PostgreSQL :db_structure_dump Rake task limits its dump to the schema search path in database.yml. [Anatol Pomozov <anatol.pomozov@gmail.com>] * Add task to generate rdoc for all installed plugins. [Marcel Molina] diff --git a/railties/lib/tasks/documentation.rake b/railties/lib/tasks/documentation.rake index 3a5b914644..212e56dee2 100644 --- a/railties/lib/tasks/documentation.rake +++ b/railties/lib/tasks/documentation.rake @@ -19,14 +19,14 @@ Plugins.each do |plugin| options << '--line-numbers --inline-source' options << '-T html' - files.include("#{plugin_base}/lib/*.rb") + files.include("#{plugin_base}/lib/**/*.rb") if File.exists?("#{plugin_base}/README") files.include("#{plugin_base}/README") options << "--main '#{plugin_base}/README'" end files.include("#{plugin_base}/CHANGELOG") if File.exists?("#{plugin_base}/CHANGELOG") - options << files.to_s + options << files.to_s sh %(rdoc #{options * ' '}) end |