Fix tap constants.
This commit is contained in:
parent
d3ef383753
commit
ed07203f9e
@ -5,7 +5,7 @@
|
|||||||
HOMEBREW_TAP_FORMULA_NAME_REGEX = T.let(/(?<name>[\w+\-.@]+)/, Regexp)
|
HOMEBREW_TAP_FORMULA_NAME_REGEX = T.let(/(?<name>[\w+\-.@]+)/, Regexp)
|
||||||
# Match taps' formulae, e.g. `someuser/sometap/someformula`.
|
# Match taps' formulae, e.g. `someuser/sometap/someformula`.
|
||||||
HOMEBREW_TAP_FORMULA_REGEX = T.let(
|
HOMEBREW_TAP_FORMULA_REGEX = T.let(
|
||||||
%r{\A(?<user>[\w-]+)/(?<repo>[\w-]+)/#{HOMEBREW_TAP_FORMULA_NAME_REGEX.source}\Z},
|
%r{\A(?<user>[^/]+)/(?<repo>[^/]+)/#{HOMEBREW_TAP_FORMULA_NAME_REGEX.source}\Z},
|
||||||
Regexp,
|
Regexp,
|
||||||
)
|
)
|
||||||
# Match default formula taps' formulae, e.g. `homebrew/core/someformula` or `someformula`.
|
# Match default formula taps' formulae, e.g. `homebrew/core/someformula` or `someformula`.
|
||||||
@ -18,7 +18,7 @@ HOMEBREW_DEFAULT_TAP_FORMULA_REGEX = T.let(
|
|||||||
HOMEBREW_TAP_CASK_TOKEN_REGEX = T.let(/(?<token>[a-z0-9\-_]+(?:@[a-z0-9\-_.]+)?)/, Regexp)
|
HOMEBREW_TAP_CASK_TOKEN_REGEX = T.let(/(?<token>[a-z0-9\-_]+(?:@[a-z0-9\-_.]+)?)/, Regexp)
|
||||||
# Match taps' casks, e.g. `someuser/sometap/somecask`.
|
# Match taps' casks, e.g. `someuser/sometap/somecask`.
|
||||||
HOMEBREW_TAP_CASK_REGEX = T.let(
|
HOMEBREW_TAP_CASK_REGEX = T.let(
|
||||||
%r{\A(?<user>[\w-]+)/(?<repo>[\w-]+)/#{HOMEBREW_TAP_CASK_TOKEN_REGEX.source}\Z},
|
%r{\A(?<user>[^/]+)/(?<repo>[^/]+)/#{HOMEBREW_TAP_CASK_TOKEN_REGEX.source}\Z},
|
||||||
Regexp,
|
Regexp,
|
||||||
)
|
)
|
||||||
# Match default cask taps' casks, e.g. `homebrew/cask/somecask` or `somecask`.
|
# Match default cask taps' casks, e.g. `homebrew/cask/somecask` or `somecask`.
|
||||||
@ -29,14 +29,19 @@ HOMEBREW_DEFAULT_TAP_CASK_REGEX = T.let(
|
|||||||
|
|
||||||
# Match taps' directory paths, e.g. `HOMEBREW_LIBRARY/Taps/someuser/sometap`.
|
# Match taps' directory paths, e.g. `HOMEBREW_LIBRARY/Taps/someuser/sometap`.
|
||||||
HOMEBREW_TAP_DIR_REGEX = T.let(
|
HOMEBREW_TAP_DIR_REGEX = T.let(
|
||||||
%r{#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Taps/(?<user>[\w-]+)/(?<repo>[\w-]+)},
|
%r{#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Taps/(?<user>[^/]+)/(?<repo>[^/]+)},
|
||||||
Regexp,
|
Regexp,
|
||||||
)
|
)
|
||||||
# Match taps' formula paths, e.g. `HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula`.
|
# Match taps' formula paths, e.g. `HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula`.
|
||||||
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 taps' casks, e.g. `homebrew/cask/somecask or homebrew/cask-versions/somecask`.
|
# Match official cask taps, e.g `homebrew/cask`.
|
||||||
|
HOMEBREW_CASK_TAP_REGEX = T.let(
|
||||||
|
%r{(?:([Cc]askroom)/(cask|versions)|([Hh]omebrew)/(?:homebrew-)?(cask|cask-[\w-]+))},
|
||||||
|
Regexp,
|
||||||
|
)
|
||||||
|
# Match official taps' casks, e.g. `homebrew/cask/somecask` or `homebrew/cask-versions/somecask`.
|
||||||
HOMEBREW_CASK_TAP_CASK_REGEX = T.let(
|
HOMEBREW_CASK_TAP_CASK_REGEX = T.let(
|
||||||
%r{\A(?:([Cc]askroom)/(cask|versions)|([Hh]omebrew)/(?:homebrew-)?(cask|cask-[\w-]+))/([\w+-.]+)\Z},
|
%r{\A#{HOMEBREW_CASK_TAP_REGEX.source}/#{HOMEBREW_TAP_CASK_TOKEN_REGEX.source}\Z},
|
||||||
Regexp,
|
Regexp,
|
||||||
)
|
)
|
||||||
HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX = T.let(/\A(home|linux)brew-/, Regexp)
|
HOMEBREW_OFFICIAL_REPO_PREFIXES_REGEX = T.let(/\A(home|linux)brew-/, Regexp)
|
||||||
|
|||||||
@ -126,6 +126,18 @@ RSpec.describe Tap do
|
|||||||
it "returns the Tap when given its exact path" do
|
it "returns the Tap when given its exact path" do
|
||||||
expect(described_class.from_path(path)).to eq tap
|
expect(described_class.from_path(path)).to eq tap
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "when path contains a dot" do
|
||||||
|
let(:tap) { described_class.fetch("str4d.xyz", "rage") }
|
||||||
|
|
||||||
|
after do
|
||||||
|
tap.uninstall
|
||||||
|
end
|
||||||
|
|
||||||
|
it "returns the Tap when given its exact path" do
|
||||||
|
expect(described_class.from_path(path)).to eq tap
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
specify "::names" do
|
specify "::names" do
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user