Rename resource? to resource_defined?

3 files changed, 4 insertions, 4 deletions

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index ee3235206..863037bdb 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -659,7 +659,7 @@ class Formula
     # Define a named resource using a SoftwareSpec style block
     def resource name, &block
       specs.each do |spec|
-        spec.resource(name, &block) unless spec.resource?(name)
+        spec.resource(name, &block) unless spec.resource_defined?(name)
       end
     end
 
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index e173cb476..97a97969c 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -54,13 +54,13 @@ class SoftwareSpec
     bottle_specification.instance_eval(&block)
   end
 
-  def resource? name
+  def resource_defined? name
     resources.has_key?(name)
   end
 
   def resource name, &block
     if block_given?
-      raise DuplicateResourceError.new(name) if resource?(name)
+      raise DuplicateResourceError.new(name) if resource_defined?(name)
       res = Resource.new(name, &block)
       resources[name] = res
       dependency_collector.add(res)
diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test_software_spec.rb
index aa1ecda0a..313a502e0 100644
--- a/Library/Homebrew/test/test_software_spec.rb
+++ b/Library/Homebrew/test/test_software_spec.rb
@@ -8,7 +8,7 @@ class SoftwareSpecTests < Homebrew::TestCase
 
   def test_resource
     @spec.resource('foo') { url 'foo-1.0' }
-    assert @spec.resource?('foo')
+    assert @spec.resource_defined?("foo")
   end
 
   def test_raises_when_duplicate_resources_are_defined