From b1db0ee290551119a426478e95e87a882b751659 Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Tue, 10 Sep 2024 13:54:12 -0400 Subject: [PATCH] Rename load method when preferring installed casks --- Library/Homebrew/cask/cask_loader.rb | 2 +- Library/Homebrew/cask/caskroom.rb | 2 +- Library/Homebrew/test/cask/cask_loader_spec.rb | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/cask/cask_loader.rb b/Library/Homebrew/cask/cask_loader.rb index 532822b029..a91882a6e5 100644 --- a/Library/Homebrew/cask/cask_loader.rb +++ b/Library/Homebrew/cask/cask_loader.rb @@ -612,7 +612,7 @@ module Cask end sig { params(ref: String, config: T.nilable(Config), warn: T::Boolean).returns(Cask) } - def self.load_installed_cask(ref, config: nil, warn: true) + def self.load_prefer_installed(ref, config: nil, warn: true) tap, token = Tap.with_cask_token(ref) token ||= ref tap ||= Cask.new(ref).tab.tap diff --git a/Library/Homebrew/cask/caskroom.rb b/Library/Homebrew/cask/caskroom.rb index b674c6a35d..321b2997eb 100644 --- a/Library/Homebrew/cask/caskroom.rb +++ b/Library/Homebrew/cask/caskroom.rb @@ -56,7 +56,7 @@ module Cask sig { params(config: T.nilable(Config)).returns(T::Array[Cask]) } def self.casks(config: nil) tokens.sort.filter_map do |token| - CaskLoader.load_installed_cask(token, config:, warn: false) + CaskLoader.load_prefer_installed(token, config:, warn: false) rescue TapCaskAmbiguityError => e T.must(e.loaders.first).load(config:) rescue diff --git a/Library/Homebrew/test/cask/cask_loader_spec.rb b/Library/Homebrew/test/cask/cask_loader_spec.rb index d6a6ec9363..8d86856f16 100644 --- a/Library/Homebrew/test/cask/cask_loader_spec.rb +++ b/Library/Homebrew/test/cask/cask_loader_spec.rb @@ -185,7 +185,7 @@ RSpec.describe Cask::CaskLoader, :cask do end end - describe "::load_installed_cask" do + describe "::load_prefer_installed" do let(:foo_tap) { Tap.fetch("user", "foo") } let(:bar_tap) { Tap.fetch("user", "bar") } @@ -207,28 +207,28 @@ RSpec.describe Cask::CaskLoader, :cask do allow_any_instance_of(Cask::Cask).to receive(:tab).and_return(blank_tab) expect(described_class).to receive(:load).with("test-cask", load_args) - expect(described_class.load_installed_cask("test-cask").tap).to eq(foo_tap) + expect(described_class.load_prefer_installed("test-cask").tap).to eq(foo_tap) end it "returns the correct cask when no tap is specified but a tab exists" do allow_any_instance_of(Cask::Cask).to receive(:tab).and_return(installed_tab) expect(described_class).to receive(:load).with("user/bar/test-cask", load_args) - expect(described_class.load_installed_cask("test-cask").tap).to eq(bar_tap) + expect(described_class.load_prefer_installed("test-cask").tap).to eq(bar_tap) end it "returns the correct cask when a tap is specified and no tab exists" do allow_any_instance_of(Cask::Cask).to receive(:tab).and_return(blank_tab) expect(described_class).to receive(:load).with("user/bar/test-cask", load_args) - expect(described_class.load_installed_cask("user/bar/test-cask").tap).to eq(bar_tap) + expect(described_class.load_prefer_installed("user/bar/test-cask").tap).to eq(bar_tap) end it "returns the correct cask when no tap is specified and a tab exists" do allow_any_instance_of(Cask::Cask).to receive(:tab).and_return(installed_tab) expect(described_class).to receive(:load).with("user/foo/test-cask", load_args) - expect(described_class.load_installed_cask("user/foo/test-cask").tap).to eq(foo_tap) + expect(described_class.load_prefer_installed("user/foo/test-cask").tap).to eq(foo_tap) end it "returns the correct cask when no tap is specified and the tab lists an tap that isn't installed" do @@ -237,7 +237,7 @@ RSpec.describe Cask::CaskLoader, :cask do .and_raise(Cask::CaskUnavailableError.new("test-cask", bar_tap)) expect(described_class).to receive(:load).with("test-cask", load_args) - expect(described_class.load_installed_cask("test-cask").tap).to eq(foo_tap) + expect(described_class.load_prefer_installed("test-cask").tap).to eq(foo_tap) end end end