From 26b8c5a27d4ee04c67353a8115cb296337b9ec4f Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 19 Jul 2014 20:25:16 -0500 Subject: [PATCH] Improve pull request URL regexp - use a regexp literal and avoid escaping forward slashes - escape the period in "github.com" - match only hex characters in the commit part - allow hyphen in usernames and repo names, matching what we allow for tap names - avoid unnecessary capture --- Library/Contributions/cmd/brew-pull.rb | 2 +- Library/Homebrew/global.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Contributions/cmd/brew-pull.rb b/Library/Contributions/cmd/brew-pull.rb index c8bc74049a..f6f17a2113 100755 --- a/Library/Contributions/cmd/brew-pull.rb +++ b/Library/Contributions/cmd/brew-pull.rb @@ -29,7 +29,7 @@ ARGV.named.each do |arg| end url = url_match[0] - issue = url_match[4] + issue = url_match[3] end if tap_name = tap(url) diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 2659fb6423..54102f4d56 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -98,7 +98,7 @@ module Homebrew alias_method :failed?, :failed end -HOMEBREW_PULL_OR_COMMIT_URL_REGEX = 'https:\/\/github.com\/(\w+)\/homebrew(-\w+)?\/(pull\/(\d+)|commit\/\w{4,40})' +HOMEBREW_PULL_OR_COMMIT_URL_REGEX = %r[https://github\.com/([\w-]+)/homebrew(-[\w-]+)?/(?:pull/(\d+)|commit/\h{4,40})] require 'compat' unless ARGV.include? "--no-compat" or ENV['HOMEBREW_NO_COMPAT']