update-report: update for core/formula separation
Update the report logic, since now all formulae are in the taps.
This commit is contained in:
parent
56cb3325a6
commit
13141de0fd
@ -8,19 +8,17 @@ module Homebrew
|
|||||||
install_core_tap_if_necessary
|
install_core_tap_if_necessary
|
||||||
|
|
||||||
hub = ReporterHub.new
|
hub = ReporterHub.new
|
||||||
|
updated = false
|
||||||
|
|
||||||
begin
|
initial_revision = ENV["HOMEBREW_UPDATE_BEFORE"].to_s
|
||||||
master_reporter = Reporter.new(CoreTap.instance)
|
current_revision = ENV["HOMEBREW_UPDATE_AFTER"].to_s
|
||||||
rescue Reporter::ReporterRevisionUnsetError => e
|
if initial_revision.empty? || current_revision.empty?
|
||||||
raise e if ARGV.homebrew_developer?
|
|
||||||
odie "update-report should not be called directly!"
|
odie "update-report should not be called directly!"
|
||||||
end
|
end
|
||||||
|
|
||||||
if master_reporter.updated?
|
if initial_revision != current_revision
|
||||||
initial_short = shorten_revision(master_reporter.initial_revision)
|
puts "Updated Homebrew from #{shorten_revision(initial_revision)} to #{shorten_revision(current_revision)}."
|
||||||
current_short = shorten_revision(master_reporter.current_revision)
|
updated = true
|
||||||
puts "Updated Homebrew from #{initial_short} to #{current_short}."
|
|
||||||
hub.add(master_reporter)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
updated_taps = []
|
updated_taps = []
|
||||||
@ -37,12 +35,14 @@ module Homebrew
|
|||||||
hub.add(reporter)
|
hub.add(reporter)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
unless updated_taps.empty?
|
unless updated_taps.empty?
|
||||||
puts "Updated #{updated_taps.size} tap#{plural(updated_taps.size)} " \
|
puts "Updated #{updated_taps.size} tap#{plural(updated_taps.size)} " \
|
||||||
"(#{updated_taps.join(", ")})."
|
"(#{updated_taps.join(", ")})."
|
||||||
|
updated = true
|
||||||
end
|
end
|
||||||
|
|
||||||
if hub.reporters.empty?
|
if !updated
|
||||||
puts "Already up-to-date."
|
puts "Already up-to-date."
|
||||||
elsif hub.empty?
|
elsif hub.empty?
|
||||||
puts "No changes to formulae."
|
puts "No changes to formulae."
|
||||||
@ -194,14 +194,10 @@ class Reporter
|
|||||||
private
|
private
|
||||||
|
|
||||||
def repo_var
|
def repo_var
|
||||||
@repo_var ||= if tap.path == HOMEBREW_REPOSITORY
|
@repo_var ||= tap.path.to_s.
|
||||||
""
|
|
||||||
else
|
|
||||||
tap.path.to_s.
|
|
||||||
strip_prefix(Tap::TAP_DIRECTORY.to_s).
|
strip_prefix(Tap::TAP_DIRECTORY.to_s).
|
||||||
tr("^A-Za-z0-9", "_").
|
tr("^A-Za-z0-9", "_").
|
||||||
upcase
|
upcase
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def diff
|
def diff
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user