admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Remove Keg::Relocation#start_with_old_value? method

Browse Source
This commit is contained in:
Rylan Polster 2021-05-11 15:44:05 -04:00
parent 7d49dba7e9
commit 309e9e1c52
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
3 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/extend/os/mac/keg_relocate.rb
View File

@ -131,9 +131,10 @@ class Keg
old_prefix, new_prefix = relocation.replacement_pair_for(:prefix) old_prefix, new_prefix = relocation.replacement_pair_for(:prefix)
old_cellar, new_cellar = relocation.replacement_pair_for(:cellar) old_cellar, new_cellar = relocation.replacement_pair_for(:cellar)
if relocation.start_with_old_value? :cellar, old_name case old_name
when /^#{old_cellar}/
old_name.sub(old_cellar, new_cellar) old_name.sub(old_cellar, new_cellar)
elsif relocation.start_with_old_value? :prefix, old_name when /^#{old_prefix}/
old_name.sub(old_prefix, new_prefix) old_name.sub(old_prefix, new_prefix)
end end
end end

4
Library/Homebrew/keg_relocate.rb
View File

@ -33,10 +33,6 @@ class Keg
@replacement_map.fetch(key) @replacement_map.fetch(key)
end end
def start_with_old_value?(key, text)
text.match?(/^#{@replacement_map.fetch(key).first}/)
end
sig { params(text: String).void } sig { params(text: String).void }
def replace_text(text) def replace_text(text)
replacements = @replacement_map.values.to_h replacements = @replacement_map.values.to_h

11
Library/Homebrew/test/keg_relocate/relocation_spec.rb
View File

@ -59,17 +59,6 @@ describe Keg::Relocation do
REPLACED REPLACED
end end
specify "#start_with_old_value?" do
relocation = setup_relocation
expect(relocation.start_with_old_value?(:prefix, "#{HOMEBREW_PREFIX}/foo")).to be true
expect(relocation.start_with_old_value?(:prefix, "foo#{HOMEBREW_PREFIX}/bar")).to be false
expect(relocation.start_with_old_value?(:cellar, "#{HOMEBREW_CELLAR}/foo")).to be true
expect(relocation.start_with_old_value?(:cellar, "foo#{HOMEBREW_CELLAR}/bar")).to be false
expect(relocation.start_with_old_value?(:repository_placeholder, "@@HOMEBREW_REPOSITORY@@/foo")).to be true
expect(relocation.start_with_old_value?(:library_placeholder, "foo@@HOMEBREW_LIBRARY@@/bar")).to be false
end
specify "::path_regex" do specify "::path_regex" do
expect(described_class.path_regex(prefix)).to eq escaped_prefix expect(described_class.path_regex(prefix)).to eq escaped_prefix
expect(described_class.path_regex("foo.bar")).to eq(/(?<![a-zA-Z0-9])foo\.bar/) expect(described_class.path_regex("foo.bar")).to eq(/(?<![a-zA-Z0-9])foo\.bar/)