From 32e42e064d678b97c8676dd2cbb3e22f305c5789 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Mon, 21 Oct 2013 04:24:54 +0100
Subject: global: unify tap regex.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/Homebrew/cmd/search.rb | 8 +-------
 Library/Homebrew/exceptions.rb | 2 +-
 Library/Homebrew/global.rb     | 5 +++++
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cmd/search.rb b/Library/Homebrew/cmd/search.rb
index b2febbdba..204a178ae 100644
--- a/Library/Homebrew/cmd/search.rb
+++ b/Library/Homebrew/cmd/search.rb
@@ -4,12 +4,6 @@ require 'utils'
 require 'utils/json'
 
 module Homebrew extend self
-
-  # A regular expession to capture the username (one or more char but no `/`,
-  # which has to be escaped like `\/`), repository, followed by an optional `/`
-  # and an optional query.
-  TAP_QUERY_REGEX = /^([^\/]+)\/([^\/]+)\/?(.+)?$/
-
   def search
     if ARGV.include? '--macports'
       exec_browser "http://www.macports.org/ports.php?by=name&substr=#{ARGV.next}"
@@ -25,7 +19,7 @@ module Homebrew extend self
       exec_browser "http://packages.ubuntu.com/search?keywords=#{ARGV.next}&searchon=names&suite=all&section=all"
     elsif (query = ARGV.first).nil?
       puts_columns Formula.names
-    elsif ARGV.first =~ TAP_QUERY_REGEX
+    elsif ARGV.first =~ HOMEBREW_TAP_REGEX
       # So look for user/repo/query or list all formulae by the tap
       # we downcase to avoid case-insensitive filesystem issues.
       user, repo, query = $1.downcase, $2.downcase, $3
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index c0e9a8c73..1ea06381a 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -44,7 +44,7 @@ class FormulaUnavailableError < RuntimeError
   end
 
   def to_s
-    if name =~ %r{(\w+)/(\w+)/([^/]+)} then <<-EOS.undent
+    if name =~ HOMEBREW_TAP_REGEX then <<-EOS.undent
       No available formula for #$3 #{dependent_s}
       Please tap it and then try again: brew tap #$1/#$2
       EOS
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index dc809021d..2345997c0 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -83,6 +83,11 @@ HOMEBREW_USER_AGENT = "Homebrew #{HOMEBREW_VERSION} (Ruby #{RUBY_VERSION}-#{RUBY
 
 HOMEBREW_CURL_ARGS = '-f#LA'
 
+# A regular expession to capture the username (one or more char but no `/`,
+# which has to be escaped like `\/`), repository, followed by an optional `/`
+# and an optional query.
+HOMEBREW_TAP_REGEX = /^([^\/]+)\/([^\/]+)\/?(.+)?$/
+
 module Homebrew extend self
   include FileUtils
 
-- 
cgit v1.2.3