From 65de0eb647085d68b0e5d1f9be94bdbfc47fc41a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 27 Jul 2020 10:39:12 +0100 Subject: [PATCH] cmd/lib/capture: fix RuboCop style. See https://github.com/Homebrew/brew/pull/7867. --- cmd/lib/capture.rb | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/cmd/lib/capture.rb b/cmd/lib/capture.rb index b93204ad18f..fb80b96ba17 100644 --- a/cmd/lib/capture.rb +++ b/cmd/lib/capture.rb @@ -9,28 +9,24 @@ def capture $stderr.reopen(w) thread = Thread.new do - begin - yield - ensure - w.close - end + yield + ensure + w.close end thread.abort_on_exception = true output = "" loop do - begin - selected = IO.select([r], [], [], 1) + selected = IO.select([r], [], [], 1) - if reader = selected&.dig(0, 0) - output << (reader.readline_nonblock || "") - else - break if w.closed? - end - rescue IO::WaitReadable - retry + if (reader = selected&.dig(0, 0)) + output << (reader.readline_nonblock || "") + elsif w.closed? + break end + rescue IO::WaitReadable + retry end result = thread.value