aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Library/Homebrew/download_strategy.rb28
-rw-r--r--Library/Homebrew/test/test_download_strategies.rb2
2 files changed, 16 insertions, 14 deletions
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 7d6aca1bc..6132f08a7 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -46,19 +46,6 @@ class VCSDownloadStrategy < AbstractDownloadStrategy
@clone = HOMEBREW_CACHE.join(cache_filename)
end
- def extract_ref(specs)
- key = REF_TYPES.find { |type| specs.key?(type) }
- return key, specs[key]
- end
-
- def cache_filename
- "#{name}--#{cache_tag}"
- end
-
- def cache_tag
- "__UNKNOWN__"
- end
-
def cached_location
@clone
end
@@ -70,6 +57,21 @@ class VCSDownloadStrategy < AbstractDownloadStrategy
def head?
resource.version.head?
end
+
+ private
+
+ def cache_tag
+ "__UNKNOWN__"
+ end
+
+ def cache_filename
+ "#{name}--#{cache_tag}"
+ end
+
+ def extract_ref(specs)
+ key = REF_TYPES.find { |type| specs.key?(type) }
+ return key, specs[key]
+ end
end
class CurlDownloadStrategy < AbstractDownloadStrategy
diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test_download_strategies.rb
index e7bc75e32..3dabc7af7 100644
--- a/Library/Homebrew/test/test_download_strategies.rb
+++ b/Library/Homebrew/test/test_download_strategies.rb
@@ -41,7 +41,7 @@ class VCSDownloadStrategyTests < Homebrew::TestCase
resource = ResourceDouble.new("http://example.com/bar")
strategy = Class.new(VCSDownloadStrategy) { def cache_tag; "foo"; end }
downloader = strategy.new("baz", resource)
- assert_equal "baz--foo", downloader.cache_filename
+ assert_equal HOMEBREW_CACHE.join("baz--foo"), downloader.cached_location
end
end