rdoc 2.5.4 → 2.5.5

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.

data.tar.gz.sig CHANGED
Binary file
@@ -1,9 +1,9 @@
1
- === 2.5.4 / 2010-04-18
1
+ === 2.5.5 / 2010-04-19
2
2
 
3
3
  *NOTE*:
4
4
 
5
5
  RDoc 2.5 did not save method parameters, so you should upgrade your rdoc-data
6
- gem to a version > 2.5.1.
6
+ gem to a version >= 2.5.3.
7
7
 
8
8
  To have ri data for core and stdlib you'll need to:
9
9
 
@@ -19,6 +19,18 @@ To have ri data for you gems you'll also need to run:
19
19
 
20
20
  If you don't want to rebuild the rdoc for `gem server`, add --no-rdoc.
21
21
 
22
+ * 1 Minor Enhancement
23
+ * Use #binread in RDoc::Markup::PreProcess. Patch from ruby trunk.
24
+ * 3 Bug Fixes
25
+ * Fixed indentation of method-description lists in Darkfish. Bug #28081 by
26
+ Theresa Dwinnell.
27
+ * Fixed loading RDoc::AnyMethod aliases to no longer infinitely loop. Bug
28
+ #28107 by Sven Riedel
29
+ * Fixed handling of ignored invalid options to continue after the invalid
30
+ option.
31
+
32
+ === 2.5.4 / 2010-04-18
33
+
22
34
  * 2 Minor Enhancements
23
35
  * Methods will now be cross-referenced when preceeded with ::. Ruby Bug
24
36
  #3169 by Marc-Andre Lafortune.
data/Rakefile CHANGED
@@ -13,7 +13,8 @@ Hoe.spec 'rdoc' do
13
13
  self.remote_rdoc_dir = ''
14
14
  self.testlib = :minitest
15
15
 
16
- extra_dev_deps << ['minitest', '~> 1.3']
16
+ extra_dev_deps << ['minitest', '~> 1.3']
17
+ extra_rdoc_files << 'Rakefile'
17
18
  spec_extras['required_rubygems_version'] = '>= 1.3'
18
19
  spec_extras['homepage'] = 'http://rdoc.rubyforge.org'
19
20
  end
@@ -383,7 +383,7 @@ module RDoc
383
383
  ##
384
384
  # RDoc version you are using
385
385
 
386
- VERSION = '2.5.4'
386
+ VERSION = '2.5.5'
387
387
 
388
388
  ##
389
389
  # Name of the dotfile that contains the description of files to be processed
@@ -173,6 +173,7 @@ class RDoc::AnyMethod < RDoc::CodeObject
173
173
  @dont_rename_initialize = nil
174
174
  @is_alias_for = nil
175
175
  @token_stream = nil
176
+ @aliases = []
176
177
 
177
178
  @name = array[1]
178
179
  @full_name = array[2]
@@ -181,7 +182,6 @@ class RDoc::AnyMethod < RDoc::CodeObject
181
182
  @comment = array[5]
182
183
  @call_seq = array[6]
183
184
  @block_params = array[7]
184
- @aliases = array[8]
185
185
  @params = array[9]
186
186
 
187
187
  @parent_name = if @full_name =~ /#/ then
@@ -192,8 +192,8 @@ class RDoc::AnyMethod < RDoc::CodeObject
192
192
  name.join '::'
193
193
  end
194
194
 
195
- array[8].each do |old_name, new_name, comment|
196
- add_alias RDoc::Alias.new(nil, old_name, new_name, comment)
195
+ array[8].each do |new_name, comment|
196
+ add_alias RDoc::Alias.new(nil, @name, new_name, comment)
197
197
  end
198
198
  end
199
199
 
@@ -270,8 +270,12 @@ ul.link-list .type {
270
270
  margin: 1em 0.4em;
271
271
  }
272
272
 
273
+ #description li p {
274
+ margin: 0;
275
+ }
276
+
273
277
  #description ul {
274
- margin-left: 2em;
278
+ margin-left: 1.5em;
275
279
  }
