Ask the filename object for the prefix

1 files changed, 10 insertions, 1 deletions

diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 5382103d4..9a9db69fc 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -124,9 +124,18 @@ class Bottle
     end
 
     def to_s
-      "#{name}-#{version}.#{tag}#{bottle_suffix(revision)}"
+      prefix + suffix
     end
     alias_method :to_str, :to_s
+
+    def prefix
+      "#{name}-#{version}.#{tag}"
+    end
+
+    def suffix
+      s = revision > 0 ? ".#{revision}" : ""
+      ".bottle#{s}.tar.gz"
+    end
   end
 
   extend Forwardable