Merge pull request #724 from MikeMcQuaid/assume-ruby-two

Assume Ruby 2

1 files changed, 3 insertions, 9 deletions

diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb
index db3534542..68474c976 100644
--- a/Library/Homebrew/utils/curl.rb
+++ b/Library/Homebrew/utils/curl.rb
@@ -21,14 +21,8 @@ end
 
 def curl_output(*args)
   curl_args = curl_args(args)
-  curl_args -= ["--fail"]
-  if RUBY_TWO
-    curl_args -= ["--silent"]
-    Open3.popen3(*curl_args) do |_, stdout, stderr, wait_thread|
-      [stdout.read, stderr.read, wait_thread.value]
-    end
-  else
-    output = Utils.popen_read_text(*curl_args)
-    [output, nil, $?]
+  curl_args -= ["--fail", "--silent"]
+  Open3.popen3(*curl_args) do |_, stdout, stderr, wait_thread|
+    [stdout.read, stderr.read, wait_thread.value]
   end
 end