From cd5852a0b1805032df5e2297af98bad76084cf11 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Wed, 1 Mar 2023 15:23:19 -0600 Subject: [PATCH 1/3] Switch to open3 gem As of 0.1.2 it incorporates JRuby's changes. Part of #6682. --- .gitignore | 1 + lib/pom.rb | 2 +- lib/pom.xml | 16 + lib/ruby/stdlib/open3.rb | 762 --------------------------------------- 4 files changed, 18 insertions(+), 763 deletions(-) delete mode 100644 lib/ruby/stdlib/open3.rb diff --git a/.gitignore b/.gitignore index 49c88f6cb76..5100bb3f485 100644 --- a/.gitignore +++ b/.gitignore @@ -95,6 +95,7 @@ lib/ruby/stdlib/mutex_m.rb lib/ruby/stdlib/net/protocol* lib/ruby/stdlib/net/http* lib/ruby/stdlib/observer* +lib/ruby/stdlib/open3* lib/ruby/stdlib/open-uri* lib/ruby/stdlib/optparse* lib/ruby/stdlib/optionparser* diff --git a/lib/pom.rb b/lib/pom.rb index 4ff969a698d..6d47f243987 100644 --- a/lib/pom.rb +++ b/lib/pom.rb @@ -64,7 +64,7 @@ def log(message=nil) # Partial implementation in JRuby, unsure whether this is important # ['nkf', '0.1.1'], ['observer', '0.1.1'], - # ['open3', '0.1.1'], + ['open3', '0.1.2'], # https://github.com/ruby/openssl/issues/20#issuecomment-1022872855 # ['openssl', '3.0.0'], # Depends on stringio gem, https://github.com/ruby/stringio/pull/21 diff --git a/lib/pom.xml b/lib/pom.xml index 63786be9458..6bad291b416 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -460,6 +460,19 @@ DO NOT MODIFY - GENERATED CODE + + rubygems + open3 + 0.1.2 + gem + provided + + + rubygems + jar-dependencies + + + rubygems open-uri @@ -1060,6 +1073,7 @@ DO NOT MODIFY - GENERATED CODE specifications/net-http-0.2.2* specifications/net-protocol-0.1.1* specifications/observer-0.1.1* + specifications/open3-0.1.2* specifications/open-uri-0.1.0* specifications/optparse-0.2.0* specifications/ostruct-0.5.5* @@ -1135,6 +1149,7 @@ DO NOT MODIFY - GENERATED CODE gems/net-http-0.2.2*/**/* gems/net-protocol-0.1.1*/**/* gems/observer-0.1.1*/**/* + gems/open3-0.1.2*/**/* gems/open-uri-0.1.0*/**/* gems/optparse-0.2.0*/**/* gems/ostruct-0.5.5*/**/* @@ -1210,6 +1225,7 @@ DO NOT MODIFY - GENERATED CODE cache/net-http-0.2.2* cache/net-protocol-0.1.1* cache/observer-0.1.1* + cache/open3-0.1.2* cache/open-uri-0.1.0* cache/optparse-0.2.0* cache/ostruct-0.5.5* diff --git a/lib/ruby/stdlib/open3.rb b/lib/ruby/stdlib/open3.rb deleted file mode 100644 index 58686991df3..00000000000 --- a/lib/ruby/stdlib/open3.rb +++ /dev/null @@ -1,762 +0,0 @@ -# frozen_string_literal: true - -# -# = open3.rb: Popen, but with stderr, too -# -# Author:: Yukihiro Matsumoto -# Documentation:: Konrad Meyer -# -# Open3 gives you access to stdin, stdout, and stderr when running other -# programs. -# - -# -# Open3 grants you access to stdin, stdout, stderr and a thread to wait for the -# child process when running another program. -# You can specify various attributes, redirections, current directory, etc., of -# the program in the same way as for Process.spawn. -# -# - Open3.popen3 : pipes for stdin, stdout, stderr -# - Open3.popen2 : pipes for stdin, stdout -# - Open3.popen2e : pipes for stdin, merged stdout and stderr -# - Open3.capture3 : give a string for stdin; get strings for stdout, stderr -# - Open3.capture2 : give a string for stdin; get a string for stdout -# - Open3.capture2e : give a string for stdin; get a string for merged stdout and stderr -# - Open3.pipeline_rw : pipes for first stdin and last stdout of a pipeline -# - Open3.pipeline_r : pipe for last stdout of a pipeline -# - Open3.pipeline_w : pipe for first stdin of a pipeline -# - Open3.pipeline_start : run a pipeline without waiting -# - Open3.pipeline : run a pipeline and wait for its completion -# - -module Open3 - - # Open stdin, stdout, and stderr streams and start external executable. - # In addition, a thread to wait for the started process is created. - # The thread has a pid method and a thread variable :pid which is the pid of - # the started process. - # - # Block form: - # - # Open3.popen3([env,] cmd... [, opts]) {|stdin, stdout, stderr, wait_thr| - # pid = wait_thr.pid # pid of the started process. - # ... - # exit_status = wait_thr.value # Process::Status object returned. - # } - # - # Non-block form: - # - # stdin, stdout, stderr, wait_thr = Open3.popen3([env,] cmd... [, opts]) - # pid = wait_thr[:pid] # pid of the started process - # ... - # stdin.close # stdin, stdout and stderr should be closed explicitly in this form. - # stdout.close - # stderr.close - # exit_status = wait_thr.value # Process::Status object returned. - # - # The parameters env, cmd, and opts are passed to Process.spawn. - # A commandline string and a list of argument strings can be accepted as follows: - # - # Open3.popen3("echo abc") {|i, o, e, t| ... } - # Open3.popen3("echo", "abc") {|i, o, e, t| ... } - # Open3.popen3(["echo", "argv0"], "abc") {|i, o, e, t| ... } - # - # If the last parameter, opts, is a Hash, it is recognized as an option for Process.spawn. - # - # Open3.popen3("pwd", :chdir=>"/") {|i,o,e,t| - # p o.read.chomp #=> "/" - # } - # - # wait_thr.value waits for the termination of the process. - # The block form also waits for the process when it returns. - # - # Closing stdin, stdout and stderr does not wait for the process to complete. - # - # You should be careful to avoid deadlocks. - # Since pipes are fixed length buffers, - # Open3.popen3("prog") {|i, o, e, t| o.read } deadlocks if - # the program generates too much output on stderr. - # You should read stdout and stderr simultaneously (using threads or IO.select). - # However, if you don't need stderr output, you can use Open3.popen2. - # If merged stdout and stderr output is not a problem, you can use Open3.popen2e. - # If you really need stdout and stderr output as separate strings, you can consider Open3.capture3. - # - def popen3(*cmd, &block) - if Hash === cmd.last - opts = cmd.pop.dup - else - opts = {} - end - - in_r, in_w = IO.pipe - opts[:in] = in_r - in_w.sync = true - - out_r, out_w = IO.pipe - opts[:out] = out_w - - err_r, err_w = IO.pipe - opts[:err] = err_w - - popen_run(cmd, opts, [in_r, out_w, err_w], [in_w, out_r, err_r], &block) - end - module_function :popen3 - - # Open3.popen2 is similar to Open3.popen3 except that it doesn't create a pipe for - # the standard error stream. - # - # Block form: - # - # Open3.popen2([env,] cmd... [, opts]) {|stdin, stdout, wait_thr| - # pid = wait_thr.pid # pid of the started process. - # ... - # exit_status = wait_thr.value # Process::Status object returned. - # } - # - # Non-block form: - # - # stdin, stdout, wait_thr = Open3.popen2([env,] cmd... [, opts]) - # ... - # stdin.close # stdin and stdout should be closed explicitly in this form. - # stdout.close - # - # See Process.spawn for the optional hash arguments _env_ and _opts_. - # - # Example: - # - # Open3.popen2("wc -c") {|i,o,t| - # i.print "answer to life the universe and everything" - # i.close - # p o.gets #=> "42\n" - # } - # - # Open3.popen2("bc -q") {|i,o,t| - # i.puts "obase=13" - # i.puts "6 * 9" - # p o.gets #=> "42\n" - # } - # - # Open3.popen2("dc") {|i,o,t| - # i.print "42P" - # i.close - # p o.read #=> "*" - # } - # - def popen2(*cmd, &block) - if Hash === cmd.last - opts = cmd.pop.dup - else - opts = {} - end - - in_r, in_w = IO.pipe - opts[:in] = in_r - in_w.sync = true - - out_r, out_w = IO.pipe - opts[:out] = out_w - - popen_run(cmd, opts, [in_r, out_w], [in_w, out_r], &block) - end - module_function :popen2 - - # Open3.popen2e is similar to Open3.popen3 except that it merges - # the standard output stream and the standard error stream. - # - # Block form: - # - # Open3.popen2e([env,] cmd... [, opts]) {|stdin, stdout_and_stderr, wait_thr| - # pid = wait_thr.pid # pid of the started process. - # ... - # exit_status = wait_thr.value # Process::Status object returned. - # } - # - # Non-block form: - # - # stdin, stdout_and_stderr, wait_thr = Open3.popen2e([env,] cmd... [, opts]) - # ... - # stdin.close # stdin and stdout_and_stderr should be closed explicitly in this form. - # stdout_and_stderr.close - # - # See Process.spawn for the optional hash arguments _env_ and _opts_. - # - # Example: - # # check gcc warnings - # source = "foo.c" - # Open3.popen2e("gcc", "-Wall", source) {|i,oe,t| - # oe.each {|line| - # if /warning/ =~ line - # ... - # end - # } - # } - # - def popen2e(*cmd, &block) - if Hash === cmd.last - opts = cmd.pop.dup - else - opts = {} - end - - in_r, in_w = IO.pipe - opts[:in] = in_r - in_w.sync = true - - out_r, out_w = IO.pipe - opts[[:out, :err]] = out_w - - popen_run(cmd, opts, [in_r, out_w], [in_w, out_r], &block) - ensure - if block - in_r.close - in_w.close - out_r.close - out_w.close - end - end - module_function :popen2e - - def popen_run(cmd, opts, child_io, parent_io) # :nodoc: - pid = spawn(*cmd, opts) - wait_thr = Process.detach(pid) - child_io.each(&:close) - result = [*parent_io, wait_thr] - if defined? yield - begin - return yield(*result) - ensure - parent_io.each(&:close) - wait_thr.join - end - end - result - end - module_function :popen_run - class << self - private :popen_run - end - - # Open3.capture3 captures the standard output and the standard error of a command. - # - # stdout_str, stderr_str, status = Open3.capture3([env,] cmd... [, opts]) - # - # The arguments env, cmd and opts are passed to Open3.popen3 except - # opts[:stdin_data] and opts[:binmode]. See Process.spawn. - # - # If opts[:stdin_data] is specified, it is sent to the command's standard input. - # - # If opts[:binmode] is true, internal pipes are set to binary mode. - # - # Examples: - # - # # dot is a command of graphviz. - # graph = <<'End' - # digraph g { - # a -> b - # } - # End - # drawn_graph, dot_log = Open3.capture3("dot -v", :stdin_data=>graph) - # - # o, e, s = Open3.capture3("echo abc; sort >&2", :stdin_data=>"foo\nbar\nbaz\n") - # p o #=> "abc\n" - # p e #=> "bar\nbaz\nfoo\n" - # p s #=> # - # - # # generate a thumbnail image using the convert command of ImageMagick. - # # However, if the image is really stored in a file, - # # system("convert", "-thumbnail", "80", "png:#{filename}", "png:-") is better - # # because of reduced memory consumption. - # # But if the image is stored in a DB or generated by the gnuplot Open3.capture2 example, - # # Open3.capture3 should be considered. - # # - # image = File.read("/usr/share/openclipart/png/animals/mammals/sheep-md-v0.1.png", :binmode=>true) - # thumbnail, err, s = Open3.capture3("convert -thumbnail 80 png:- png:-", :stdin_data=>image, :binmode=>true) - # if s.success? - # STDOUT.binmode; print thumbnail - # end - # - def capture3(*cmd) - if Hash === cmd.last - opts = cmd.pop.dup - else - opts = {} - end - - stdin_data = opts.delete(:stdin_data) || '' - binmode = opts.delete(:binmode) - - popen3(*cmd, opts) {|i, o, e, t| - if binmode - i.binmode - o.binmode - e.binmode - end - out_reader = Thread.new { o.read } - err_reader = Thread.new { e.read } - begin - if stdin_data.respond_to? :readpartial - IO.copy_stream(stdin_data, i) - else - i.write stdin_data - end - rescue Errno::EPIPE - end - i.close - [out_reader.value, err_reader.value, t.value] - } - end - module_function :capture3 - - # Open3.capture2 captures the standard output of a command. - # - # stdout_str, status = Open3.capture2([env,] cmd... [, opts]) - # - # The arguments env, cmd and opts are passed to Open3.popen3 except - # opts[:stdin_data] and opts[:binmode]. See Process.spawn. - # - # If opts[:stdin_data] is specified, it is sent to the command's standard input. - # - # If opts[:binmode] is true, internal pipes are set to binary mode. - # - # Example: - # - # # factor is a command for integer factorization. - # o, s = Open3.capture2("factor", :stdin_data=>"42") - # p o #=> "42: 2 3 7\n" - # - # # generate x**2 graph in png using gnuplot. - # gnuplot_commands = <<"End" - # set terminal png - # plot x**2, "-" with lines - # 1 14 - # 2 1 - # 3 8 - # 4 5 - # e - # End - # image, s = Open3.capture2("gnuplot", :stdin_data=>gnuplot_commands, :binmode=>true) - # - def capture2(*cmd) - if Hash === cmd.last - opts = cmd.pop.dup - else - opts = {} - end - - stdin_data = opts.delete(:stdin_data) - binmode = opts.delete(:binmode) - - popen2(*cmd, opts) {|i, o, t| - if binmode - i.binmode - o.binmode - end - out_reader = Thread.new { o.read } - if stdin_data - begin - if stdin_data.respond_to? :readpartial - IO.copy_stream(stdin_data, i) - else - i.write stdin_data - end - rescue Errno::EPIPE - end - end - i.close - [out_reader.value, t.value] - } - end - module_function :capture2 - - # Open3.capture2e captures the standard output and the standard error of a command. - # - # stdout_and_stderr_str, status = Open3.capture2e([env,] cmd... [, opts]) - # - # The arguments env, cmd and opts are passed to Open3.popen3 except - # opts[:stdin_data] and opts[:binmode]. See Process.spawn. - # - # If opts[:stdin_data] is specified, it is sent to the command's standard input. - # - # If opts[:binmode] is true, internal pipes are set to binary mode. - # - # Example: - # - # # capture make log - # make_log, s = Open3.capture2e("make") - # - def capture2e(*cmd) - if Hash === cmd.last - opts = cmd.pop.dup - else - opts = {} - end - - stdin_data = opts.delete(:stdin_data) - binmode = opts.delete(:binmode) - - popen2e(*cmd, opts) {|i, oe, t| - if binmode - i.binmode - oe.binmode - end - outerr_reader = Thread.new { oe.read } - if stdin_data - begin - if stdin_data.respond_to? :readpartial - IO.copy_stream(stdin_data, i) - else - i.write stdin_data - end - rescue Errno::EPIPE - end - end - i.close - [outerr_reader.value, t.value] - } - end - module_function :capture2e - - # Open3.pipeline_rw starts a list of commands as a pipeline with pipes - # which connect to stdin of the first command and stdout of the last command. - # - # Open3.pipeline_rw(cmd1, cmd2, ... [, opts]) {|first_stdin, last_stdout, wait_threads| - # ... - # } - # - # first_stdin, last_stdout, wait_threads = Open3.pipeline_rw(cmd1, cmd2, ... [, opts]) - # ... - # first_stdin.close - # last_stdout.close - # - # Each cmd is a string or an array. - # If it is an array, the elements are passed to Process.spawn. - # - # cmd: - # commandline command line string which is passed to a shell - # [env, commandline, opts] command line string which is passed to a shell - # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell) - # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell) - # - # Note that env and opts are optional, as for Process.spawn. - # - # The options to pass to Process.spawn are constructed by merging - # +opts+, the last hash element of the array, and - # specifications for the pipes between each of the commands. - # - # Example: - # - # Open3.pipeline_rw("tr -dc A-Za-z", "wc -c") {|i, o, ts| - # i.puts "All persons more than a mile high to leave the court." - # i.close - # p o.gets #=> "42\n" - # } - # - # Open3.pipeline_rw("sort", "cat -n") {|stdin, stdout, wait_thrs| - # stdin.puts "foo" - # stdin.puts "bar" - # stdin.puts "baz" - # stdin.close # send EOF to sort. - # p stdout.read #=> " 1\tbar\n 2\tbaz\n 3\tfoo\n" - # } - def pipeline_rw(*cmds, &block) - if Hash === cmds.last - opts = cmds.pop.dup - else - opts = {} - end - - in_r, in_w = IO.pipe - opts[:in] = in_r - in_w.sync = true - - out_r, out_w = IO.pipe - opts[:out] = out_w - - pipeline_run(cmds, opts, [in_r, out_w], [in_w, out_r], &block) - end - module_function :pipeline_rw - - # Open3.pipeline_r starts a list of commands as a pipeline with a pipe - # which connects to stdout of the last command. - # - # Open3.pipeline_r(cmd1, cmd2, ... [, opts]) {|last_stdout, wait_threads| - # ... - # } - # - # last_stdout, wait_threads = Open3.pipeline_r(cmd1, cmd2, ... [, opts]) - # ... - # last_stdout.close - # - # Each cmd is a string or an array. - # If it is an array, the elements are passed to Process.spawn. - # - # cmd: - # commandline command line string which is passed to a shell - # [env, commandline, opts] command line string which is passed to a shell - # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell) - # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell) - # - # Note that env and opts are optional, as for Process.spawn. - # - # Example: - # - # Open3.pipeline_r("zcat /var/log/apache2/access.log.*.gz", - # [{"LANG"=>"C"}, "grep", "GET /favicon.ico"], - # "logresolve") {|o, ts| - # o.each_line {|line| - # ... - # } - # } - # - # Open3.pipeline_r("yes", "head -10") {|o, ts| - # p o.read #=> "y\ny\ny\ny\ny\ny\ny\ny\ny\ny\n" - # p ts[0].value #=> # - # p ts[1].value #=> # - # } - # - def pipeline_r(*cmds, &block) - if Hash === cmds.last - opts = cmds.pop.dup - else - opts = {} - end - - out_r, out_w = IO.pipe - opts[:out] = out_w - - pipeline_run(cmds, opts, [out_w], [out_r], &block) - end - module_function :pipeline_r - - # Open3.pipeline_w starts a list of commands as a pipeline with a pipe - # which connects to stdin of the first command. - # - # Open3.pipeline_w(cmd1, cmd2, ... [, opts]) {|first_stdin, wait_threads| - # ... - # } - # - # first_stdin, wait_threads = Open3.pipeline_w(cmd1, cmd2, ... [, opts]) - # ... - # first_stdin.close - # - # Each cmd is a string or an array. - # If it is an array, the elements are passed to Process.spawn. - # - # cmd: - # commandline command line string which is passed to a shell - # [env, commandline, opts] command line string which is passed to a shell - # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell) - # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell) - # - # Note that env and opts are optional, as for Process.spawn. - # - # Example: - # - # Open3.pipeline_w("bzip2 -c", :out=>"/tmp/hello.bz2") {|i, ts| - # i.puts "hello" - # } - # - def pipeline_w(*cmds, &block) - if Hash === cmds.last - opts = cmds.pop.dup - else - opts = {} - end - - in_r, in_w = IO.pipe - opts[:in] = in_r - in_w.sync = true - - pipeline_run(cmds, opts, [in_r], [in_w], &block) - end - module_function :pipeline_w - - # Open3.pipeline_start starts a list of commands as a pipeline. - # No pipes are created for stdin of the first command and - # stdout of the last command. - # - # Open3.pipeline_start(cmd1, cmd2, ... [, opts]) {|wait_threads| - # ... - # } - # - # wait_threads = Open3.pipeline_start(cmd1, cmd2, ... [, opts]) - # ... - # - # Each cmd is a string or an array. - # If it is an array, the elements are passed to Process.spawn. - # - # cmd: - # commandline command line string which is passed to a shell - # [env, commandline, opts] command line string which is passed to a shell - # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell) - # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell) - # - # Note that env and opts are optional, as for Process.spawn. - # - # Example: - # - # # Run xeyes in 10 seconds. - # Open3.pipeline_start("xeyes") {|ts| - # sleep 10 - # t = ts[0] - # Process.kill("TERM", t.pid) - # p t.value #=> # - # } - # - # # Convert pdf to ps and send it to a printer. - # # Collect error message of pdftops and lpr. - # pdf_file = "paper.pdf" - # printer = "printer-name" - # err_r, err_w = IO.pipe - # Open3.pipeline_start(["pdftops", pdf_file, "-"], - # ["lpr", "-P#{printer}"], - # :err=>err_w) {|ts| - # err_w.close - # p err_r.read # error messages of pdftops and lpr. - # } - # - def pipeline_start(*cmds, &block) - if Hash === cmds.last - opts = cmds.pop.dup - else - opts = {} - end - - if block - pipeline_run(cmds, opts, [], [], &block) - else - ts, = pipeline_run(cmds, opts, [], []) - ts - end - end - module_function :pipeline_start - - # Open3.pipeline starts a list of commands as a pipeline. - # It waits for the completion of the commands. - # No pipes are created for stdin of the first command and - # stdout of the last command. - # - # status_list = Open3.pipeline(cmd1, cmd2, ... [, opts]) - # - # Each cmd is a string or an array. - # If it is an array, the elements are passed to Process.spawn. - # - # cmd: - # commandline command line string which is passed to a shell - # [env, commandline, opts] command line string which is passed to a shell - # [env, cmdname, arg1, ..., opts] command name and one or more arguments (no shell) - # [env, [cmdname, argv0], arg1, ..., opts] command name and arguments including argv[0] (no shell) - # - # Note that env and opts are optional, as Process.spawn. - # - # Example: - # - # fname = "/usr/share/man/man1/ruby.1.gz" - # p Open3.pipeline(["zcat", fname], "nroff -man", "less") - # #=> [#, - # # #, - # # #] - # - # fname = "/usr/share/man/man1/ls.1.gz" - # Open3.pipeline(["zcat", fname], "nroff -man", "colcrt") - # - # # convert PDF to PS and send to a printer by lpr - # pdf_file = "paper.pdf" - # printer = "printer-name" - # Open3.pipeline(["pdftops", pdf_file, "-"], - # ["lpr", "-P#{printer}"]) - # - # # count lines - # Open3.pipeline("sort", "uniq -c", :in=>"names.txt", :out=>"count") - # - # # cyclic pipeline - # r,w = IO.pipe - # w.print "ibase=14\n10\n" - # Open3.pipeline("bc", "tee /dev/tty", :in=>r, :out=>w) - # #=> 14 - # # 18 - # # 22 - # # 30 - # # 42 - # # 58 - # # 78 - # # 106 - # # 202 - # - def pipeline(*cmds) - if Hash === cmds.last - opts = cmds.pop.dup - else - opts = {} - end - - pipeline_run(cmds, opts, [], []) {|ts| - ts.map(&:value) - } - end - module_function :pipeline - - def pipeline_run(cmds, pipeline_opts, child_io, parent_io) # :nodoc: - if cmds.empty? - raise ArgumentError, "no commands" - end - - opts_base = pipeline_opts.dup - opts_base.delete :in - opts_base.delete :out - - wait_thrs = [] - r = nil - cmds.each_with_index {|cmd, i| - cmd_opts = opts_base.dup - if String === cmd - cmd = [cmd] - else - cmd_opts.update cmd.pop if Hash === cmd.last - end - if i == 0 - if !cmd_opts.include?(:in) - if pipeline_opts.include?(:in) - cmd_opts[:in] = pipeline_opts[:in] - end - end - else - cmd_opts[:in] = r - end - if i != cmds.length - 1 - r2, w2 = IO.pipe - cmd_opts[:out] = w2 - else - if !cmd_opts.include?(:out) - if pipeline_opts.include?(:out) - cmd_opts[:out] = pipeline_opts[:out] - end - end - end - pid = spawn(*cmd, cmd_opts) - wait_thrs << Process.detach(pid) - r&.close - w2&.close - r = r2 - } - result = parent_io + [wait_thrs] - child_io.each(&:close) - if defined? yield - begin - return yield(*result) - ensure - parent_io.each(&:close) - wait_thrs.each(&:join) - end - end - result - end - module_function :pipeline_run - class << self - private :pipeline_run - end - -end - -# Because native spawn does not yet work on Windows, we fall back on ProcessBuilder there. -require 'jruby/open3_windows' if JRuby::Util::ON_WINDOWS From 8a0a139abc2818a7a0cc179be6be3ed6c5c6018e Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Wed, 1 Mar 2023 15:24:00 -0600 Subject: [PATCH 2/3] Update io-wait, stringio, strscan --- lib/pom.rb | 6 +++--- lib/pom.xml | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/pom.rb b/lib/pom.rb index 6d47f243987..a0065c306be 100644 --- a/lib/pom.rb +++ b/lib/pom.rb @@ -50,7 +50,7 @@ def log(message=nil) ['io-console', '0.5.11'], # https://github.com/ruby/io-nonblock/issues/4 # ['io-nonblock', '0.1.0'], - ['io-wait', '0.2.3'], + ['io-wait', '0.3.0'], ['ipaddr', '1.2.4'], ['irb', '1.4.2'], ['jar-dependencies', '0.4.1'], @@ -96,8 +96,8 @@ def log(message=nil) # ['set', '1.0.2'], ['shellwords', '0.1.0'], ['singleton', '0.1.1'], - ['stringio', '3.0.4'], - ['strscan', '3.0.4'], + ['stringio', '3.0.5'], + ['strscan', '3.0.6'], ['subspawn', '0.1.1'], # has 3 transitive deps: ['subspawn-posix', '0.1.1'], ['ffi-binary-libfixposix', '0.5.1.0'], diff --git a/lib/pom.xml b/lib/pom.xml index 6bad291b416..025d61be62c 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -307,7 +307,7 @@ DO NOT MODIFY - GENERATED CODE rubygems io-wait - 0.2.3 + 0.3.0 gem provided @@ -697,7 +697,7 @@ DO NOT MODIFY - GENERATED CODE rubygems stringio - 3.0.4 + 3.0.5 gem provided @@ -710,7 +710,7 @@ DO NOT MODIFY - GENERATED CODE rubygems strscan - 3.0.4 + 3.0.6 gem provided @@ -1061,7 +1061,7 @@ DO NOT MODIFY - GENERATED CODE specifications/forwardable-1.3.2* specifications/getoptlong-0.1.1* specifications/io-console-0.5.11* - specifications/io-wait-0.2.3* + specifications/io-wait-0.3.0* specifications/ipaddr-1.2.4* specifications/irb-1.4.2* specifications/jar-dependencies-0.4.1* @@ -1091,8 +1091,8 @@ DO NOT MODIFY - GENERATED CODE specifications/securerandom-0.2.0* specifications/shellwords-0.1.0* specifications/singleton-0.1.1* - specifications/stringio-3.0.4* - specifications/strscan-3.0.4* + specifications/stringio-3.0.5* + specifications/strscan-3.0.6* specifications/subspawn-0.1.1* specifications/subspawn-posix-0.1.1* specifications/ffi-binary-libfixposix-0.5.1.0* @@ -1137,7 +1137,7 @@ DO NOT MODIFY - GENERATED CODE gems/forwardable-1.3.2*/**/* gems/getoptlong-0.1.1*/**/* gems/io-console-0.5.11*/**/* - gems/io-wait-0.2.3*/**/* + gems/io-wait-0.3.0*/**/* gems/ipaddr-1.2.4*/**/* gems/irb-1.4.2*/**/* gems/jar-dependencies-0.4.1*/**/* @@ -1167,8 +1167,8 @@ DO NOT MODIFY - GENERATED CODE gems/securerandom-0.2.0*/**/* gems/shellwords-0.1.0*/**/* gems/singleton-0.1.1*/**/* - gems/stringio-3.0.4*/**/* - gems/strscan-3.0.4*/**/* + gems/stringio-3.0.5*/**/* + gems/strscan-3.0.6*/**/* gems/subspawn-0.1.1*/**/* gems/subspawn-posix-0.1.1*/**/* gems/ffi-binary-libfixposix-0.5.1.0*/**/* @@ -1213,7 +1213,7 @@ DO NOT MODIFY - GENERATED CODE cache/forwardable-1.3.2* cache/getoptlong-0.1.1* cache/io-console-0.5.11* - cache/io-wait-0.2.3* + cache/io-wait-0.3.0* cache/ipaddr-1.2.4* cache/irb-1.4.2* cache/jar-dependencies-0.4.1* @@ -1243,8 +1243,8 @@ DO NOT MODIFY - GENERATED CODE cache/securerandom-0.2.0* cache/shellwords-0.1.0* cache/singleton-0.1.1* - cache/stringio-3.0.4* - cache/strscan-3.0.4* + cache/stringio-3.0.5* + cache/strscan-3.0.6* cache/subspawn-0.1.1* cache/subspawn-posix-0.1.1* cache/ffi-binary-libfixposix-0.5.1.0* From 0f6c0a7a0336349f6d339befb48ef78ef7f85945 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Wed, 1 Mar 2023 15:41:00 -0600 Subject: [PATCH 3/3] Update open-uri to 0.3.0 and clean up comments --- lib/pom.rb | 5 +---- lib/pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/pom.rb b/lib/pom.rb index a0065c306be..66b66af08dc 100644 --- a/lib/pom.rb +++ b/lib/pom.rb @@ -67,9 +67,7 @@ def log(message=nil) ['open3', '0.1.2'], # https://github.com/ruby/openssl/issues/20#issuecomment-1022872855 # ['openssl', '3.0.0'], - # Depends on stringio gem, https://github.com/ruby/stringio/pull/21 - # ['open-uri', '0.2.0'], - ['open-uri', '0.1.0'], + ['open-uri', '0.3.0'], ['optparse', '0.2.0'], ['ostruct', '0.5.5'], # https://github.com/ruby/pathname/issues/17 @@ -109,7 +107,6 @@ def log(message=nil) # Depends on date gem # ['time', '0.2.0'], ['time', '0.1.0'], - # https://github.com/ruby/timeout/issues/11 ['timeout', '0.3.0'], # https://github.com/ruby/tmpdir/issues/13 # ['tmpdir', '0.1.2'], diff --git a/lib/pom.xml b/lib/pom.xml index 025d61be62c..12276ee937b 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -476,7 +476,7 @@ DO NOT MODIFY - GENERATED CODE rubygems open-uri - 0.1.0 + 0.3.0 gem provided @@ -1074,7 +1074,7 @@ DO NOT MODIFY - GENERATED CODE specifications/net-protocol-0.1.1* specifications/observer-0.1.1* specifications/open3-0.1.2* - specifications/open-uri-0.1.0* + specifications/open-uri-0.3.0* specifications/optparse-0.2.0* specifications/ostruct-0.5.5* specifications/pp-0.3.0* @@ -1150,7 +1150,7 @@ DO NOT MODIFY - GENERATED CODE gems/net-protocol-0.1.1*/**/* gems/observer-0.1.1*/**/* gems/open3-0.1.2*/**/* - gems/open-uri-0.1.0*/**/* + gems/open-uri-0.3.0*/**/* gems/optparse-0.2.0*/**/* gems/ostruct-0.5.5*/**/* gems/pp-0.3.0*/**/* @@ -1226,7 +1226,7 @@ DO NOT MODIFY - GENERATED CODE cache/net-protocol-0.1.1* cache/observer-0.1.1* cache/open3-0.1.2* - cache/open-uri-0.1.0* + cache/open-uri-0.3.0* cache/optparse-0.2.0* cache/ostruct-0.5.5* cache/pp-0.3.0*