Rename resource? to resource_defined?

This commit is contained in:
Jack Nagel 2014-07-30 18:56:37 -05:00
parent 3451c2d67f
commit bc937f56e7
3 changed files with 4 additions and 4 deletions

View File

@ -659,7 +659,7 @@ class Formula
# Define a named resource using a SoftwareSpec style block # Define a named resource using a SoftwareSpec style block
def resource name, &block def resource name, &block
specs.each do |spec| specs.each do |spec|
spec.resource(name, &block) unless spec.resource?(name) spec.resource(name, &block) unless spec.resource_defined?(name)
end end
end end

View File

@ -54,13 +54,13 @@ class SoftwareSpec
bottle_specification.instance_eval(&block) bottle_specification.instance_eval(&block)
end end
def resource? name def resource_defined? name
resources.has_key?(name) resources.has_key?(name)
end end
def resource name, &block def resource name, &block
if block_given? if block_given?
raise DuplicateResourceError.new(name) if resource?(name) raise DuplicateResourceError.new(name) if resource_defined?(name)
res = Resource.new(name, &block) res = Resource.new(name, &block)
resources[name] = res resources[name] = res
dependency_collector.add(res) dependency_collector.add(res)

View File

@ -8,7 +8,7 @@ class SoftwareSpecTests < Homebrew::TestCase
def test_resource def test_resource
@spec.resource('foo') { url 'foo-1.0' } @spec.resource('foo') { url 'foo-1.0' }
assert @spec.resource?('foo') assert @spec.resource_defined?("foo")
end end
def test_raises_when_duplicate_resources_are_defined def test_raises_when_duplicate_resources_are_defined