aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-12-10 00:53:57 -0500
committerJack Nagel2014-12-10 00:55:26 -0500
commit5201411a6dda474353b7d6c073b1bd04502b637b (patch)
tree418646b2b4524a8331838bb24328fd587c00b994
parent0909b12eb907c550a24a7641e29dcb2a8d58fd77 (diff)
downloadbrew-5201411a6dda474353b7d6c073b1bd04502b637b.tar.bz2
Provide version reader method
-rw-r--r--Library/Homebrew/download_strategy.rb7
-rw-r--r--Library/Homebrew/test/test_download_strategies.rb2
2 files changed, 5 insertions, 4 deletions
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 84cbf3778..bc31babd9 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -3,12 +3,13 @@ require 'utils/json'
class AbstractDownloadStrategy
include FileUtils
- attr_reader :meta, :name, :resource
+ attr_reader :meta, :name, :version, :resource
def initialize name, resource
@name = name
@resource = resource
@url = resource.url
+ @version = resource.version
@meta = resource.specs
end
@@ -120,7 +121,7 @@ class VCSDownloadStrategy < AbstractDownloadStrategy
end
def head?
- resource.version.head?
+ version.head?
end
private
@@ -155,7 +156,7 @@ class CurlDownloadStrategy < AbstractDownloadStrategy
def initialize(name, resource)
super
@mirrors = resource.mirrors.dup
- @tarball_path = HOMEBREW_CACHE.join("#{name}-#{resource.version}#{ext}")
+ @tarball_path = HOMEBREW_CACHE.join("#{name}-#{version}#{ext}")
@temporary_path = Pathname.new("#{cached_location}.incomplete")
end
diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test_download_strategies.rb
index 3dabc7af7..2f4a324ef 100644
--- a/Library/Homebrew/test/test_download_strategies.rb
+++ b/Library/Homebrew/test/test_download_strategies.rb
@@ -2,7 +2,7 @@ require 'testing_env'
require 'download_strategy'
class ResourceDouble
- attr_reader :url, :specs
+ attr_reader :url, :specs, :version
def initialize(url="http://example.com/foo.tar.gz", specs={})
@url = url