diff options
Diffstat (limited to 'lib/rdoc')
| -rw-r--r-- | lib/rdoc/diagram.rb | 2 | ||||
| -rw-r--r-- | lib/rdoc/generators/chm_generator.rb | 4 | ||||
| -rw-r--r-- | lib/rdoc/ri/ri_display.rb | 27 |
3 files changed, 14 insertions, 19 deletions
diff --git a/lib/rdoc/diagram.rb b/lib/rdoc/diagram.rb index 94ab17bb35..3ff36c1d03 100644 --- a/lib/rdoc/diagram.rb +++ b/lib/rdoc/diagram.rb @@ -295,7 +295,7 @@ module RDoc f << graph.to_s << "\n" end - system "dot -T#{op_type} #{src} -o #{dot}" + system "dot", "-T#{op_type}", src, "-o", dot # Now construct the imagemap wrapper around # that png diff --git a/lib/rdoc/generators/chm_generator.rb b/lib/rdoc/generators/chm_generator.rb index 1c46769cc2..51eeda8dd1 100644 --- a/lib/rdoc/generators/chm_generator.rb +++ b/lib/rdoc/generators/chm_generator.rb @@ -4,7 +4,7 @@ module Generators class CHMGenerator < HTMLGenerator - HHC_PATH = "c:\\Program Files\\HTML Help Workshop\\hhc.exe" + HHC_PATH = "c:/Program Files/HTML Help Workshop/hhc.exe" # Standard generator factory def CHMGenerator.for(options) @@ -103,7 +103,7 @@ module Generators # Invoke the windows help compiler to compiler the project def compile_project - system("\"#{HHC_PATH}\" #@project_name") + system(HHC_PATH, @project_name) end end diff --git a/lib/rdoc/ri/ri_display.rb b/lib/rdoc/ri/ri_display.rb index 8533aba822..500632ae05 100644 --- a/lib/rdoc/ri/ri_display.rb +++ b/lib/rdoc/ri/ri_display.rb @@ -196,10 +196,17 @@ class DefaultDisplay def setup_pager unless @options.use_stdout - require 'tempfile' - - @save_stdout = STDOUT.clone - STDOUT.reopen(Tempfile.new("ri_")) + for pager in [ ENV['PAGER'], "less", "more", 'pager' ].compact.uniq + begin + pager = IO.popen(pager, "w") + rescue + else + @save_stdout = STDOUT.clone + STDOUT.reopen(pager) + return + end + end + @options.use_stdout = true end end @@ -207,20 +214,8 @@ class DefaultDisplay def page_output unless @options.use_stdout - path = STDOUT.path STDOUT.reopen(@save_stdout) @save_stdout = nil - paged = false - for pager in [ ENV['PAGER'], "less", "more <", 'pager' ].compact.uniq - if system("#{pager} #{path}") - paged = true - break - end - end - if !paged - @options.use_stdout = true - puts File.read(path) - end end end |