Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bump-formula-pr: more enhancements. #3729

Merged
merged 6 commits into from
Jan 30, 2018
Merged

bump-formula-pr: more enhancements. #3729

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99bb068
bump-formula-pr: improve formula name guessing.
ilovezfs Jan 24, 2018
e46fbdd
bump-formula-pr: update GNU mirror handling.
ilovezfs Jan 24, 2018
6460a34
bump-formula-pr: add Debian mirror handling.
ilovezfs Jan 24, 2018
edd1c76
bump-formula-pr: detect download strategy from url.
ilovezfs Jan 24, 2018
98e48a9
bump-formula-pr: regex escape urls in replacements.
ilovezfs Jan 24, 2018
ccbe494
bump-formula-pr: improve version formula component regex.
ilovezfs Jan 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions Library/Homebrew/dev-cmd/bump-formula-pr.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,16 @@ def bump_formula_pr

new_url = ARGV.value("url")
if new_url && !formula
is_devel = ARGV.include?("--devel")
base_url = new_url.split("/")[0..4].join("/")
# Split the new URL on / and find any formulae that have the same URL
# 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)}/
is_devel = ARGV.include?("--devel")
guesses = []
Formula.each do |f|
if is_devel && f.devel && f.devel.url && f.devel.url.match(base_url)
Expand Down Expand Up @@ -184,14 +191,14 @@ def bump_formula_pr
elsif !new_url
odie "#{formula}: no --url= argument specified!"
else
resource_url = if requested_spec != :devel && new_url =~ /.*ftpmirror.gnu.*/
new_mirror = new_url.sub "ftpmirror.gnu.org", "ftp.gnu.org/gnu"
new_mirror
else
new_url
new_mirror = case new_url
when requested_spec != :devel && %r{.*ftp.gnu.org/gnu.*}
new_url.sub "ftp.gnu.org/gnu", "ftpmirror.gnu.org"
when %r{.*mirrors.ocf.berkeley.edu/debian.*}
new_url.sub "mirrors.ocf.berkeley.edu/debian", "mirrorservice.org/sites/ftp.debian.org/debian"
end
resource = Resource.new { @url = resource_url }
resource.download_strategy = CurlDownloadStrategy
resource = Resource.new { @url = new_url }
resource.download_strategy = DownloadStrategyDetector.detect_from_url(new_url)
resource.owner = Resource.new(formula.name)
resource.version = forced_version if forced_version
odie "No --version= argument specified!" unless resource.version
Expand Down Expand Up @@ -225,12 +232,12 @@ def bump_formula_pr
end

replacement_pairs += formula_spec.mirrors.map do |mirror|
[/ +mirror \"#{mirror}\"\n/m, ""]
[/ +mirror \"#{Regexp.escape(mirror)}\"\n/m, ""]
end

replacement_pairs += if new_url_hash
[
[formula_spec.url, new_url],
[/#{Regexp.escape(formula_spec.url)}/, new_url],
[old_hash, new_hash],
]
else
Expand All @@ -243,7 +250,7 @@ def bump_formula_pr
backup_file = File.read(formula.path) unless ARGV.dry_run?

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

if forced_version && forced_version != "0"
Expand All @@ -260,7 +267,7 @@ def bump_formula_pr
end
elsif forced_version && forced_version == "0"
if requested_spec == :stable
replacement_pairs << [/^ version \"[a-z\d+\.]+\"\n/m, ""]
replacement_pairs << [/^ version \"[\w\.\-\+]+\"\n/m, ""]
elsif requested_spec == :devel
replacement_pairs << [/( devel do.+?)^ +version \"[^\n]+\"\n(.+?end\n)/m, "\\1\\2"]
end
Expand Down