Merge pull request #8395 from miccal/cask_new

cmd/update-report: consistency across formulae and casks
This commit is contained in:
Mike McQuaid 2020-08-20 08:28:48 +01:00 committed by GitHub
commit 8041649cac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -198,8 +198,10 @@ class Reporter
next unless dst.extname == ".rb" next unless dst.extname == ".rb"
if paths.any? { |p| tap.cask_file?(p) } if paths.any? { |p| tap.cask_file?(p) }
# Currently only need to handle Cask deletion/migration.
case status case status
when "A"
# Have a dedicated report array for new casks.
@report[:AC] << tap.formula_file_to_name(src)
when "D" when "D"
# Have a dedicated report array for deleted casks. # Have a dedicated report array for deleted casks.
@report[:DC] << tap.formula_file_to_name(src) @report[:DC] << tap.formula_file_to_name(src)
@ -446,6 +448,7 @@ class ReporterHub
end end
dump_formula_report :R, "Renamed Formulae" dump_formula_report :R, "Renamed Formulae"
dump_formula_report :D, "Deleted Formulae" dump_formula_report :D, "Deleted Formulae"
dump_formula_report :AC, "New Casks"
dump_formula_report :MC, "Updated Casks" dump_formula_report :MC, "Updated Casks"
dump_formula_report :DC, "Deleted Casks" dump_formula_report :DC, "Deleted Casks"
end end
@ -462,6 +465,8 @@ class ReporterHub
"#{name} -> #{new_name}" "#{name} -> #{new_name}"
when :A when :A
name unless installed?(name) name unless installed?(name)
when :AC
name unless cask_installed?(name)
when :MC, :DC when :MC, :DC
name = name.split("/").last name = name.split("/").last
cask_installed?(name) ? pretty_installed(name) : name cask_installed?(name) ? pretty_installed(name) : name