diff options
author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-12 01:16:19 +0000 |
---|---|---|
committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-12 01:16:19 +0000 |
commit | 975fc745b3764664c177b07b35677c9dcfbbf47f (patch) | |
tree | 773a5a675aeba1c05a9ded293037b76c033eddc3 /lib/rdoc | |
parent | a651b0c9cc84d50e1eefd2ed728819a8f96c0b18 (diff) |
Never exclude files given on command line
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
-rw-r--r-- | lib/rdoc/rdoc.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb index 2fd67553e3..18bf64c8c9 100644 --- a/lib/rdoc/rdoc.rb +++ b/lib/rdoc/rdoc.rb @@ -144,19 +144,20 @@ module RDoc # Given a list of files and directories, create a list # of all the Ruby files they contain. # - # If +force_dic+ is true, we always add the given files. + # If +force_doc+ is true, we always add the given files. # If false, only add files that we guarantee we can parse # It is true when looking at files given on the command line, # false when recursing through subdirectories. # # The effect of this is that if you want a file with a non- # standard extension parsed, you must name it explicity. + # - def normalized_file_list(options, relative_files, force_doc = false) + def normalized_file_list(options, relative_files, force_doc = false, exclude_pattern=nil) file_list = [] relative_files.each do |rel_file_name| - next if options.exclude && options.exclude =~ rel_file_name + next if exclude_pattern && exclude_pattern =~ rel_file_name case type = File.stat(rel_file_name).ftype when "file" file_list << rel_file_name.sub(/^\.\//, '') if force_doc || ParserFactory.can_parse(rel_file_name) @@ -181,7 +182,7 @@ module RDoc # we may well contain subdirectories which must # be tested for .document files def list_files_in_directory(dir, options) - normalized_file_list(options, Dir.glob(File.join(dir, "*"))) + normalized_file_list(options, Dir.glob(File.join(dir, "*")), false, options.exclude) end |