From 486105e6d71c32b6278600e3402c64c7ea12c276 Mon Sep 17 00:00:00 2001 From: Aleksandrs Jemeljanovs Date: Tue, 16 Jan 2024 14:47:05 +0100 Subject: [PATCH] Update version parsing method reference --- lib/ferrum/browser/jruby_process.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/ferrum/browser/jruby_process.rb b/lib/ferrum/browser/jruby_process.rb index fe6b7780..3cfe6fb6 100644 --- a/lib/ferrum/browser/jruby_process.rb +++ b/lib/ferrum/browser/jruby_process.rb @@ -12,16 +12,11 @@ def start begin process_builder = java.lang.ProcessBuilder.new(*@command.to_a) # unless user directory is on a Windows UNC path - unless @user_data_dir =~ %r{\A//} - process_builder.directory(java.io.File.new(@user_data_dir)) - end + process_builder.directory(java.io.File.new(@user_data_dir)) unless @user_data_dir =~ %r{\A//} process_builder.redirectErrorStream(true) output_file = File.expand_path("chrome_output.log", @user_data_dir) process_builder.redirectOutput(java.lang.ProcessBuilder::Redirect.appendTo(java.io.File.new(output_file))) - # TODO: Handle new process group creation - # process_options[:pgroup] = true unless Ferrum::Utils::Platform.windows? - environment = process_builder.environment # Clear the environment to avoid setting e.g. RUBYOPT from the initial environment environment.clear @@ -36,19 +31,19 @@ def start @pid = @process.pid parse_ws_url(output_file, @process_timeout) - parse_browser_versions + parse_json_version(ws_url) end end private def parse_ws_url(output_file, timeout) - output = '' + output = "" start = Utils::ElapsedTime.monotonic_time max_time = start + timeout regexp = %r{DevTools listening on (ws://.*)} while Utils::ElapsedTime.monotonic_time < max_time - File.open(output_file, 'r+') do |file| + File.open(output_file, "r+") do |file| file.each_line { |line| output += line } file.rewind file.truncate(0)