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

One less place where Formula is reopened

Browse Source
This commit is contained in:
Jack Nagel 2014-11-12 21:41:14 -06:00
parent 16a2220834
commit 89dc0b9787
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/cmd/audit.rb
View File

@ -34,20 +34,13 @@ module Homebrew
end
end
# Formula extensions for auditing
class Formula
def text
@text ||= FormulaText.new(@path)
end
end
class FormulaText
def initialize path
@text = path.open("rb", &:read)
end
def without_patch
@text.split("__END__")[0].strip()
@text.split("\n__END__").first
end
def has_DATA?
@ -86,7 +79,7 @@ class FormulaAuditor
def initialize(formula)
@formula = formula
@problems = []
@text = formula.text.without_patch
@text = FormulaText.new(formula.path)
@specs = %w{stable devel head}.map { |s| formula.send(s) }.compact
end
@ -95,15 +88,15 @@ class FormulaAuditor
problem "Incorrect file permissions: chmod 644 #{formula.path}"
end
if formula.text.has_DATA? and not formula.text.has_END?
if text.has_DATA? and not text.has_END?
problem "'DATA' was found, but no '__END__'"
end
if formula.text.has_END? and not formula.text.has_DATA?
if text.has_END? and not text.has_DATA?
problem "'__END__' was found, but 'DATA' is not used"
end
unless formula.text.has_trailing_newline?
unless text.has_trailing_newline?
problem "File should end with a newline"
end
end
@ -556,7 +549,7 @@ class FormulaAuditor
audit_conflicts
audit_patches
audit_text
text.split("\n").each_with_index {|line, lineno| audit_line(line, lineno+1) }
text.without_patch.split("\n").each_with_index { |line, lineno| audit_line(line, lineno+1) }
audit_installed
end