276
280
  #description ul li {
277
281
  line-height: 1.4em;
@@ -401,6 +405,9 @@ ul.link-list .type {
401
405
  #documentation .method-description p + p {
402
406
  margin-bottom: 0.5em;
403
407
  }
408
+ #documentation .method-description ul {
409
+ margin-left: 1.5em;
410
+ }
404
411
 
405
412
  #documentation .attribute-method-heading {
406
413
  background: url(images/tag_green.png) no-repeat left bottom;
@@ -46,7 +46,12 @@ class RDoc::Markup::PreProcess
46
46
 
47
47
  def include_file(name, indent)
48
48
  if full_name = find_include_file(name) then
49
- content = File.read full_name
49
+ content = if defined?(Encoding) then
50
+ File.binread full_name
51
+ else
52
+ File.read full_name
53
+ end
54
+ # HACK determine content type and force encoding
50
55
  content = content.sub(/\A# .*coding[=:].*$/, '').lstrip
51
56
 
52
57
  # strip leading '#'s, but only if all lines start with them
@@ -350,13 +350,14 @@ Usage: #{opt.program_name} [options] [names...]
350
350
  end
351
351
 
352
352
  argv.insert(0, *ENV['RDOCOPT'].split) if ENV['RDOCOPT']
353
+ ignored = []
353
354
 
354
355
  begin
355
356
  opts.parse! argv
356
357
  rescue OptionParser::InvalidArgument, OptionParser::InvalidOption => e
357
- if ignore_invalid and not quiet then
358
- $stderr.puts e
359
- $stderr.puts '(invalid options are ignored)'
358
+ if ignore_invalid then
359
+ ignored << e.args.join(' ')
360
+ retry
360
361
  else
361
362
  $stderr.puts opts
362
363
  $stderr.puts
@@ -365,6 +366,11 @@ Usage: #{opt.program_name} [options] [names...]
365
366
  end
366
367
  end
367
368
 
369
+ if ignored and not quiet then
370
+ $stderr.puts "invalid options: #{ignored.join ', '}"
371
+ $stderr.puts '(invalid options are ignored)'
372
+ end
373
+
368
374
  @op_dir ||= 'doc'
369
375
  @files = argv.dup
370
376
 
@@ -14,16 +14,18 @@ class TestRDocOptions < MiniTest::Unit::TestCase
14
14
  end
15
15
 
16
16
  refute_match %r%^Usage: %, err
17
- assert_match %r%^invalid option: --bogus%, err
17
+ assert_match %r%^invalid options: --bogus%, err
18
18
  end
19
19
 
20
20
  def test_parse_ignore_invalid_default
21
21
  out, err = capture_io do
22
- @options.parse %w[--bogus]
22
+ @options.parse %w[--bogus --main BLAH]
23
23
  end
24
24
 
25
25
  refute_match %r%^Usage: %, err
26
- assert_match %r%^invalid option: --bogus%, err
26
+ assert_match %r%^invalid options: --bogus%, err
27
+
28
+ assert_equal 'BLAH', @options.main_page
27
29
  end
28
30
 
29
31
  def test_parse_ignore_invalid_no
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 2
7
7
  - 5
8
- - 4
9
- version: 2.5.4
8
+ - 5
9
+ version: 2.5.5
10
10
  platform: ruby
11
11
  authors:
12
12
  - Eric Hodel
@@ -38,7 +38,7 @@ cert_chain:
38
38
  x52qPcexcYZR7w==
39
39
  -----END CERTIFICATE-----
40
40
 
41
- date: 2010-04-18 00:00:00 -07:00
41
+ date: 2010-04-19 00:00:00 -07:00
42
42
  default_executable:
43
43
  dependencies:
44
44
  - !ruby/object:Gem::Dependency
@@ -122,6 +122,7 @@ extra_rdoc_files:
122
122
  - Manifest.txt
123
123
  - README.txt
124
124
  - RI.txt
125
+ - Rakefile
125
126
  files:
126
127
  - .autotest
127
128
  - .document
metadata.gz.sig CHANGED
Binary file