Test using Open3.popen2 instead of IO.popen

jcouball · jcouball · commit 106d8e8891e5 · 2023-12-26T18:01:00.000-08:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -69,11 +69,26 @@ def self.root_of_worktree(working_dir)
       status = nil
 
       git_cmd = "#{Git::Base.config.binary_path} -c core.quotePath=true -c color.ui=false rev-parse --show-toplevel 2>&1"
-      IO.popen(git_cmd, :chdir => working_dir) do |io|
-        status = Process.wait2(io.pid).last
-        result = io.read.chomp
+
+      # Option 1 using IO.popen
+      #
+      # IO.popen(git_cmd, :chdir => working_dir) do |io|
+      #   status = Process.wait2(io.pid).last
+      #   result = io.read.chomp
+      # end
+
+      # Option 2 using Open3.popen2
+      #
+      Open3.popen2(git_cmd, chdir: working_dir) do |stdin, stdout, wait_thr|
+        status = wait_thr.value
+        result = stdout.read.chomp
       end
 
+      # Option 3 using Open3.capture3
+      #
+      # stdout_s, stderr_s, status = Open3.capture3(custom_git_env_variables, git_cmd, opts)
+      # result = status_s
+
       raise ArgumentError, "'#{working_dir}' is not in a git working tree" unless status.success?
       result
     end
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -1255,7 +1255,20 @@ def run_command(git_cmd, chdir=nil, &block)
       opts = {}
       opts[:chdir] = File.expand_path(chdir) if chdir
 
-      [IO.popen(custom_git_env_variables, git_cmd, opts, &block), $?]
+      # Option 1 using IO.popen
+      #
+      # [IO.popen(custom_git_env_variables, git_cmd, opts, &block), $?]
+
+      # Option 2 using Open3.popen2
+      #
+      Open3.popen2(custom_git_env_variables, git_cmd, opts) do |stdin, stdout, wait_thr|
+        [block.call(stdout), wait_thr.value]
+      end
+
+      # Option 3 using Open3.capture3
+      #
+      # stdout_s, stderr_s, status = Open3.capture3(custom_git_env_variables, git_cmd, opts)
+      # [block.call(StringIO.new(stdout_s)), status]
     end
 
     def escape(s)
