diff --git a/Library/Homebrew/cli/named_args.rb b/Library/Homebrew/cli/named_args.rb index 5ad8a27c430907cde96aa7aeaf011145a2906528..fa63db0dfed646fc24333e88ef5ddff3eced8d93 100644 --- a/Library/Homebrew/cli/named_args.rb +++ b/Library/Homebrew/cli/named_args.rb @@ -84,7 +84,7 @@ module Homebrew @to_paths ||= {} @to_paths[only] ||= downcased_unique_named.flat_map do |name| if File.exist?(name) - name + Pathname(name) elsif name.count("/") == 1 Tap.fetch(name).path else diff --git a/Library/Homebrew/test/cli/named_args_spec.rb b/Library/Homebrew/test/cli/named_args_spec.rb index 10856882a4e01a85168c8aaf9fedf7a12dfc9730..b70a67acc36ebe67109cc904a241fc7ce8dc8523 100644 --- a/Library/Homebrew/test/cli/named_args_spec.rb +++ b/Library/Homebrew/test/cli/named_args_spec.rb @@ -120,4 +120,45 @@ describe Homebrew::CLI::NamedArgs do expect(described_class.new("foo").homebrew_tap_cask_names).to be_empty end end + + describe "#to_paths" do + let(:existing_path) { mktmpdir } + let(:formula_path) { Pathname("/path/to/foo.rb") } + let(:cask_path) { Pathname("/path/to/baz.rb") } + + before do + allow(formula_path).to receive(:exist?).and_return(true) + allow(cask_path).to receive(:exist?).and_return(true) + + allow(Formulary).to receive(:path).and_call_original + allow(Cask::CaskLoader).to receive(:path).and_call_original + end + + it "returns taps, cask formula and existing paths" do + expect(Formulary).to receive(:path).with("foo").and_return(formula_path) + expect(Cask::CaskLoader).to receive(:path).with("baz").and_return(cask_path) + + expect(described_class.new("homebrew/core", "foo", "baz", existing_path.to_s).to_paths) + .to eq [Tap.fetch("homebrew/core").path, formula_path, cask_path, existing_path] + end + + it "returns both cask and formula paths if they exist" do + expect(Formulary).to receive(:path).with("foo").and_return(formula_path) + expect(Cask::CaskLoader).to receive(:path).with("baz").and_return(cask_path) + + expect(described_class.new("foo", "baz").to_paths).to eq [formula_path, cask_path] + end + + it "returns only formulae when `only: :formulae` is specified" do + expect(Formulary).to receive(:path).with("foo").and_return(formula_path) + + expect(described_class.new("foo", "baz").to_paths(only: :formulae)).to eq [formula_path, Formulary.path("baz")] + end + + it "returns only casks when `only: :casks` is specified" do + expect(Cask::CaskLoader).to receive(:path).with("foo").and_return(cask_path) + + expect(described_class.new("foo", "baz").to_paths(only: :casks)).to eq [cask_path, Cask::CaskLoader.path("baz")] + end + end end