aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommy Sparber2016-01-11 20:34:55 +1100
committerMike McQuaid2016-01-17 21:53:20 +0000
commitd675fa0b5a42a615cc1a4d3fdde7c46df1f1ea6a (patch)
tree404216a414842a36a8295dd91997414e2fa022af
parent066dd63a8710b1250310adee15c8070fc5d71164 (diff)
downloadbrew-d675fa0b5a42a615cc1a4d3fdde7c46df1f1ea6a.tar.bz2
Search also in Caskroom/versions Tap
Extending the current search functionallity to search in https://github.com/caskroom/homebrew-versions Closes Homebrew/homebrew#47954. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
-rw-r--r--Library/Homebrew/cmd/search.rb5
-rw-r--r--Library/Homebrew/tap_constants.rb4
2 files changed, 5 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index 1bd942094..8dd1ceb6a 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -84,7 +84,8 @@ module Homebrew
end
SEARCHABLE_TAPS = OFFICIAL_TAPS.map { |tap| ["Homebrew", tap] } + [
- %w[Caskroom cask]
+ %w[Caskroom cask],
+ %w[Caskroom versions]
]
def query_regexp(query)
@@ -104,7 +105,7 @@ module Homebrew
def search_tap(user, repo, rx)
if (HOMEBREW_LIBRARY/"Taps/#{user.downcase}/homebrew-#{repo.downcase}").directory? && \
- "#{user}/#{repo}" != "Caskroom/cask"
+ user != "Caskroom"
return []
end
diff --git a/Library/Homebrew/tap_constants.rb b/Library/Homebrew/tap_constants.rb
index ef8077d1b..b1f724918 100644
--- a/Library/Homebrew/tap_constants.rb
+++ b/Library/Homebrew/tap_constants.rb
@@ -4,5 +4,5 @@ HOMEBREW_TAP_FORMULA_REGEX = %r{^([\w-]+)/([\w-]+)/([\w+-.]+)$}
HOMEBREW_TAP_DIR_REGEX = %r{#{Regexp.escape(HOMEBREW_LIBRARY.to_s)}/Taps/([\w-]+)/([\w-]+)}
# match taps' formula paths, e.g. HOMEBREW_LIBRARY/Taps/someuser/sometap/someformula
HOMEBREW_TAP_PATH_REGEX = Regexp.new(HOMEBREW_TAP_DIR_REGEX.source + %r{/(.*)}.source)
-# match the default brew-cask tap e.g. Caskroom/cask
-HOMEBREW_CASK_TAP_FORMULA_REGEX = %r{^(Caskroom)/(cask)/([\w+-.]+)$}
+# match the default and the versions brew-cask tap e.g. Caskroom/cask or Caskroom/versions
+HOMEBREW_CASK_TAP_FORMULA_REGEX = %r{^(Caskroom)/(cask|versions)/([\w+-.]+)$}