From 97333df4cb4bd006401193639400a8bc6df56e3a Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Sat, 7 Oct 2017 15:58:49 +0200
Subject: Add helper method for Cask fixture paths and refactor CaskLoader.

---
 Library/Homebrew/cask/lib/hbc/cli/list.rb      | 2 +-
 Library/Homebrew/cask/lib/hbc/cli/uninstall.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Library/Homebrew/cask/lib/hbc/cli')

diff --git a/Library/Homebrew/cask/lib/hbc/cli/list.rb b/Library/Homebrew/cask/lib/hbc/cli/list.rb
index 32415af8a..72b78d110 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/list.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/list.rb
@@ -23,7 +23,7 @@ module Hbc
           elsif versions?
             puts self.class.format_versioned(cask)
           else
-            cask = CaskLoader.load_from_file(cask.installed_caskfile)
+            cask = CaskLoader.load(cask.installed_caskfile)
             self.class.list_artifacts(cask)
           end
         end
diff --git a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb b/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb
index 7e55db5f1..f2059605c 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb
@@ -16,7 +16,7 @@ module Hbc
 
           if cask.installed? && !cask.installed_caskfile.nil?
             # use the same cask file that was used for installation, if possible
-            cask = CaskLoader.load_from_file(cask.installed_caskfile) if cask.installed_caskfile.exist?
+            cask = CaskLoader.load(cask.installed_caskfile) if cask.installed_caskfile.exist?
           end
 
           Installer.new(cask, binaries: binaries?, verbose: verbose?, force: force?).uninstall
-- 
cgit v1.2.3