Rename fetch_bottle_for to fetch_checksum_for

3 files changed, 16 insertions, 12 deletions

diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index bedafbe8f..413c615df 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -68,7 +68,7 @@ class BottleCollector
     @bottles = {}
   end
 
-  def fetch_bottle_for(tag)
+  def fetch_checksum_for(tag)
     return [@bottles[tag], tag] if @bottles[tag]
 
     find_altivec_tag(tag) || find_or_later_tag(tag)
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 06bfe5803..3e7067dc9 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -164,7 +164,7 @@ class BottleSpecification
   end
 
   def tag?(tag)
-    !!collector.fetch_bottle_for(tag)
+    !!checksum_for(tag)
   end
 
   # Checksum methods in the DSL's bottle block optionally take
@@ -177,7 +177,7 @@ class BottleSpecification
   end
 
   def checksum_for(tag)
-    collector.fetch_bottle_for(tag)
+    collector.fetch_checksum_for(tag)
   end
 
   def checksums
diff --git a/Library/Homebrew/test/test_bottle_collector.rb b/Library/Homebrew/test/test_bottle_collector.rb
index 8cf75718a..2de1424a2 100644
--- a/Library/Homebrew/test/test_bottle_collector.rb
+++ b/Library/Homebrew/test/test_bottle_collector.rb
@@ -6,33 +6,37 @@ class BottleCollectorTests < Homebrew::TestCase
     @collector = BottleCollector.new
   end
 
+  def checksum_for(tag)
+    @collector.fetch_checksum_for(tag)
+  end
+
   def test_collector_returns_passed_tags
     @collector[:lion] = "foo"
     @collector[:mountain_lion] = "bar"
-    assert_equal ['bar', :mountain_lion], @collector.fetch_bottle_for(:mountain_lion)
+    assert_equal ['bar', :mountain_lion], checksum_for(:mountain_lion)
   end
 
   def test_collector_returns_nil_on_no_matches
-    assert_nil @collector.fetch_bottle_for(:foo)
+    assert_nil checksum_for(:foo)
   end
 
   def test_collector_finds_or_later_tags
     @collector[:lion_or_later] = "foo"
-    assert_equal ['foo', :lion_or_later], @collector.fetch_bottle_for(:mountain_lion)
-    assert_nil @collector.fetch_bottle_for(:snow_leopard)
+    assert_equal ['foo', :lion_or_later], checksum_for(:mountain_lion)
+    assert_nil checksum_for(:snow_leopard)
   end
 
   def test_collector_prefers_exact_matches
     @collector[:lion_or_later] = "foo"
     @collector[:mountain_lion] = "bar"
-    assert_equal ['bar', :mountain_lion], @collector.fetch_bottle_for(:mountain_lion)
+    assert_equal ['bar', :mountain_lion], checksum_for(:mountain_lion)
   end
 
   def test_collector_finds_altivec_tags
     @collector[:tiger_altivec] = "foo"
-    assert_equal ['foo', :tiger_altivec], @collector.fetch_bottle_for(:tiger_g4)
-    assert_equal ['foo', :tiger_altivec], @collector.fetch_bottle_for(:tiger_g4e)
-    assert_equal ['foo', :tiger_altivec], @collector.fetch_bottle_for(:tiger_g5)
-    assert_nil @collector.fetch_bottle_for(:tiger_g3)
+    assert_equal ['foo', :tiger_altivec], checksum_for(:tiger_g4)
+    assert_equal ['foo', :tiger_altivec], checksum_for(:tiger_g4e)
+    assert_equal ['foo', :tiger_altivec], checksum_for(:tiger_g5)
+    assert_nil checksum_for(:tiger_g3)
   end
 end