mirror of
https://github.com/donl/homebrew-cask-versions.git
synced 2026-07-17 14:26:45 -06:00
deb79403e5
- Raise `CaskError` instead of `Plist::ParseError` from module - Improve error message when parse result is empty - remove leading garbage text and emit it to stderr (seen in #5060) - remove trailing garbage text and emit it to stderr (seen in #4819) This has the incidental effect of emitting DMG licenses during installation, which seems desirable as permanent functionality. If not permanent, the warnings to STDERR should still be kept temporarily to help get better bug reports on `hdiutil`. A bug wrt DMG licenses must have been introduced in one of #4892, #4887, #4889, #4900, #4975, #4978, or #4857. Presumably, the cause is that STDERR was previously silenced when running `hdiutil`. It would be cleaner (and more reliable) to redirect STDERR and examine it separately, rather than clean up the merged outputs. closes #4819 closes #5060
95 lines
2.6 KiB
Ruby
95 lines
2.6 KiB
Ruby
require 'open3'
|
|
|
|
class Cask::SystemCommand
|
|
def self.run(executable, options={})
|
|
command = _process_options(executable, options)
|
|
odebug "Executing: #{command.utf8_inspect}"
|
|
output = ''
|
|
Open3.popen3(*command) do |stdin, stdout, stderr|
|
|
if options[:input]
|
|
options[:input].each { |line| stdin.puts line }
|
|
end
|
|
stdin.close_write
|
|
while line = stdout.gets
|
|
output << line
|
|
ohai line.chomp if options[:print]
|
|
end
|
|
while line = stderr.gets
|
|
next if options[:stderr] == :silence
|
|
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(executable, options)
|
|
options.assert_valid_keys :input, :print, :stderr, :args, :must_succeed, :sudo, :plist
|
|
if options[:stderr] and options[:stderr] != :silence
|
|
raise CaskError.new "Unknown value #{options[:stderr]} for key :stderr"
|
|
end
|
|
command = [executable]
|
|
if options[:sudo]
|
|
command.unshift('/usr/bin/sudo', '-E', '--')
|
|
end
|
|
if options.key?(:args) and
|
|
! options[:args].empty?
|
|
command.concat options[:args]
|
|
end
|
|
command
|
|
end
|
|
|
|
def self._assert_success(status, command, output)
|
|
unless status.success?
|
|
raise CaskCommandFailedError.new(command.utf8_inspect, output, status)
|
|
end
|
|
end
|
|
|
|
def self._warn_plist_garbage(command, garbage)
|
|
return true unless garbage =~ %r{\S}
|
|
external = File.basename(command.first)
|
|
lines = garbage.strip.split("\n")
|
|
opoo "Non-XML output from #{external}:"
|
|
STDERR.puts lines.map {|l| " #{l}"}
|
|
end
|
|
|
|
def self._parse_plist(command, output)
|
|
begin
|
|
raise CaskError.new("Empty plist input") unless output =~ %r{\S}
|
|
output.sub!(%r{\A(.*?)(<\?\s*xml)}m, '\2')
|
|
_warn_plist_garbage(command, $1)
|
|
output.sub!(%r{(<\s*/\s*plist\s*>)(.*?)\Z}m, '\1')
|
|
_warn_plist_garbage(command, $2)
|
|
xml = Plist::parse_xml(output)
|
|
unless xml.respond_to?(:keys) and xml.keys.size > 0
|
|
raise CaskError.new(<<-ERRMSG)
|
|
Empty result parsing plist output from command.
|
|
command was:
|
|
#{command.utf8_inspect}
|
|
output we attempted to parse:
|
|
#{output}
|
|
ERRMSG
|
|
end
|
|
xml
|
|
rescue Plist::ParseError => e
|
|
raise CaskError.new(<<-ERRMSG)
|
|
Error parsing plist output from command.
|
|
command was:
|
|
#{command.utf8_inspect}
|
|
error was:
|
|
#{e}
|
|
output we attempted to parse:
|
|
#{output}
|
|
ERRMSG
|
|
end
|
|
end
|
|
end
|