aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-02 07:30:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-03-02 07:30:35 +0000
commit5aad8206044f98b28bc303d5bd7d3e4f935e96ec (patch)
tree4873263f227dc109031fcfcc1db0a54cbf298c57 /lib
parent95ce90a87ed0a058386eea410aeac0aac2ee2dc8 (diff)
downloadruby-5aad8206044f98b28bc303d5bd7d3e4f935e96ec.tar.gz
* io.c (pipe_open): erred program name should be reported by
exceptions, instead of the first argument. * process.c (rb_spawn): ditto. * process.c (proc_spawn_v): use first argument as program name. * win32/win32.c (rb_w32_aspawn): ditto. * win32/win32.c (CreateChild): search executable file if no program name given. * lib/drb/extservm.rb (invoke_service_command): use Process.spawn. [ruby-dev:23103] * lib/rdoc/ri/ri_display.rb (setup_pager): use IO.popen. [ruby-dev:23086], [ruby-dev:23103] * lib/rdoc/diagram.rb (convert_to_png): ditto. * lib/rdoc/generators/chm_generator.rb (compile_project): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/drb/extservm.rb6
-rw-r--r--lib/rdoc/diagram.rb2
-rw-r--r--lib/rdoc/generators/chm_generator.rb4
-rw-r--r--lib/rdoc/ri/ri_display.rb27
4 files changed, 15 insertions, 24 deletions
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index 50009dbae2..6367fe5e1c 100644
--- a/lib/drb/extservm.rb
+++ b/lib/drb/extservm.rb
@@ -84,11 +84,7 @@ module DRb
return if @servers.include?(name)
@servers[name] = false
end
- if RUBY_PLATFORM =~ /mswin32/
- system("cmd /c start /b #{command} #{DRb.uri} #{name}")
- else
- system("#{command} #{DRb.uri} #{name} &")
- end
+ Process.spawn("#{command} #{DRb.uri} #{name}")
end
end
end
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