From 44f1354d63d8c95a61bb12353838c03e9abbebb6 Mon Sep 17 00:00:00 2001
From: Josh Hagins
Date: Wed, 19 Oct 2016 11:54:30 -0400
Subject: hbc/qualified_token: simplify token parsing

- Stop supporting archaic "user-repo/token" syntax
- Move regex for parsing tapped Cask token to tap_constants
---
 Library/Homebrew/cask/lib/hbc/qualified_token.rb | 36 ++++--------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

(limited to 'Library/Homebrew/cask')

diff --git a/Library/Homebrew/cask/lib/hbc/qualified_token.rb b/Library/Homebrew/cask/lib/hbc/qualified_token.rb
index 8868bd65d..21fe99682 100644
--- a/Library/Homebrew/cask/lib/hbc/qualified_token.rb
+++ b/Library/Homebrew/cask/lib/hbc/qualified_token.rb
@@ -1,37 +1,11 @@
 module Hbc
   module QualifiedToken
-    REPO_PREFIX = "homebrew-".freeze
-
-    # per https://github.com/Homebrew/homebrew/blob/4c7bc9ec3bca729c898ee347b6135ba692ee0274/Library/Homebrew/cmd/tap.rb#L121
-    USER_REGEX = /[a-z0-9_\-]+/
-
-    # per https://github.com/Homebrew/homebrew/blob/4c7bc9ec3bca729c898ee347b6135ba692ee0274/Library/Homebrew/cmd/tap.rb#L121
-    REPO_REGEX = /(?:#{REPO_PREFIX})?\w+/
-
-    # per https://github.com/caskroom/homebrew-cask/blob/master/CONTRIBUTING.md#generating-a-token-for-the-cask
-    TOKEN_REGEX = /[a-z0-9\-]+/
-
-    TAP_REGEX = %r{#{USER_REGEX}[/\-]#{REPO_REGEX}}
-
-    QUALIFIED_TOKEN_REGEX = %r{#{TAP_REGEX}/#{TOKEN_REGEX}}
-
     def self.parse(arg)
-      return nil unless arg.is_a?(String) && arg.downcase =~ /^#{QUALIFIED_TOKEN_REGEX}$/
-      path_elements = arg.downcase.split("/")
-      if path_elements.count == 2
-        # eg phinze-cask/google-chrome.
-        # Not certain this form is needed, but it was supported in the past.
-        token = path_elements[1]
-        dash_elements = path_elements[0].split("-")
-        repo = dash_elements.pop
-        dash_elements.pop if dash_elements.count > 1 && dash_elements[-1] + "-" == REPO_PREFIX
-        user = dash_elements.join("-")
-      else
-        # eg caskroom/cask/google-chrome
-        # per https://github.com/Homebrew/brew/blob/master/docs/brew-tap.md
-        user, repo, token = path_elements
-      end
-      repo.sub!(/^#{REPO_PREFIX}/, "")
+      return nil unless arg.is_a?(String)
+      return nil unless arg.downcase =~ HOMEBREW_TAP_CASK_REGEX
+      # eg caskroom/cask/google-chrome
+      # per https://github.com/Homebrew/brew/blob/master/docs/brew-tap.md
+      user, repo, token = arg.downcase.split("/")
       odebug "[user, repo, token] might be [#{user}, #{repo}, #{token}]"
       [user, repo, token]
     end
-- 
cgit v1.2.3


From b2870c2480744aa7d202c4975e3169b05035f7ed Mon Sep 17 00:00:00 2001
From: Josh Hagins
Date: Mon, 24 Oct 2016 09:50:33 -0400
Subject: hbc/qualified_token: use regex captures instead of String#split

---
 Library/Homebrew/cask/lib/hbc/qualified_token.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Library/Homebrew/cask')

diff --git a/Library/Homebrew/cask/lib/hbc/qualified_token.rb b/Library/Homebrew/cask/lib/hbc/qualified_token.rb
index 21fe99682..09eedef1b 100644
--- a/Library/Homebrew/cask/lib/hbc/qualified_token.rb
+++ b/Library/Homebrew/cask/lib/hbc/qualified_token.rb
@@ -2,10 +2,8 @@ module Hbc
   module QualifiedToken
     def self.parse(arg)
       return nil unless arg.is_a?(String)
-      return nil unless arg.downcase =~ HOMEBREW_TAP_CASK_REGEX
-      # eg caskroom/cask/google-chrome
-      # per https://github.com/Homebrew/brew/blob/master/docs/brew-tap.md
-      user, repo, token = arg.downcase.split("/")
+      return nil unless match = arg.downcase.match(HOMEBREW_TAP_CASK_REGEX)
+      user, repo, token = match.captures
       odebug "[user, repo, token] might be [#{user}, #{repo}, #{token}]"
       [user, repo, token]
     end
-- 
cgit v1.2.3