From 856cebd9b45c40f361c62ca780ff8ef8976e64b9 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 6 Jun 2013 12:02:25 -0500 Subject: Use ivar accessors --- Library/Homebrew/formula.rb | 2 +- Library/Homebrew/formula_support.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Library/Homebrew') diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index ead132bbf..7ad2fb635 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -45,7 +45,7 @@ class Formula @active_spec = determine_active_spec validate_attributes :url, :name, :version - @downloader = download_strategy.new(name, @active_spec) + @downloader = download_strategy.new(name, active_spec) # Combine DSL `option` and `def options` options.each do |opt, desc| diff --git a/Library/Homebrew/formula_support.rb b/Library/Homebrew/formula_support.rb index a36f5a387..f1eebd1d7 100644 --- a/Library/Homebrew/formula_support.rb +++ b/Library/Homebrew/formula_support.rb @@ -16,11 +16,11 @@ class SoftwareSpec end def download_strategy - @download_strategy ||= DownloadStrategyDetector.detect(@url, @using) + @download_strategy ||= DownloadStrategyDetector.detect(url, using) end def verify_download_integrity fn - fn.verify_checksum @checksum + fn.verify_checksum(checksum) rescue ChecksumMissingError opoo "Cannot verify package integrity" puts "The formula did not provide a download checksum" @@ -61,7 +61,7 @@ class SoftwareSpec end def mirror val - @mirrors << val + mirrors << val end end -- cgit v1.2.3