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

homebrew/cask-versions: remove

Browse Source
This commit is contained in:
Razvan Azamfirei 2024-05-02 16:59:33 -04:00
parent 4c12dc2218
commit 0b0fcdcdd2
No known key found for this signature in database
5 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cask/audit.rb
View File

@ -430,7 +430,7 @@ module Cask
add_error "cask token contains .app" if token.end_with? ".app" add_error "cask token contains .app" if token.end_with? ".app"
match_data = /-(?<designation>alpha|beta|rc|release-candidate)$/.match(cask.token) match_data = /-(?<designation>alpha|beta|rc|release-candidate)$/.match(cask.token)
if match_data && cask.tap&.official? && cask.tap != "homebrew/cask-versions" if match_data && cask.tap&.official?
add_error "cask token contains version designation '#{match_data[:designation]}'" add_error "cask token contains version designation '#{match_data[:designation]}'"
end end

2
Library/Homebrew/cask/dsl/caveats.rb
View File

@ -135,7 +135,7 @@ module Cask
else else
<<~EOS <<~EOS
#{@cask} requires Java #{java_version}. You can install it with: #{@cask} requires Java #{java_version}. You can install it with:
brew install --cask homebrew/cask-versions/temurin#{java_version} brew install --cask temurin@#{java_version}
EOS EOS
end end
end end

2
Library/Homebrew/official_taps.rb
View File

@ -4,7 +4,6 @@
OFFICIAL_CASK_TAPS = %w[ OFFICIAL_CASK_TAPS = %w[
cask cask
cask-fonts cask-fonts
cask-versions
].freeze ].freeze
OFFICIAL_CMD_TAPS = { OFFICIAL_CMD_TAPS = {
@ -20,6 +19,7 @@ DEPRECATED_OFFICIAL_TAPS = %w[
binary binary
cask-drivers cask-drivers
cask-eid cask-eid
cask-versions
completions completions
devel-only devel-only
dupes dupes

4
Library/Homebrew/tap_constants.rb
View File

@ -36,10 +36,10 @@ HOMEBREW_TAP_DIR_REGEX = T.let(
HOMEBREW_TAP_PATH_REGEX = T.let(Regexp.new(HOMEBREW_TAP_DIR_REGEX.source + %r{(?:/.*)?\Z}.source).freeze, Regexp) HOMEBREW_TAP_PATH_REGEX = T.let(Regexp.new(HOMEBREW_TAP_DIR_REGEX.source + %r{(?:/.*)?\Z}.source).freeze, Regexp)
# Match official cask taps, e.g `homebrew/cask`. # Match official cask taps, e.g `homebrew/cask`.
HOMEBREW_CASK_TAP_REGEX = T.let( HOMEBREW_CASK_TAP_REGEX = T.let(
%r{(?:([Cc]askroom)/(cask|versions)|([Hh]omebrew)/(?:homebrew-)?(cask|cask-[\w-]+))}, %r{(?:([Cc]askroom)/(cask)|([Hh]omebrew)/(?:homebrew-)?(cask|cask-[\w-]+))},
Regexp, Regexp,
) )
# Match official taps' casks, e.g. `homebrew/cask/somecask` or `homebrew/cask-versions/somecask`. # Match official taps' casks, e.g. `homebrew/cask/somecask`.
HOMEBREW_CASK_TAP_CASK_REGEX = T.let( HOMEBREW_CASK_TAP_CASK_REGEX = T.let(
%r{\A#{HOMEBREW_CASK_TAP_REGEX.source}/#{HOMEBREW_TAP_CASK_TOKEN_REGEX.source}\Z}, %r{\A#{HOMEBREW_CASK_TAP_REGEX.source}/#{HOMEBREW_TAP_CASK_TOKEN_REGEX.source}\Z},
Regexp, Regexp,

16
Library/Homebrew/test/cask/audit_spec.rb
View File

@ -335,22 +335,6 @@ RSpec.describe Cask::Audit, :cask do
end end
end end
context "when cask token contains version designation" do
let(:cask_token) { "token-beta" }
it "fails if the cask is from an official tap" do
allow(cask).to receive(:tap).and_return(CoreCaskTap.instance)
expect(run).to error_with(/token contains version designation/)
end
it "does not fail if the cask is from the `cask-versions` tap" do
allow(cask).to receive(:tap).and_return(Tap.fetch("homebrew/cask-versions"))
expect(run).to pass
end
end
context "when cask token contains launcher" do context "when cask token contains launcher" do
let(:cask_token) { "token-launcher" } let(:cask_token) { "token-launcher" }