--cache: Use convenience methods for loading formulae and casks

Library/Homebrew/cmd/--cache.rb

@@ -2,8 +2,7 @@
 
 require "fetch"
 require "cli/parser"
-require "cask/cmd"
+require "cask/download"
-require "cask/cask_loader"
 
 module Homebrew
   extend Fetch
@@ -37,29 +36,27 @@ module Homebrew
 
     if args.no_named?
       puts HOMEBREW_CACHE
-    elsif args.formula?
+      return
-      args.named.each do |name|
-        print_formula_cache name, args: args
     end
+
+    formulae_or_casks = if args.formula?
+      args.formulae
     elsif args.cask?
-      args.named.each do |name|
+      args.loaded_casks
-        print_cask_cache name
-      end
     else
-      args.named.each do |name|
+      args.formulae_and_casks
-        print_formula_cache name, args: args
-      rescue FormulaUnavailableError
-        begin
-          print_cask_cache name
-        rescue Cask::CaskUnavailableError
-          odie "No available formula or cask with the name \"#{name}\""
     end
+
+    formulae_or_casks.each do |formula_or_cask|
+      if formula_or_cask.is_a? Formula
+        print_formula_cache formula_or_cask, args: args
+      else
+        print_cask_cache formula_or_cask
       end
     end
   end
 
-  def print_formula_cache(name, args:)
+  def print_formula_cache(formula, args:)
-    formula = Formulary.factory(name, force_bottle: args.force_bottle?, flags: args.flags_only)
     if fetch_bottle?(formula, args: args)
       puts formula.bottle.cached_download
     else
@@ -67,8 +64,7 @@ module Homebrew
     end
   end
 
-  def print_cask_cache(name)
+  def print_cask_cache(cask)
-    cask = Cask::CaskLoader.load name
+    puts Cask::Download.new(cask).downloader.cached_location
-    puts Cask::Cmd::Cache.cached_location(cask)
   end
 end