rdoc 4.2.1 → 6.3.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of rdoc might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/CONTRIBUTING.rdoc +8 -7
- data/Gemfile +12 -0
- data/History.rdoc +48 -4
- data/LEGAL.rdoc +2 -2
- data/README.rdoc +5 -5
- data/Rakefile +73 -155
- data/bin/console +7 -0
- data/bin/setup +6 -0
- data/{bin → exe}/rdoc +0 -0
- data/{bin → exe}/ri +0 -0
- data/lib/rdoc/alias.rb +1 -0
- data/lib/rdoc/anon_class.rb +1 -0
- data/lib/rdoc/any_method.rb +59 -14
- data/lib/rdoc/attr.rb +1 -0
- data/lib/rdoc/class_module.rb +5 -2
- data/lib/rdoc/code_object.rb +3 -11
- data/lib/rdoc/code_objects.rb +1 -0
- data/lib/rdoc/comment.rb +32 -11
- data/lib/rdoc/constant.rb +3 -2
- data/lib/rdoc/context/section.rb +7 -13
- data/lib/rdoc/context.rb +78 -23
- data/lib/rdoc/cross_reference.rb +33 -14
- data/lib/rdoc/encoding.rb +92 -55
- data/lib/rdoc/erb_partial.rb +2 -1
- data/lib/rdoc/erbio.rb +8 -3
- data/lib/rdoc/extend.rb +1 -0
- data/lib/rdoc/generator/darkfish.rb +62 -32
- data/lib/rdoc/generator/json_index.rb +8 -5
- data/lib/rdoc/generator/markup.rb +3 -12
- data/lib/rdoc/generator/pot/message_extractor.rb +68 -0
- data/lib/rdoc/generator/pot/po.rb +84 -0
- data/lib/rdoc/generator/pot/po_entry.rb +141 -0
- data/lib/rdoc/generator/pot.rb +4 -3
- data/lib/rdoc/generator/ri.rb +1 -0
- data/lib/rdoc/generator/template/darkfish/_footer.rhtml +2 -2
- data/lib/rdoc/generator/template/darkfish/_head.rhtml +11 -8
- data/lib/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml +2 -2
- data/lib/rdoc/generator/template/darkfish/_sidebar_classes.rhtml +2 -2
- data/lib/rdoc/generator/template/darkfish/_sidebar_extends.rhtml +7 -7
- data/lib/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml +2 -2
- data/lib/rdoc/generator/template/darkfish/_sidebar_includes.rhtml +7 -7
- data/lib/rdoc/generator/template/darkfish/_sidebar_installed.rhtml +6 -6
- data/lib/rdoc/generator/template/darkfish/_sidebar_methods.rhtml +5 -5
- data/lib/rdoc/generator/template/darkfish/_sidebar_pages.rhtml +5 -5
- data/lib/rdoc/generator/template/darkfish/_sidebar_parent.rhtml +5 -5
- data/lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml +4 -4
- data/lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml +4 -4
- data/lib/rdoc/generator/template/darkfish/class.rhtml +45 -47
- data/lib/rdoc/generator/template/darkfish/css/fonts.css +6 -6
- data/lib/rdoc/generator/template/darkfish/css/rdoc.css +55 -6
- data/lib/rdoc/generator/template/darkfish/index.rhtml +3 -4
- data/lib/rdoc/generator/template/darkfish/js/darkfish.js +23 -100
- data/lib/rdoc/generator/template/darkfish/js/search.js +32 -31
- data/lib/rdoc/generator/template/darkfish/servlet_root.rhtml +15 -16
- data/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml +16 -16
- data/lib/rdoc/generator/template/json_index/js/navigation.js +4 -41
- data/lib/rdoc/generator/template/json_index/js/searcher.js +7 -6
- data/lib/rdoc/generator.rb +1 -1
- data/lib/rdoc/ghost_method.rb +1 -0
- data/lib/rdoc/i18n/locale.rb +2 -1
- data/lib/rdoc/i18n/text.rb +5 -4
- data/lib/rdoc/i18n.rb +3 -2
- data/lib/rdoc/include.rb +1 -0
- data/lib/rdoc/known_classes.rb +1 -0
- data/lib/rdoc/markdown/entities.rb +1 -0
- data/lib/rdoc/markdown/{literals_1_9.kpeg → literals.kpeg} +1 -0
- data/lib/rdoc/markdown/{literals_1_9.rb → literals.rb} +1 -4
- data/lib/rdoc/markdown.kpeg +94 -51
- data/lib/rdoc/markdown.rb +1171 -619
- data/lib/rdoc/markup/attr_changer.rb +1 -0
- data/lib/rdoc/markup/attr_span.rb +9 -2
- data/lib/rdoc/markup/attribute_manager.rb +115 -49
- data/lib/rdoc/markup/attributes.rb +7 -6
- data/lib/rdoc/markup/blank_line.rb +1 -0
- data/lib/rdoc/markup/block_quote.rb +1 -0
- data/lib/rdoc/markup/document.rb +1 -0
- data/lib/rdoc/markup/formatter.rb +25 -23
- data/lib/rdoc/markup/hard_break.rb +1 -0
- data/lib/rdoc/markup/heading.rb +4 -3
- data/lib/rdoc/markup/include.rb +1 -0
- data/lib/rdoc/markup/indented_paragraph.rb +1 -0
- data/lib/rdoc/markup/list.rb +1 -0
- data/lib/rdoc/markup/list_item.rb +1 -0
- data/lib/rdoc/markup/paragraph.rb +1 -0
- data/lib/rdoc/markup/parser.rb +78 -61
- data/lib/rdoc/markup/pre_process.rb +12 -9
- data/lib/rdoc/markup/raw.rb +1 -0
- data/lib/rdoc/markup/regexp_handling.rb +41 -0
- data/lib/rdoc/markup/rule.rb +1 -0
- data/lib/rdoc/markup/to_ansi.rb +1 -0
- data/lib/rdoc/markup/to_bs.rb +4 -5
- data/lib/rdoc/markup/to_html.rb +71 -25
- data/lib/rdoc/markup/to_html_crossref.rb +41 -25
- data/lib/rdoc/markup/to_html_snippet.rb +10 -9
- data/lib/rdoc/markup/to_joined_paragraph.rb +7 -31
- data/lib/rdoc/markup/to_label.rb +10 -9
- data/lib/rdoc/markup/to_markdown.rb +9 -8
- data/lib/rdoc/markup/to_rdoc.rb +35 -6
- data/lib/rdoc/markup/to_table_of_contents.rb +2 -0
- data/lib/rdoc/markup/to_test.rb +1 -0
- data/lib/rdoc/markup/to_tt_only.rb +3 -2
- data/lib/rdoc/markup/verbatim.rb +1 -0
- data/lib/rdoc/markup.rb +14 -16
- data/lib/rdoc/meta_method.rb +1 -0
- data/lib/rdoc/method_attr.rb +2 -1
- data/lib/rdoc/mixin.rb +1 -0
- data/lib/rdoc/normal_class.rb +3 -2
- data/lib/rdoc/normal_module.rb +1 -0
- data/lib/rdoc/options.rb +92 -58
- data/lib/rdoc/parser/c.rb +219 -223
- data/lib/rdoc/parser/changelog.rb +155 -18
- data/lib/rdoc/parser/markdown.rb +1 -0
- data/lib/rdoc/parser/rd.rb +1 -0
- data/lib/rdoc/parser/ripper_state_lex.rb +590 -0
- data/lib/rdoc/parser/ruby.rb +635 -468
- data/lib/rdoc/parser/ruby_tools.rb +33 -33
- data/lib/rdoc/parser/simple.rb +3 -3
- data/lib/rdoc/parser/text.rb +1 -0
- data/lib/rdoc/parser.rb +17 -50
- data/lib/rdoc/rd/block_parser.rb +66 -65
- data/lib/rdoc/rd/block_parser.ry +3 -3
- data/lib/rdoc/rd/inline.rb +5 -4
- data/lib/rdoc/rd/inline_parser.rb +52 -51
- data/lib/rdoc/rd/inline_parser.ry +1 -1
- data/lib/rdoc/rd.rb +1 -0
- data/lib/rdoc/rdoc.rb +68 -63
- data/lib/rdoc/require.rb +1 -0
- data/lib/rdoc/ri/driver.rb +133 -58
- data/lib/rdoc/ri/formatter.rb +1 -0
- data/lib/rdoc/ri/paths.rb +4 -20
- data/lib/rdoc/ri/store.rb +1 -0
- data/lib/rdoc/ri/task.rb +71 -0
- data/lib/rdoc/ri.rb +1 -0
- data/lib/rdoc/rubygems_hook.rb +5 -12
- data/lib/rdoc/servlet.rb +24 -14
- data/lib/rdoc/single_class.rb +1 -0
- data/lib/rdoc/stats/normal.rb +20 -21
- data/lib/rdoc/stats/quiet.rb +1 -0
- data/lib/rdoc/stats/verbose.rb +1 -0
- data/lib/rdoc/stats.rb +1 -0
- data/lib/rdoc/store.rb +41 -41
- data/lib/rdoc/task.rb +2 -3
- data/lib/rdoc/text.rb +19 -38
- data/lib/rdoc/token_stream.rb +56 -32
- data/lib/rdoc/tom_doc.rb +17 -11
- data/lib/rdoc/top_level.rb +9 -2
- data/lib/rdoc/version.rb +8 -0
- data/lib/rdoc.rb +24 -10
- data/man/ri.1 +247 -0
- data/rdoc.gemspec +248 -0
- metadata +43 -236
- data/.autotest +0 -24
- data/.document +0 -5
- data/Manifest.txt +0 -306
- data/lib/gauntlet_rdoc.rb +0 -84
- data/lib/rdoc/generator/template/darkfish/js/jquery.js +0 -4
- data/lib/rdoc/markdown/literals_1_8.kpeg +0 -18
- data/lib/rdoc/markdown/literals_1_8.rb +0 -416
- data/lib/rdoc/markup/formatter_test_case.rb +0 -767
- data/lib/rdoc/markup/inline.rb +0 -1
- data/lib/rdoc/markup/special.rb +0 -40
- data/lib/rdoc/markup/text_formatter_test_case.rb +0 -114
- data/lib/rdoc/ruby_lex.rb +0 -1377
- data/lib/rdoc/ruby_token.rb +0 -460
- data/lib/rdoc/test_case.rb +0 -217
- data/test/MarkdownTest_1.0.3/Amps and angle encoding.text +0 -21
- data/test/MarkdownTest_1.0.3/Auto links.text +0 -13
- data/test/MarkdownTest_1.0.3/Backslash escapes.text +0 -120
- data/test/MarkdownTest_1.0.3/Blockquotes with code blocks.text +0 -11
- data/test/MarkdownTest_1.0.3/Code Blocks.text +0 -14
- data/test/MarkdownTest_1.0.3/Code Spans.text +0 -6
- data/test/MarkdownTest_1.0.3/Hard-wrapped paragraphs with list-like lines.text +0 -8
- data/test/MarkdownTest_1.0.3/Horizontal rules.text +0 -67
- data/test/MarkdownTest_1.0.3/Inline HTML (Advanced).text +0 -15
- data/test/MarkdownTest_1.0.3/Inline HTML (Simple).text +0 -69
- data/test/MarkdownTest_1.0.3/Inline HTML comments.text +0 -13
- data/test/MarkdownTest_1.0.3/Links, inline style.text +0 -12
- data/test/MarkdownTest_1.0.3/Links, reference style.text +0 -71
- data/test/MarkdownTest_1.0.3/Links, shortcut references.text +0 -20
- data/test/MarkdownTest_1.0.3/Literal quotes in titles.text +0 -7
- data/test/MarkdownTest_1.0.3/Markdown Documentation - Basics.text +0 -306
- data/test/MarkdownTest_1.0.3/Markdown Documentation - Syntax.text +0 -888
- data/test/MarkdownTest_1.0.3/Nested blockquotes.text +0 -5
- data/test/MarkdownTest_1.0.3/Ordered and unordered lists.text +0 -131
- data/test/MarkdownTest_1.0.3/Strong and em together.text +0 -7
- data/test/MarkdownTest_1.0.3/Tabs.text +0 -21
- data/test/MarkdownTest_1.0.3/Tidyness.text +0 -5
- data/test/README +0 -1
- data/test/binary.dat +0 -0
- data/test/hidden.zip.txt +0 -1
- data/test/test.ja.largedoc +0 -3
- data/test/test.ja.rdoc +0 -10
- data/test/test.ja.txt +0 -8
- data/test/test.txt +0 -1
- data/test/test_rdoc_alias.rb +0 -13
- data/test/test_rdoc_any_method.rb +0 -460
- data/test/test_rdoc_attr.rb +0 -190
- data/test/test_rdoc_class_module.rb +0 -1492
- data/test/test_rdoc_code_object.rb +0 -450
- data/test/test_rdoc_comment.rb +0 -504
- data/test/test_rdoc_constant.rb +0 -181
- data/test/test_rdoc_context.rb +0 -901
- data/test/test_rdoc_context_section.rb +0 -130
- data/test/test_rdoc_cross_reference.rb +0 -192
- data/test/test_rdoc_encoding.rb +0 -227
- data/test/test_rdoc_extend.rb +0 -94
- data/test/test_rdoc_generator_darkfish.rb +0 -229
- data/test/test_rdoc_generator_json_index.rb +0 -324
- data/test/test_rdoc_generator_markup.rb +0 -59
- data/test/test_rdoc_generator_pot.rb +0 -91
- data/test/test_rdoc_generator_pot_po.rb +0 -51
- data/test/test_rdoc_generator_pot_po_entry.rb +0 -139
- data/test/test_rdoc_generator_ri.rb +0 -78
- data/test/test_rdoc_i18n_locale.rb +0 -73
- data/test/test_rdoc_i18n_text.rb +0 -123
- data/test/test_rdoc_include.rb +0 -108
- data/test/test_rdoc_markdown.rb +0 -980
- data/test/test_rdoc_markdown_test.rb +0 -1884
- data/test/test_rdoc_markup.rb +0 -95
- data/test/test_rdoc_markup_attribute_manager.rb +0 -364
- data/test/test_rdoc_markup_attributes.rb +0 -39
- data/test/test_rdoc_markup_document.rb +0 -207
- data/test/test_rdoc_markup_formatter.rb +0 -175
- data/test/test_rdoc_markup_hard_break.rb +0 -31
- data/test/test_rdoc_markup_heading.rb +0 -29
- data/test/test_rdoc_markup_include.rb +0 -19
- data/test/test_rdoc_markup_indented_paragraph.rb +0 -53
- data/test/test_rdoc_markup_paragraph.rb +0 -32
- data/test/test_rdoc_markup_parser.rb +0 -1680
- data/test/test_rdoc_markup_pre_process.rb +0 -473
- data/test/test_rdoc_markup_raw.rb +0 -22
- data/test/test_rdoc_markup_to_ansi.rb +0 -369
- data/test/test_rdoc_markup_to_bs.rb +0 -366
- data/test/test_rdoc_markup_to_html.rb +0 -662
- data/test/test_rdoc_markup_to_html_crossref.rb +0 -225
- data/test/test_rdoc_markup_to_html_snippet.rb +0 -711
- data/test/test_rdoc_markup_to_joined_paragraph.rb +0 -32
- data/test/test_rdoc_markup_to_label.rb +0 -112
- data/test/test_rdoc_markup_to_markdown.rb +0 -389
- data/test/test_rdoc_markup_to_rdoc.rb +0 -377
- data/test/test_rdoc_markup_to_table_of_contents.rb +0 -126
- data/test/test_rdoc_markup_to_tt_only.rb +0 -246
- data/test/test_rdoc_markup_verbatim.rb +0 -29
- data/test/test_rdoc_method_attr.rb +0 -193
- data/test/test_rdoc_normal_class.rb +0 -47
- data/test/test_rdoc_normal_module.rb +0 -42
- data/test/test_rdoc_options.rb +0 -766
- data/test/test_rdoc_parser.rb +0 -327
- data/test/test_rdoc_parser_c.rb +0 -1896
- data/test/test_rdoc_parser_changelog.rb +0 -315
- data/test/test_rdoc_parser_markdown.rb +0 -61
- data/test/test_rdoc_parser_rd.rb +0 -55
- data/test/test_rdoc_parser_ruby.rb +0 -3322
- data/test/test_rdoc_parser_simple.rb +0 -115
- data/test/test_rdoc_rd.rb +0 -30
- data/test/test_rdoc_rd_block_parser.rb +0 -535
- data/test/test_rdoc_rd_inline.rb +0 -63
- data/test/test_rdoc_rd_inline_parser.rb +0 -177
- data/test/test_rdoc_rdoc.rb +0 -455
- data/test/test_rdoc_require.rb +0 -25
- data/test/test_rdoc_ri_driver.rb +0 -1436
- data/test/test_rdoc_ri_paths.rb +0 -155
- data/test/test_rdoc_ruby_lex.rb +0 -421
- data/test/test_rdoc_ruby_token.rb +0 -19
- data/test/test_rdoc_rubygems_hook.rb +0 -251
- data/test/test_rdoc_servlet.rb +0 -534
- data/test/test_rdoc_single_class.rb +0 -20
- data/test/test_rdoc_stats.rb +0 -722
- data/test/test_rdoc_store.rb +0 -993
- data/test/test_rdoc_task.rb +0 -173
- data/test/test_rdoc_text.rb +0 -557
- data/test/test_rdoc_token_stream.rb +0 -42
- data/test/test_rdoc_tom_doc.rb +0 -520
- data/test/test_rdoc_top_level.rb +0 -287
- data/test/xref_data.rb +0 -76
- data/test/xref_test_case.rb +0 -67
data/lib/rdoc/options.rb
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
require 'optparse'
|
2
3
|
require 'pathname'
|
3
4
|
|
@@ -163,7 +164,7 @@ class RDoc::Options
|
|
163
164
|
##
|
164
165
|
# Files matching this pattern will be excluded
|
165
166
|
|
166
|
-
|
167
|
+
attr_writer :exclude
|
167
168
|
|
168
169
|
##
|
169
170
|
# The list of files to be processed
|
@@ -337,13 +338,17 @@ class RDoc::Options
|
|
337
338
|
|
338
339
|
attr_reader :visibility
|
339
340
|
|
340
|
-
def initialize # :nodoc:
|
341
|
+
def initialize loaded_options = nil # :nodoc:
|
341
342
|
init_ivars
|
343
|
+
override loaded_options if loaded_options
|
342
344
|
end
|
343
345
|
|
344
346
|
def init_ivars # :nodoc:
|
345
347
|
@dry_run = false
|
346
|
-
@exclude = [
|
348
|
+
@exclude = %w[
|
349
|
+
~\z \.orig\z \.rej\z \.bak\z
|
350
|
+
\.gemspec\z
|
351
|
+
]
|
347
352
|
@files = nil
|
348
353
|
@force_output = false
|
349
354
|
@force_update = true
|
@@ -378,23 +383,15 @@ class RDoc::Options
|
|
378
383
|
@visibility = :protected
|
379
384
|
@webcvs = nil
|
380
385
|
@write_options = false
|
381
|
-
|
382
|
-
|
383
|
-
@encoding = Encoding::UTF_8
|
384
|
-
@charset = @encoding.name
|
385
|
-
else
|
386
|
-
@encoding = nil
|
387
|
-
@charset = 'UTF-8'
|
388
|
-
end
|
386
|
+
@encoding = Encoding::UTF_8
|
387
|
+
@charset = @encoding.name
|
389
388
|
end
|
390
389
|
|
391
390
|
def init_with map # :nodoc:
|
392
391
|
init_ivars
|
393
392
|
|
394
393
|
encoding = map['encoding']
|
395
|
-
@encoding =
|
396
|
-
encoding ? Encoding.find(encoding) : encoding
|
397
|
-
end
|
394
|
+
@encoding = encoding ? Encoding.find(encoding) : encoding
|
398
395
|
|
399
396
|
@charset = map['charset']
|
400
397
|
@exclude = map['exclude']
|
@@ -421,6 +418,37 @@ class RDoc::Options
|
|
421
418
|
init_with map
|
422
419
|
end
|
423
420
|
|
421
|
+
def override map # :nodoc:
|
422
|
+
if map.has_key?('encoding')
|
423
|
+
encoding = map['encoding']
|
424
|
+
@encoding = encoding ? Encoding.find(encoding) : encoding
|
425
|
+
end
|
426
|
+
|
427
|
+
@charset = map['charset'] if map.has_key?('charset')
|
428
|
+
@exclude = map['exclude'] if map.has_key?('exclude')
|
429
|
+
@generator_name = map['generator_name'] if map.has_key?('generator_name')
|
430
|
+
@hyperlink_all = map['hyperlink_all'] if map.has_key?('hyperlink_all')
|
431
|
+
@line_numbers = map['line_numbers'] if map.has_key?('line_numbers')
|
432
|
+
@locale_name = map['locale_name'] if map.has_key?('locale_name')
|
433
|
+
@locale_dir = map['locale_dir'] if map.has_key?('locale_dir')
|
434
|
+
@main_page = map['main_page'] if map.has_key?('main_page')
|
435
|
+
@markup = map['markup'] if map.has_key?('markup')
|
436
|
+
@op_dir = map['op_dir'] if map.has_key?('op_dir')
|
437
|
+
@show_hash = map['show_hash'] if map.has_key?('show_hash')
|
438
|
+
@tab_width = map['tab_width'] if map.has_key?('tab_width')
|
439
|
+
@template_dir = map['template_dir'] if map.has_key?('template_dir')
|
440
|
+
@title = map['title'] if map.has_key?('title')
|
441
|
+
@visibility = map['visibility'] if map.has_key?('visibility')
|
442
|
+
@webcvs = map['webcvs'] if map.has_key?('webcvs')
|
443
|
+
|
444
|
+
if map.has_key?('rdoc_include')
|
445
|
+
@rdoc_include = sanitize_path map['rdoc_include']
|
446
|
+
end
|
447
|
+
if map.has_key?('static_path')
|
448
|
+
@static_path = sanitize_path map['static_path']
|
449
|
+
end
|
450
|
+
end
|
451
|
+
|
424
452
|
def == other # :nodoc:
|
425
453
|
self.class === other and
|
426
454
|
@encoding == other.encoding and
|
@@ -500,6 +528,20 @@ class RDoc::Options
|
|
500
528
|
end
|
501
529
|
end
|
502
530
|
|
531
|
+
##
|
532
|
+
# Create a regexp for #exclude
|
533
|
+
|
534
|
+
def exclude
|
535
|
+
if @exclude.nil? or Regexp === @exclude then
|
536
|
+
# done, #finish is being re-run
|
537
|
+
@exclude
|
538
|
+
elsif @exclude.empty? then
|
539
|
+
nil
|
540
|
+
else
|
541
|
+
Regexp.new(@exclude.join("|"))
|
542
|
+
end
|
543
|
+
end
|
544
|
+
|
503
545
|
##
|
504
546
|
# Completes any unfinished option setup business such as filtering for
|
505
547
|
# existent files, creating a regexp for #exclude and setting a default
|
@@ -512,13 +554,7 @@ class RDoc::Options
|
|
512
554
|
root = @root.to_s
|
513
555
|
@rdoc_include << root unless @rdoc_include.include?(root)
|
514
556
|
|
515
|
-
|
516
|
-
# done, #finish is being re-run
|
517
|
-
elsif @exclude.empty? then
|
518
|
-
@exclude = nil
|
519
|
-
else
|
520
|
-
@exclude = Regexp.new(@exclude.join("|"))
|
521
|
-
end
|
557
|
+
@exclude = self.exclude
|
522
558
|
|
523
559
|
finish_page_dir
|
524
560
|
|
@@ -551,7 +587,13 @@ class RDoc::Options
|
|
551
587
|
|
552
588
|
@files << @page_dir.to_s
|
553
589
|
|
554
|
-
page_dir =
|
590
|
+
page_dir = nil
|
591
|
+
begin
|
592
|
+
page_dir = @page_dir.expand_path.relative_path_from @root
|
593
|
+
rescue ArgumentError
|
594
|
+
# On Windows, sometimes crosses different drive letters.
|
595
|
+
page_dir = @page_dir.expand_path
|
596
|
+
end
|
555
597
|
|
556
598
|
@page_dir = page_dir
|
557
599
|
end
|
@@ -631,16 +673,16 @@ Usage: #{opt.program_name} [options] [names...]
|
|
631
673
|
end
|
632
674
|
|
633
675
|
parsers.sort.each do |parser, regexp|
|
634
|
-
opt.banner
|
676
|
+
opt.banner += " - #{parser}: #{regexp.join ', '}\n"
|
635
677
|
end
|
636
|
-
opt.banner
|
678
|
+
opt.banner += " - TomDoc: Only in ruby files\n"
|
637
679
|
|
638
|
-
opt.banner
|
680
|
+
opt.banner += "\n The following options are deprecated:\n\n"
|
639
681
|
|
640
682
|
name_length = DEPRECATED.keys.sort_by { |k| k.length }.last.length
|
641
683
|
|
642
684
|
DEPRECATED.sort_by { |k,| k }.each do |name, reason|
|
643
|
-
opt.banner
|
685
|
+
opt.banner += " %*1$2$s %3$s\n" % [-name_length, name, reason]
|
644
686
|
end
|
645
687
|
|
646
688
|
opt.accept Template do |template|
|
@@ -688,19 +730,16 @@ Usage: #{opt.program_name} [options] [names...]
|
|
688
730
|
opt.separator "Parsing options:"
|
689
731
|
opt.separator nil
|
690
732
|
|
691
|
-
|
692
|
-
|
693
|
-
|
694
|
-
|
695
|
-
|
696
|
-
|
697
|
-
|
698
|
-
|
699
|
-
end
|
700
|
-
|
701
|
-
opt.separator nil
|
702
|
-
end
|
733
|
+
opt.on("--encoding=ENCODING", "-e", Encoding.list.map { |e| e.name },
|
734
|
+
"Specifies the output encoding. All files",
|
735
|
+
"read will be converted to this encoding.",
|
736
|
+
"The default encoding is UTF-8.",
|
737
|
+
"--encoding is preferred over --charset") do |value|
|
738
|
+
@encoding = Encoding.find value
|
739
|
+
@charset = @encoding.name # may not be valid value
|
740
|
+
end
|
703
741
|
|
742
|
+
opt.separator nil
|
704
743
|
|
705
744
|
opt.on("--locale=NAME",
|
706
745
|
"Specifies the output locale.") do |value|
|
@@ -748,7 +787,7 @@ Usage: #{opt.program_name} [options] [names...]
|
|
748
787
|
|
749
788
|
opt.on("--[no-]force-update", "-U",
|
750
789
|
"Forces rdoc to scan all sources even if",
|
751
|
-
"newer than the flag file.") do |value|
|
790
|
+
"no files are newer than the flag file.") do |value|
|
752
791
|
@force_update = value
|
753
792
|
end
|
754
793
|
|
@@ -1097,7 +1136,7 @@ Usage: #{opt.program_name} [options] [names...]
|
|
1097
1136
|
|
1098
1137
|
unless quiet then
|
1099
1138
|
deprecated.each do |opt|
|
1100
|
-
$stderr.puts 'option '
|
1139
|
+
$stderr.puts 'option ' + opt + ' is deprecated: ' + DEPRECATED[opt]
|
1101
1140
|
end
|
1102
1141
|
end
|
1103
1142
|
|
@@ -1153,8 +1192,17 @@ Usage: #{opt.program_name} [options] [names...]
|
|
1153
1192
|
|
1154
1193
|
path.reject do |item|
|
1155
1194
|
path = Pathname.new(item).expand_path
|
1156
|
-
|
1157
|
-
relative
|
1195
|
+
is_reject = nil
|
1196
|
+
relative = nil
|
1197
|
+
begin
|
1198
|
+
relative = path.relative_path_from(dot).to_s
|
1199
|
+
rescue ArgumentError
|
1200
|
+
# On Windows, sometimes crosses different drive letters.
|
1201
|
+
is_reject = true
|
1202
|
+
else
|
1203
|
+
is_reject = relative.start_with? '..'
|
1204
|
+
end
|
1205
|
+
is_reject
|
1158
1206
|
end
|
1159
1207
|
end
|
1160
1208
|
|
@@ -1197,19 +1245,6 @@ Usage: #{opt.program_name} [options] [names...]
|
|
1197
1245
|
end
|
1198
1246
|
end
|
1199
1247
|
|
1200
|
-
##
|
1201
|
-
# This is compatibility code for syck
|
1202
|
-
|
1203
|
-
def to_yaml opts = {} # :nodoc:
|
1204
|
-
return super if YAML.const_defined?(:ENGINE) and not YAML::ENGINE.syck?
|
1205
|
-
|
1206
|
-
YAML.quick_emit self, opts do |out|
|
1207
|
-
out.map taguri, to_yaml_style do |map|
|
1208
|
-
encode_with map
|
1209
|
-
end
|
1210
|
-
end
|
1211
|
-
end
|
1212
|
-
|
1213
1248
|
# Sets the minimum visibility of a documented method.
|
1214
1249
|
#
|
1215
1250
|
# Accepts +:public+, +:protected+, +:private+, +:nodoc+, or +:all+.
|
@@ -1240,12 +1275,11 @@ Usage: #{opt.program_name} [options] [names...]
|
|
1240
1275
|
def write_options
|
1241
1276
|
RDoc.load_yaml
|
1242
1277
|
|
1243
|
-
open '.rdoc_options', 'w' do |io|
|
1244
|
-
io.set_encoding Encoding::UTF_8
|
1278
|
+
File.open '.rdoc_options', 'w' do |io|
|
1279
|
+
io.set_encoding Encoding::UTF_8
|
1245
1280
|
|
1246
1281
|
YAML.dump self, io
|
1247
1282
|
end
|
1248
1283
|
end
|
1249
1284
|
|
1250
1285
|
end
|
1251
|
-
|