admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #3729 from ilovezfs/bump-formula-pr-more-enhancements

Browse Source 
bump-formula-pr: more enhancements.
This commit is contained in:
ilovezfs 2018-01-29 22:50:03 -08:00 committed by GitHub
commit c77cafcf82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Library/Homebrew/dev-cmd/bump-formula-pr.rb
View File

@ -137,9 +137,16 @@ module Homebrew
new_url = ARGV.value("url") new_url = ARGV.value("url")
if new_url && !formula if new_url && !formula
is_devel = ARGV.include?("--devel") # Split the new URL on / and find any formulae that have the same URL
base_url = new_url.split("/")[0..4].join("/") # except for the last component, but don't try to match any more than the
# first five components since sometimes the last component isn't the only
# one to change.
new_url_split = new_url.split("/")
maximum_url_components_to_match = 5
components_to_match = [new_url_split.count - 1, maximum_url_components_to_match].min
base_url = new_url_split.first(components_to_match).join("/")
base_url = /#{Regexp.escape(base_url)}/ base_url = /#{Regexp.escape(base_url)}/
is_devel = ARGV.include?("--devel")
guesses = [] guesses = []
Formula.each do |f| Formula.each do |f|
if is_devel && f.devel && f.devel.url && f.devel.url.match(base_url) if is_devel && f.devel && f.devel.url && f.devel.url.match(base_url)
@ -184,14 +191,14 @@ module Homebrew
elsif !new_url elsif !new_url
odie "#{formula}: no --url= argument specified!" odie "#{formula}: no --url= argument specified!"
else else
resource_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/ new_mirror = case new_url
new_mirror = new_url.sub "ftpmirror.gnu.org", "ftp.gnu.org/gnu" when requested_spec != :devel && %r{.*ftp.gnu.org/gnu.*}
new_mirror new_url.sub "ftp.gnu.org/gnu", "ftpmirror.gnu.org"
else when %r{.*mirrors.ocf.berkeley.edu/debian.*}
new_url new_url.sub "mirrors.ocf.berkeley.edu/debian", "mirrorservice.org/sites/ftp.debian.org/debian"
end end
resource = Resource.new { @url = resource_url } resource = Resource.new { @url = new_url }
resource.download_strategy = CurlDownloadStrategy resource.download_strategy = DownloadStrategyDetector.detect_from_url(new_url)
resource.owner = Resource.new(formula.name) resource.owner = Resource.new(formula.name)
resource.version = forced_version if forced_version resource.version = forced_version if forced_version
odie "No --version= argument specified!" unless resource.version odie "No --version= argument specified!" unless resource.version
@ -225,12 +232,12 @@ module Homebrew
end end
replacement_pairs += formula_spec.mirrors.map do |mirror| replacement_pairs += formula_spec.mirrors.map do |mirror|
[/ +mirror \"#{mirror}\"\n/m, ""] [/ +mirror \"#{Regexp.escape(mirror)}\"\n/m, ""]
end end
replacement_pairs += if new_url_hash replacement_pairs += if new_url_hash
[ [
[formula_spec.url, new_url], [/#{Regexp.escape(formula_spec.url)}/, new_url],
[old_hash, new_hash], [old_hash, new_hash],
] ]
else else
@ -243,7 +250,7 @@ module Homebrew
backup_file = File.read(formula.path) unless ARGV.dry_run? backup_file = File.read(formula.path) unless ARGV.dry_run?
if new_mirror if new_mirror
replacement_pairs << [/^( +)(url \"#{new_url}\"\n)/m, "\\1\\2\\1mirror \"#{new_mirror}\"\n"] replacement_pairs << [/^( +)(url \"#{Regexp.escape(new_url)}\"\n)/m, "\\1\\2\\1mirror \"#{new_mirror}\"\n"]
end end
if forced_version && forced_version != "0" if forced_version && forced_version != "0"
@ -260,7 +267,7 @@ module Homebrew
end end
elsif forced_version && forced_version == "0" elsif forced_version && forced_version == "0"
if requested_spec == :stable if requested_spec == :stable
replacement_pairs << [/^ version \"[a-z\d+\.]+\"\n/m, ""] replacement_pairs << [/^ version \"[\w\.\-\+]+\"\n/m, ""]
elsif requested_spec == :devel elsif requested_spec == :devel
replacement_pairs << [/( devel do.+?)^ +version \"[^\n]+\"\n(.+?end\n)/m, "\\1\\2"] replacement_pairs << [/( devel do.+?)^ +version \"[^\n]+\"\n(.+?end\n)/m, "\\1\\2"]
end end