admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Support audit for multilingual casks.

Browse Source
This commit is contained in:
Markus Reiter 2016-09-25 22:47:31 +02:00
parent bc2d676b6f
commit bc143bb470
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/cask/lib/hbc/auditor.rb
View File

@ -1,6 +1,24 @@
module Hbc
class Auditor
def self.audit(cask, audit_download: false, check_token_conflicts: false)
saved_languages = MacOS.instance_variable_get(:@languages)
if languages_blocks = cask.instance_variable_get(:@dsl).instance_variable_get(:@language_blocks)
languages_blocks.keys.map(&:first).each do |language|
ohai "Auditing language #{language.to_s}"
language = "en-US" if language == :default
MacOS.instance_variable_set(:@languages, [language])
audit_cask_instance(Hbc.load(cask.sourcefile_path), audit_download, check_token_conflicts)
CLI::Cleanup.run(cask.token) if audit_download
end
else
audit_cask_instance(cask, audit_download, check_token_conflicts)
end
ensure
MacOS.instance_variable_set(:@languages, saved_languages)
end
def self.audit_cask_instance(cask, audit_download, check_token_conflicts)
download = audit_download && Download.new(cask)
audit = Audit.new(cask, download: download,
check_token_conflicts: check_token_conflicts)

9
Library/Homebrew/cask/lib/hbc/dsl.rb
View File

@ -122,8 +122,13 @@ module Hbc
regexes_or_strings = regexes_or_strings - [:default] + [%r{^en}]
end
case language
when *regexes_or_strings
regexes_or_strings.each do |regex_or_string|
if regex_or_string.class == language.class
next unless regex_or_string == language
else
next unless regex_or_string =~ language
end
@language = block.call
return
end