mirror of
https://github.com/donl/homebrew-cask-versions.git
synced 2026-07-17 06:16:47 -06:00
27856b09f8
hdiutil can output DMG agreement information before the output plist xml, and our plist parser was choking on that text before the xml started. so now we scan to the beginning of an xml document before trying to parse the xml. also added much more explicit error handling around the plist parsing, to hopefully catch related and future plist-related errors. refs #914
66 lines
1.5 KiB
Ruby
66 lines
1.5 KiB
Ruby
class Cask::SystemCommand
|
|
def self.run(command, options={})
|
|
command = _process_options(command, options)
|
|
output = ''
|
|
IO.popen(command, 'r+') do |pipe|
|
|
if options[:input]
|
|
options[:input].each { |line| pipe.puts line }
|
|
end
|
|
pipe.close_write
|
|
while line = pipe.gets
|
|
output << line
|
|
ohai line.chomp if options[:print]
|
|
end
|
|
end
|
|
_assert_success($?, command, output) if options[:must_succeed]
|
|
if options[:plist]
|
|
_parse_plist(command, output)
|
|
else
|
|
output
|
|
end
|
|
end
|
|
|
|
def self.run!(command, options)
|
|
run(command, options.merge(:must_succeed => true))
|
|
end
|
|
|
|
def self._process_options(command, options)
|
|
if options[:sudo]
|
|
command = "sudo -E #{_quote(command)}"
|
|
end
|
|
if options[:args]
|
|
command = "#{command} #{options[:args].map { |arg| _quote(arg) }.join(' ')}"
|
|
end
|
|
case options[:stderr]
|
|
when :silence then
|
|
command = "#{command} 2>/dev/null"
|
|
when :merge, nil then
|
|
command = "#{command} 2>&1"
|
|
end
|
|
command
|
|
end
|
|
|
|
def self._assert_success(status, command, output)
|
|
unless status.success?
|
|
raise CaskCommandFailedError.new(command, output)
|
|
end
|
|
end
|
|
|
|
def self._quote(string)
|
|
%Q('#{string}')
|
|
end
|
|
|
|
def self._parse_plist(command, output)
|
|
begin
|
|
Plist::parse_xml(output)
|
|
rescue Plist::ParseError
|
|
raise CaskError.new(<<-ERRMSG)
|
|
Error parsing plist output from command.
|
|
command was:
|
|
#{command}
|
|
output we attempted to parse:
|
|
#{output}
|
|
ERRMSG
|
|
end
|
|
end
|
|
end
|