rdoc 2.5.8 → 2.5.9

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.5.9 / 2010-07-06
+
+* Bug Fixes
+  * Look up pager correctly.
+  * Fixed handling of bullets in verbatim sections.  Partial patch by
+    Juha-Jarmo Heinonen.
+
 === 2.5.8 / 2010-04-27
 
 *NOTE*:

data/lib/rdoc.rb

@@ -383,7 +383,7 @@ module RDoc
   ##
   # RDoc version you are using
 
-  VERSION = '2.5.8'
+  VERSION = '2.5.9'
 
   ##
   # Name of the dotfile that contains the description of files to be processed

data/lib/rdoc/markup/parser.rb

@@ -276,7 +276,7 @@ class RDoc::Markup::Parser
         end
 
         list_marker = case type
-                      when :BULLET                   then '*'
+                      when :BULLET                   then data
                       when :LABEL                    then "[#{data}]"
                       when :LALPHA, :NUMBER, :UALPHA then "#{data}."
                       when :NOTE                     then "#{data}::"
@@ -474,7 +474,7 @@ class RDoc::Markup::Parser
                  when s.scan(/^(-{3,}) *$/) then
                    [:RULE, s[1].length - 2, *token_pos(pos)]
                  when s.scan(/([*-])\s+/) then
-                   @tokens << [:BULLET, :BULLET, *token_pos(pos)]
+                   @tokens << [:BULLET, s[1], *token_pos(pos)]
                    [:SPACE, s.matched_size, *token_pos(pos)]
                  when s.scan(/([a-z]|\d+)\.[ \t]+\S/i) then
                    list_label = s[1]

data/lib/rdoc/ri/driver.rb

@@ -841,6 +841,17 @@ Options may also be set in the 'RI' environment variable.
     exit
   end
 
+  ##
+  # Is +file+ in ENV['PATH']?
+
+  def in_path? file
+    return true if file =~ %r%\A/% and File.exist? file
+
+    ENV['PATH'].split(File::PATH_SEPARATOR).any? do |path|
+      File.exist? File.join(path, file)
+    end
+  end
+
   ##
   # Lists classes known to ri
 
@@ -1034,9 +1045,11 @@ Options may also be set in the 'RI' environment variable.
     pagers = [ENV['RI_PAGER'], ENV['PAGER'], 'pager', 'less', 'more']
 
     pagers.compact.uniq.each do |pager|
-      next unless File.exist? pager
+      pager_cmd = pager.split.first
+
+      next unless in_path? pager_cmd
 
-      io = IO.popen pager, "w" rescue next
+      io = IO.popen(pager, 'w') rescue next
 
       next if $? and $?.exited? # pager didn't work
 

data/test/test_rdoc_markup_parser.rb

@@ -594,6 +594,17 @@ the time
     assert_equal expected, @RMP.parse(str).parts
   end
 
+  def test_parse_verbatim_dash
+    str = <<-STR
+  - blah
+    STR
+
+    expected = [
+      @RM::Verbatim.new('  ', '-', ' ', 'blah', "\n")]
+
+    assert_equal expected, @RMP.parse(str).parts
+  end
+
   def test_parse_verbatim_fold
     str = <<-STR
 now is
@@ -942,7 +953,7 @@ the time
     STR
 
     expected = [
-      [:BULLET,  :BULLET, 0, 0],
+      [:BULLET,  '*',     0, 0],
       [:SPACE,   2,       0, 0],
       [:TEXT,    'l1',    2, 0],
       [:NEWLINE, "\n",    4, 0],
@@ -958,12 +969,12 @@ the time
     STR
 
     expected = [
-      [:BULLET,  :BULLET, 0, 0],
+      [:BULLET,  '*',     0, 0],
       [:SPACE,   2,       0, 0],
       [:TEXT,    'l1',    2, 0],
       [:NEWLINE, "\n",    4, 0],
       [:INDENT,  2,       0, 1],
-      [:BULLET,  :BULLET, 2, 1],
+      [:BULLET,  '*',     2, 1],
       [:SPACE,   2,       2, 1],
       [:TEXT,    'l1.1',  4, 1],
       [:NEWLINE, "\n",    8, 1],

data/test/test_rdoc_ri_driver.rb

@@ -509,6 +509,18 @@ Foo::Bar#bother
     assert_instance_of @RM::ToHtml, driver.formatter
   end
 
+  def test_in_path_eh
+    path = ENV['PATH']
+
+    refute @driver.in_path?('/nonexistent')
+
+    ENV['PATH'] = File.expand_path '..', __FILE__
+
+    assert @driver.in_path?(File.basename(__FILE__))
+  ensure
+    ENV['PATH'] = path
+  end
+
   def test_method_type
     assert_equal :both,     @driver.method_type(nil)
     assert_equal :both,     @driver.method_type('.')
@@ -520,7 +532,7 @@ Foo::Bar#bother
     util_store
 
     out, err = capture_io do
-      @driver.list_known_classes 
+      @driver.list_known_classes
     end
 
     assert_equal "Ambiguous\nFoo\nFoo::Bar\nFoo::Baz\nInc\n", out

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdoc
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 5
-  - 8
-  version: 2.5.8
+  - 9
+  version: 2.5.9
 platform: ruby
 authors: 
 - Eric Hodel
@@ -39,7 +39,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-04-27 00:00:00 -07:00
+date: 2010-07-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rdoc
-rubygems_version: 1.3.7.pre.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RDoc is an application that produces documentation for one or more Ruby source files

metadata.gz.sig

@@ -1 +1,2 @@
-:���	���&x���lK͸�X��n	��
+
+;]	���j$eA