From fb350bad0fb3b4781ec24696d222fe4f8b6c012b Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 21 Feb 2014 00:41:07 -0500 Subject: [PATCH] Remove downloader from Formula --- Library/Homebrew/formula.rb | 8 ++------ Library/Homebrew/software_spec.rb | 1 + Library/Homebrew/test/test_formula.rb | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index dc95f62930..732899fa57 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -119,16 +119,12 @@ class Formula active_spec.requirements end - def downloader - active_spec.downloader - end - def cached_download - downloader.cached_location + active_spec.cached_download end def clear_cache - downloader.clear_cache + active_spec.clear_cache end # if the dir is there, but it's empty we consider it not installed diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 1811115406..d89884aa8e 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -15,6 +15,7 @@ class SoftwareSpec def_delegators :@resource, :stage, :fetch def_delegators :@resource, :download_strategy, :verify_download_integrity + def_delegators :@resource, :cached_download, :clear_cache def_delegators :@resource, :checksum, :mirrors, :specs, :using, :downloader def_delegators :@resource, :version, :mirror, *Checksum::TYPES diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb index a14b29e8cc..ed2cbf338a 100644 --- a/Library/Homebrew/test/test_formula.rb +++ b/Library/Homebrew/test/test_formula.rb @@ -161,7 +161,6 @@ class FormulaTests < Test::Unit::TestCase assert_equal 'http://example.com', f.homepage assert_version_equal '0.1', f.version assert_equal f.stable, f.active_spec - assert_instance_of CurlDownloadStrategy, f.downloader assert_instance_of SoftwareSpec, f.stable assert_instance_of Bottle, f.bottle