# File 'cask/cask_loader.rb', line 539defself.tap_cask_token_type(tapped_token,warn:)returnunless(tap_with_token=Tap.with_cask_token(tapped_token))
diff --git a/docs/Cask/CaskLoader/FromInstalledPathLoader.html b/docs/Cask/CaskLoader/FromInstalledPathLoader.html
index 4fb2f224b..09f2ff8b8 100644
--- a/docs/Cask/CaskLoader/FromInstalledPathLoader.html
+++ b/docs/Cask/CaskLoader/FromInstalledPathLoader.html
@@ -281,17 +281,17 @@
-489
-490
-491
-492
-493
-494
-495
-496
+496
+497
+498
+499
+500
+501
+502
+503
-
# File 'cask/cask_loader.rb', line 489
+
# File 'cask/cask_loader.rb', line 496defself.try_new(ref,warn:false)returnunlessref.is_a?(String)
diff --git a/docs/Cask/CaskLoader/FromNameLoader.html b/docs/Cask/CaskLoader/FromNameLoader.html
index bfb464337..c534ab94b 100644
--- a/docs/Cask/CaskLoader/FromNameLoader.html
+++ b/docs/Cask/CaskLoader/FromNameLoader.html
@@ -315,19 +315,33 @@
477
478
479
-480
+480
+481
+482
+483
+484
+485
+486
+487
# File 'cask/cask_loader.rb', line 465defself.try_new(ref,warn:false)returnunlessref.is_a?(String)
- returnifref.include?("/")
+ returnunlessref.match?(/\A#{HOMEBREW_TAP_CASK_TOKEN_REGEX}\Z/o)token=ref
- loaders=Tap.filter_map{|tap|super("#{tap}/#{token}",warn:warn)}
- .select{_1.path.exist?}
+ # If it exists in the default tap, never treat it as ambiguous with another tap.
+if(core_cask_tap=CoreCaskTap.instance).installed?&&
+ (loader=super("#{core_cask_tap}/#{token}",warn:warn))&.path&.exist?
+ returnloader
+ end
+
+ loaders=Tap.select{|tap|tap.installed?&&!tap.core_cask_tap?}
+ .filter_map{|tap|super("#{tap}/#{token}",warn:warn)}
+ .select{|tap|tap.path.exist?}caseloaders.countwhen1
diff --git a/docs/Cask/CaskLoader/NullLoader.html b/docs/Cask/CaskLoader/NullLoader.html
index 559e61504..d60144277 100644
--- a/docs/Cask/CaskLoader/NullLoader.html
+++ b/docs/Cask/CaskLoader/NullLoader.html
@@ -291,13 +291,13 @@
-513
-514
-515
-516
+520
+521
+522
+523
-
# File 'cask/cask_loader.rb', line 513
+
# File 'cask/cask_loader.rb', line 520definitialize(ref)token=File.basename(ref,".rb")
@@ -386,15 +386,15 @@
-505
-506
-507
-508
-509
-510
+512
+513
+514
+515
+516
+517
-
# File 'cask/cask_loader.rb', line 505
+
# File 'cask/cask_loader.rb', line 512defself.try_new(ref,warn:false)returnifref.is_a?(Cask)
@@ -456,12 +456,12 @@
-518
-519
-520
+525
+526
+527
-
# File 'cask/cask_loader.rb', line 518
+
# File 'cask/cask_loader.rb', line 525defload(config:)raiseCaskUnavailableError.new(token,"No Cask with this name exists.")
diff --git a/docs/CoreCaskTap.html b/docs/CoreCaskTap.html
index 98953de9a..711f4eb6c 100644
--- a/docs/CoreCaskTap.html
+++ b/docs/CoreCaskTap.html
@@ -274,7 +274,7 @@
# File 'formulary.rb', line 1099defself.to_rack(ref)# If using a fully-scoped reference, check if the formula can be resolved.
diff --git a/docs/Formulary/FormulaContentsLoader.html b/docs/Formulary/FormulaContentsLoader.html
index 5ff325ba6..b21628133 100644
--- a/docs/Formulary/FormulaContentsLoader.html
+++ b/docs/Formulary/FormulaContentsLoader.html
@@ -273,13 +273,13 @@
-865
-866
-867
-868
+857
+858
+859
+860
-
# File 'formulary.rb', line 865
+
# File 'formulary.rb', line 857definitialize(name,path,contents)@contents=contents
@@ -327,12 +327,12 @@
-863
-864
-865
+855
+856
+857
-
# File 'formulary.rb', line 863
+
# File 'formulary.rb', line 855defcontents@contents
@@ -379,13 +379,13 @@
-870
-871
-872
-873
+862
+863
+864
+865
-
# File 'formulary.rb', line 870
+
# File 'formulary.rb', line 862defklass(flags:,ignore_errors:)namespace="FormulaNamespace#{Digest::MD5.hexdigest(contents.to_s)}"
diff --git a/docs/Formulary/FromAPILoader.html b/docs/Formulary/FromAPILoader.html
index 68494b683..54168e5e7 100644
--- a/docs/Formulary/FromAPILoader.html
+++ b/docs/Formulary/FromAPILoader.html
@@ -313,17 +313,17 @@
-910
-911
-912
-913
-914
-915
-916
-917
+902
+903
+904
+905
+906
+907
+908
+909
-
# File 'formulary.rb', line 910
+
# File 'formulary.rb', line 902definitialize(name,tap:T.unsafe(nil),alias_name:T.unsafe(nil))options={
@@ -429,6 +429,14 @@
- This class is part of a private API.
- This class may only be used in the Homebrew/brew repository.
- Third parties should avoid using this class if possible, as it may be removed or changed without warning.
-
- This method is part of a private API.
- This method may only be used in the Homebrew/brew repository.
- Third parties should avoid using this method if possible, as it may be removed or changed without warning.
-
-
-
\ No newline at end of file
diff --git a/docs/Formulary/FromKegLoader.html b/docs/Formulary/FromKegLoader.html
index 966a06f77..90b4b6854 100644
--- a/docs/Formulary/FromKegLoader.html
+++ b/docs/Formulary/FromKegLoader.html
@@ -280,16 +280,16 @@
-813
-814
-815
-816
-817
-818
-819
+805
+806
+807
+808
+809
+810
+811
-
# File 'formulary.rb', line 813
+
# File 'formulary.rb', line 805defself.try_new(ref,from:T.unsafe(nil),warn:false)ref=ref.to_s
diff --git a/docs/Formulary/FromNameLoader.html b/docs/Formulary/FromNameLoader.html
index 114ee76fe..799158407 100644
--- a/docs/Formulary/FromNameLoader.html
+++ b/docs/Formulary/FromNameLoader.html
@@ -298,32 +298,48 @@
# File 'formulary.rb', line 774defself.try_new(ref,from:T.unsafe(nil),warn:false)returnunlessref.is_a?(String)
- returnifref.include?("/")
+ returnunlessref.match?(/\A#{HOMEBREW_TAP_FORMULA_NAME_REGEX}\Z/o)name=ref
- loaders=Tap.filter_map{|tap|super("#{tap}/#{name}",warn:warn)}.select{_1.path.exist?}
+ # If it exists in the default tap, never treat it as ambiguous with another tap.
+if(core_tap=CoreTap.instance).installed?&&
+ (loader=super("#{core_tap}/#{name}",warn:warn))&.path&.exist?
+ returnloader
+ end
+
+ loaders=Tap.select{|tap|tap.installed?&&!tap.core_tap?}
+ .filter_map{|tap|super("#{tap}/#{name}",warn:warn)}
+ .select{|tap|tap.path.exist?}caseloaders.countwhen1
diff --git a/docs/Formulary/FromTapLoader.html b/docs/Formulary/FromTapLoader.html
index 7015ab2a5..a6c0b654a 100644
--- a/docs/Formulary/FromTapLoader.html
+++ b/docs/Formulary/FromTapLoader.html
@@ -118,7 +118,7 @@
# File 'dev-cmd/bump-formula-pr.rb', line 481defalias_update_pair(formula,new_formula_version)versioned_alias=formula.aliases.grep(/^.*@\d+(\.\d+)?$/).first
@@ -13103,13 +13103,7 @@
178
179
180
-181
-182
-183
-184
-185
-186
-187
+181
# File 'dev-cmd/bump-cask-pr.rb', line 67
@@ -13139,20 +13133,14 @@
odie"This cask is not in a tap!"ifcask.tap.blank?odie"This cask's tap is not a Git repository!"unlesscask.tap.git?
- ifENV.fetch("HOMEBREW_TEST_BOT_AUTOBUMP",false).blank?&&
- (cask.tap.core_cask_tap?&&
- (autobump_file_path=cask.tap.path/Tap::HOMEBREW_TAP_AUTOBUMP_FILE)&&
- autobump_file_path.exist?&&
- autobump_file_path.readlines(chomp:true).include?(cask.token))
- odie<<~EOS
- Whoops, the #{cask.token} cask has its version update
- pull requests automatically opened by BrewTestBot!
- We'd still love your contributions, though, so try another one
- that's not in the autobump list:
-#{Formatter.url("#{cask.tap.remote}/blob/master/.github/autobump.txt")}
- EOS
-end
-
+ odie<<~EOSunlesscask.tap.allow_bump?(cask.token)
+ Whoops, the #{cask.token} cask has its version update
+ pull requests automatically opened by BrewTestBot!
+ We'd still love your contributions, though, so try another one
+ that's not in the autobump list:
+#{Formatter.url("#{cask.tap.remote}/blob/master/.github/autobump.txt")}
+ EOS
+new_version=BumpVersionParser.new(general:args.version,intel:args.version_intel,
@@ -13727,13 +13715,7 @@
391
392
393
-394
-395
-396
-397
-398
-399
-400
+394
# File 'dev-cmd/bump-formula-pr.rb', line 94
@@ -13761,20 +13743,14 @@
odie"This formula is not in a tap!"ifformula.tap.blank?odie"This formula's tap is not a Git repository!"unlessformula.tap.git?
- ifENV.fetch("HOMEBREW_TEST_BOT_AUTOBUMP",nil).blank?&&
- (formula.tap.core_tap?&&
- (autobump_file_path=formula.tap.path/Tap::HOMEBREW_TAP_AUTOBUMP_FILE)&&
- autobump_file_path.exist?&&
- autobump_file_path.readlines(chomp:true).include?(formula.name))
- odie<<~EOS
- Whoops, the #{formula.name} formula has its version update
- pull requests automatically opened by BrewTestBot!
- We'd still love your contributions, though, so try another one
- that's not in the autobump list:
-#{Formatter.url("#{formula.tap.remote}/blob/master/.github/autobump.txt")}
- EOS
-end
-
+ odie<<~EOSunlessformula.tap.allow_bump?(formula.name)
+ Whoops, the #{formula.name} formula has its version update
+ pull requests automatically opened by BrewTestBot!
+ We'd still love your contributions, though, so try another one
+ that's not in the autobump list:
+#{Formatter.url("#{formula.tap.remote}/blob/master/.github/autobump.txt")}
+ EOS
+formula_spec=formula.stableodie"#{formula}: no stable specification found!"ifformula_spec.blank?
@@ -15448,17 +15424,17 @@
# File 'dev-cmd/bump-formula-pr.rb', line 472defcheck_closed_pull_requests(formula,tap_remote_repo,args:,version:)# if we haven't already found open requests, try for an exact match across closed requests
@@ -15488,21 +15464,21 @@
# File 'dev-cmd/bump-cask-pr.rb', line 200defreplace_version_and_checksum(cask,new_hash,new_version,replacement_pairs)# When blocks are absent, arch is not relevant. For consistency, we simulate the arm architecture.
@@ -37157,10 +37133,6 @@
# File 'diagnostic.rb', line 902defcheck_cask_software_versionsadd_info"Homebrew Version",HOMEBREW_VERSION
@@ -3370,6 +3370,7 @@
+933
934
935
936
@@ -3384,11 +3385,10 @@
945
946
947
-948
-949
+948
-
# File 'diagnostic.rb', line 934
+
# File 'diagnostic.rb', line 933defcheck_cask_staging_location# Skip this check when running CI since the staging path is not writable for security reasons
@@ -3441,6 +3441,7 @@
+950
951
952
953
@@ -3458,11 +3459,10 @@
965
966
967
-968
-969
+968
-
# File 'diagnostic.rb', line 951
+
# File 'diagnostic.rb', line 950defcheck_cask_tapserror_tap_paths=[]
@@ -3518,6 +3518,7 @@
+1003
1004
1005
1006
@@ -3543,11 +3544,10 @@
1026
1027
1028
-1029
-1030
+1029
-
# File 'diagnostic.rb', line 1004
+
# File 'diagnostic.rb', line 1003defcheck_cask_xattrresult=system_command"/usr/bin/xattr",args:["-h"]
@@ -3850,8 +3850,7 @@
867
868
869
-870
-871
+870
# File 'diagnostic.rb', line 833
@@ -3864,7 +3863,6 @@