diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-10 06:36:13 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-10 06:36:13 +0000 |
| commit | 1325437297539bf433904b64db63a3186e62177e (patch) | |
| tree | 01608a107ec3939b1013152d961b6407a5ba9c25 /lib/rdoc/rdoc.rb | |
| parent | ce2b574017cacc2c3f2b0e92f82a7f250639fc34 (diff) | |
* lib/rdoc: Import RDoc 2.5.2
* lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): Don't parse rdoc
files, reverts r24976 in favor of include directive support in C
parser.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/rdoc.rb')
| -rw-r--r-- | lib/rdoc/rdoc.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index 493dada4f0..736c77eb23 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -135,17 +135,17 @@ class RDoc::RDoc def setup_output_dir(op_dir, force) flag_file = output_flag_file op_dir - last = @last_created + last = {} if File.exist? op_dir then unless File.directory? op_dir then error "'#{op_dir}' exists, and is not a directory" end begin - open(flag_file) do |f| + open flag_file do |io| unless force - Time.parse(f.gets) - f.each do |line| + Time.parse f.gets + io.each do |line| file, time = line.split(/\t/, 2) time = Time.parse(time) rescue next last[file] = time @@ -225,19 +225,20 @@ class RDoc::RDoc stat = File.stat rel_file_name rescue next case type = stat.ftype - when "file" - next if last_created = @last_created[rel_file_name] and stat.mtime <= last_created + when "file" then + next if last_created = @last_created[rel_file_name] and + stat.mtime <= last_created if force_doc or RDoc::Parser.can_parse(rel_file_name) then file_list << rel_file_name.sub(/^\.\//, '') @last_created[rel_file_name] = stat.mtime end - when "directory" + when "directory" then next if rel_file_name == "CVS" || rel_file_name == ".svn" dot_doc = File.join rel_file_name, RDoc::DOT_DOC_FILENAME - if File.file?(dot_doc) then + if File.file? dot_doc then file_list << parse_dot_doc_file(rel_file_name, dot_doc) else file_list << list_files_in_directory(rel_file_name) @@ -355,7 +356,7 @@ The internal error was: @exclude = @options.exclude - setup_output_dir @options.op_dir, @options.force_update + @last_created = setup_output_dir @options.op_dir, @options.force_update start_time = Time.now |