ruby-changes:15656
From: drbrain <ko1@a...>
Date: Sat, 1 May 2010 14:06:43 +0900 (JST)
Subject: [ruby-changes:15656] Ruby:r27573 (trunk): Upgrade to RDoc 2.5.8
drbrain 2010-05-01 14:06:21 +0900 (Sat, 01 May 2010) New Revision: 27573 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27573 Log: Upgrade to RDoc 2.5.8 Modified files: trunk/ChangeLog trunk/NEWS trunk/lib/rdoc/ri/driver.rb trunk/lib/rdoc.rb trunk/test/rdoc/test_rdoc_ri_driver.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 27572) +++ ChangeLog (revision 27573) @@ -1,3 +1,7 @@ +Sat May 1 14:05:36 2010 Eric Hodel <drbrain@s...> + + * lib/rdoc: Upgrade to RDoc 2.5.8. + Sat May 1 09:43:06 2010 Nobuyoshi Nakada <nobu@r...> * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert): Index: lib/rdoc.rb =================================================================== --- lib/rdoc.rb (revision 27572) +++ lib/rdoc.rb (revision 27573) @@ -383,7 +383,7 @@ ## # RDoc version you are using - VERSION = '2.5.7' + VERSION = '2.5.8' ## # Name of the dotfile that contains the description of files to be processed Index: lib/rdoc/ri/driver.rb =================================================================== --- lib/rdoc/ri/driver.rb (revision 27572) +++ lib/rdoc/ri/driver.rb (revision 27573) @@ -1034,8 +1034,12 @@ pagers = [ENV['RI_PAGER'], ENV['PAGER'], 'pager', 'less', 'more'] pagers.compact.uniq.each do |pager| - io = IO.popen(pager, "w") rescue next + next unless File.exist? pager + io = IO.popen pager, "w" rescue next + + next if $? and $?.exited? # pager didn't work + @paging = true return io Index: NEWS =================================================================== --- NEWS (revision 27572) +++ NEWS (revision 27573) @@ -211,7 +211,7 @@ * RDoc - * Updated to RDoc 2.5.7 + * Updated to RDoc 2.5.8 * logger Index: test/rdoc/test_rdoc_ri_driver.rb =================================================================== --- test/rdoc/test_rdoc_ri_driver.rb (revision 27572) +++ test/rdoc/test_rdoc_ri_driver.rb (revision 27573) @@ -573,7 +573,7 @@ assert_equal expected, @driver.load_methods_matching('Bar#inherit') end - def test_page + def _test_page # this test doesn't do anything anymore :( @driver.use_stdout = false with_dummy_pager do @@ -681,7 +681,7 @@ assert_equal 'baz', meth, 'Foo::Bar#baz method' end - def test_setup_pager + def _test_setup_pager # this test doesn't do anything anymore :( @driver.use_stdout = false pager = with_dummy_pager do @driver.setup_pager end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/