FormulaValidationError: include full_name
Closes Homebrew/homebrew#44946. Signed-off-by: Baptiste Fontaine <batifon@yahoo.fr>
This commit is contained in:
parent
4cf703d5d8
commit
f3035333fb
@ -23,11 +23,12 @@ class NoSuchKegError < RuntimeError
|
|||||||
end
|
end
|
||||||
|
|
||||||
class FormulaValidationError < StandardError
|
class FormulaValidationError < StandardError
|
||||||
attr_reader :attr
|
attr_reader :attr, :formula
|
||||||
|
|
||||||
def initialize(attr, value)
|
def initialize(formula, attr, value)
|
||||||
@attr = attr
|
@attr = attr
|
||||||
super "invalid attribute: #{attr} (#{value.inspect})"
|
@formula = formula
|
||||||
|
super "invalid attribute for formula '#{formula}': #{attr} (#{value.inspect})"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -182,17 +182,17 @@ class Formula
|
|||||||
|
|
||||||
def validate_attributes!
|
def validate_attributes!
|
||||||
if name.nil? || name.empty? || name =~ /\s/
|
if name.nil? || name.empty? || name =~ /\s/
|
||||||
raise FormulaValidationError.new(:name, name)
|
raise FormulaValidationError.new(full_name, :name, name)
|
||||||
end
|
end
|
||||||
|
|
||||||
url = active_spec.url
|
url = active_spec.url
|
||||||
if url.nil? || url.empty? || url =~ /\s/
|
if url.nil? || url.empty? || url =~ /\s/
|
||||||
raise FormulaValidationError.new(:url, url)
|
raise FormulaValidationError.new(full_name, :url, url)
|
||||||
end
|
end
|
||||||
|
|
||||||
val = version.respond_to?(:to_str) ? version.to_str : version
|
val = version.respond_to?(:to_str) ? version.to_str : version
|
||||||
if val.nil? || val.empty? || val =~ /\s/
|
if val.nil? || val.empty? || val =~ /\s/
|
||||||
raise FormulaValidationError.new(:version, val)
|
raise FormulaValidationError.new(full_name, :version, val)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user