mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Never exclude files given on command line
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a402acbbb6
commit
05b5e64ac3
2 changed files with 10 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
|||
Sun Dec 12 10:14:03 2004 Dave Thomas <dave@pragprog.com>
|
||||
|
||||
* lib/rdoc/rdoc.rb (RDoc::RDoc::parse_files): Never exclude files
|
||||
explicitly given on the command line.
|
||||
|
||||
Sat Dec 11 21:10:16 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
|
||||
|
||||
* lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue