From ae2196fa57498ba0edad7f43fe0d3d9fa8993468 Mon Sep 17 00:00:00 2001 From: Darren Kavanagh Date: Mon, 4 Jul 2022 11:03:14 -0700 Subject: [PATCH 1/8] Use x_tag instead of x_repository_version --- Library/Homebrew/cmd/update-report.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 500185a59f..c9f18a92c2 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -115,7 +115,7 @@ module Homebrew install_core_tap_if_necessary updated = false - new_repository_version = nil + new_tag = nil initial_revision = ENV["HOMEBREW_UPDATE_BEFORE"].to_s current_revision = ENV["HOMEBREW_UPDATE_AFTER"].to_s @@ -135,7 +135,6 @@ module Homebrew if old_tag.blank? || (new_tag == old_tag) puts "Updated Homebrew from #{shorten_revision(initial_revision)} to #{shorten_revision(current_revision)}." else - new_repository_version = new_tag puts "Updated Homebrew from #{old_tag} (#{shorten_revision(initial_revision)}) " \ "to #{new_tag} (#{shorten_revision(current_revision)})." end @@ -235,20 +234,20 @@ module Homebrew EOS end - return if new_repository_version.blank? + return if new_tag.blank? || new_tag == old_tag puts - ohai "Homebrew was updated to version #{new_repository_version}" - Settings.write "latesttag", new_repository_version - if new_repository_version.split(".").last == "0" + ohai "Homebrew was updated to version #{new_tag}" + Settings.write "latesttag", new_tag if new_tag != old_tag + if new_tag.split(".").last == "0" puts <<~EOS More detailed release notes are available on the Homebrew Blog: - #{Formatter.url("https://brew.sh/blog/#{new_repository_version}")} + #{Formatter.url("https://brew.sh/blog/#{new_tag}")} EOS elsif !args.quiet? puts <<~EOS The changelog can be found at: - #{Formatter.url("https://github.com/Homebrew/brew/releases/tag/#{new_repository_version}")} + #{Formatter.url("https://github.com/Homebrew/brew/releases/tag/#{new_tag}")} EOS end end From a94f6ec50c5bc27bcd5b13e134462bebe6e3e347 Mon Sep 17 00:00:00 2001 From: Darren Kavanagh Date: Sat, 25 Jun 2022 17:20:47 -0700 Subject: [PATCH 2/8] Update latesttag in all cases Set latesttag before it is bypassed by return statement and old_tag being blank. --- Library/Homebrew/cmd/update-report.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index c9f18a92c2..5203ed8bc3 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -132,6 +132,8 @@ module Homebrew "git", "-C", HOMEBREW_REPOSITORY, "tag", "--list", "--sort=-version:refname", "*.*" ).lines.first.chomp + Settings.write "latesttag", new_tag if new_tag != old_tag + if old_tag.blank? || (new_tag == old_tag) puts "Updated Homebrew from #{shorten_revision(initial_revision)} to #{shorten_revision(current_revision)}." else @@ -238,7 +240,6 @@ module Homebrew puts ohai "Homebrew was updated to version #{new_tag}" - Settings.write "latesttag", new_tag if new_tag != old_tag if new_tag.split(".").last == "0" puts <<~EOS More detailed release notes are available on the Homebrew Blog: From 700e2f19f108ab3b354d939352921952247be6b2 Mon Sep 17 00:00:00 2001 From: Darren Kavanagh Date: Thu, 30 Jun 2022 18:41:44 -0700 Subject: [PATCH 3/8] Expand output excluded by quiet --- Library/Homebrew/cmd/update-report.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 5203ed8bc3..dfa33b0933 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -236,7 +236,7 @@ module Homebrew EOS end - return if new_tag.blank? || new_tag == old_tag + return if new_tag.blank? || new_tag == old_tag || args.quiet? puts ohai "Homebrew was updated to version #{new_tag}" @@ -245,7 +245,7 @@ module Homebrew More detailed release notes are available on the Homebrew Blog: #{Formatter.url("https://brew.sh/blog/#{new_tag}")} EOS - elsif !args.quiet? + else puts <<~EOS The changelog can be found at: #{Formatter.url("https://github.com/Homebrew/brew/releases/tag/#{new_tag}")} From bc8103d3564255c8c7a56a0f2b8e38cec4e4581c Mon Sep 17 00:00:00 2001 From: Darren Kavanagh Date: Tue, 28 Jun 2022 00:02:45 -0700 Subject: [PATCH 4/8] Highlight release notes when version changes Highlight release notes when the current version is updated to a newer version (either major or minor) not just when revision version is zero (e.g. x.x.0). --- Library/Homebrew/cmd/update-report.rb | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index dfa33b0933..10d1527ed3 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -240,17 +240,22 @@ module Homebrew puts ohai "Homebrew was updated to version #{new_tag}" - if new_tag.split(".").last == "0" + new_major_version, new_minor_version, new_patch_version = new_tag.split(".").map(&:to_i) + old_major_version, old_minor_version = (old_tag.split(".")[0, 2]).map(&:to_i) if old_tag.present? + if old_tag.blank? || new_major_version > old_major_version \ + || new_minor_version > old_minor_version puts <<~EOS More detailed release notes are available on the Homebrew Blog: - #{Formatter.url("https://brew.sh/blog/#{new_tag}")} - EOS - else - puts <<~EOS - The changelog can be found at: - #{Formatter.url("https://github.com/Homebrew/brew/releases/tag/#{new_tag}")} + #{Formatter.url("https://brew.sh/blog/#{new_major_version}.#{new_minor_version}.0")} EOS end + + return if new_patch_version.zero? + + puts <<~EOS + The changelog can be found at: + #{Formatter.url("https://github.com/Homebrew/brew/releases/tag/#{new_tag}")} + EOS end def shorten_revision(revision) From 387515e75af199815b564fe7609d294c7a285c68 Mon Sep 17 00:00:00 2001 From: Darren Kavanagh Date: Wed, 6 Jul 2022 23:15:38 -0700 Subject: [PATCH 5/8] State version number in messages --- Library/Homebrew/cmd/update-report.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 10d1527ed3..9b3a647349 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -137,7 +137,7 @@ module Homebrew if old_tag.blank? || (new_tag == old_tag) puts "Updated Homebrew from #{shorten_revision(initial_revision)} to #{shorten_revision(current_revision)}." else - puts "Updated Homebrew from #{old_tag} (#{shorten_revision(initial_revision)}) " \ + ohai "Updated Homebrew from #{old_tag} (#{shorten_revision(initial_revision)}) " \ "to #{new_tag} (#{shorten_revision(current_revision)})." end end @@ -239,13 +239,13 @@ module Homebrew return if new_tag.blank? || new_tag == old_tag || args.quiet? puts - ohai "Homebrew was updated to version #{new_tag}" + new_major_version, new_minor_version, new_patch_version = new_tag.split(".").map(&:to_i) old_major_version, old_minor_version = (old_tag.split(".")[0, 2]).map(&:to_i) if old_tag.present? if old_tag.blank? || new_major_version > old_major_version \ || new_minor_version > old_minor_version puts <<~EOS - More detailed release notes are available on the Homebrew Blog: + The #{new_major_version}.#{new_minor_version}.0 release notes are available on the Homebrew Blog: #{Formatter.url("https://brew.sh/blog/#{new_major_version}.#{new_minor_version}.0")} EOS end @@ -253,7 +253,7 @@ module Homebrew return if new_patch_version.zero? puts <<~EOS - The changelog can be found at: + The #{new_tag} changelog can be found at: #{Formatter.url("https://github.com/Homebrew/brew/releases/tag/#{new_tag}")} EOS end From a25f827b8fb88a0f61872b95d408f7d58e3fdaf4 Mon Sep 17 00:00:00 2001 From: Darren Kavanagh Date: Wed, 6 Jul 2022 23:24:01 -0700 Subject: [PATCH 6/8] Report new_tag even when old_tag blank --- Library/Homebrew/cmd/update-report.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index 9b3a647349..ad460866fe 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -134,8 +134,11 @@ module Homebrew Settings.write "latesttag", new_tag if new_tag != old_tag - if old_tag.blank? || (new_tag == old_tag) + if new_tag == old_tag puts "Updated Homebrew from #{shorten_revision(initial_revision)} to #{shorten_revision(current_revision)}." + elsif old_tag.blank? + ohai "Updated Homebrew from #{shorten_revision(initial_revision)} " \ + "to #{new_tag} (#{shorten_revision(current_revision)})." else ohai "Updated Homebrew from #{old_tag} (#{shorten_revision(initial_revision)}) " \ "to #{new_tag} (#{shorten_revision(current_revision)})." From b878d9c1ca3a25429f4ad6501a4f4636978d4cc7 Mon Sep 17 00:00:00 2001 From: Darren Kavanagh Date: Thu, 7 Jul 2022 14:17:00 -0700 Subject: [PATCH 7/8] Highlight new revision message --- Library/Homebrew/cmd/update-report.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index ad460866fe..cf6aac0424 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -135,7 +135,7 @@ module Homebrew Settings.write "latesttag", new_tag if new_tag != old_tag if new_tag == old_tag - puts "Updated Homebrew from #{shorten_revision(initial_revision)} to #{shorten_revision(current_revision)}." + ohai "Updated Homebrew from #{shorten_revision(initial_revision)} to #{shorten_revision(current_revision)}." elsif old_tag.blank? ohai "Updated Homebrew from #{shorten_revision(initial_revision)} " \ "to #{new_tag} (#{shorten_revision(current_revision)})." From da4bf679def7fee08f3856c35130a90ed8ea240a Mon Sep 17 00:00:00 2001 From: Darren Kavanagh Date: Wed, 6 Jul 2022 23:24:25 -0700 Subject: [PATCH 8/8] Add new line after donate message --- Library/Homebrew/cmd/update-report.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/update-report.rb b/Library/Homebrew/cmd/update-report.rb index cf6aac0424..89b8f50fca 100644 --- a/Library/Homebrew/cmd/update-report.rb +++ b/Library/Homebrew/cmd/update-report.rb @@ -106,7 +106,7 @@ module Homebrew if Settings.read("donationmessage") != "true" && !args.quiet? ohai "Homebrew is run entirely by unpaid volunteers. Please consider donating:" - puts " #{Formatter.url("https://github.com/Homebrew/brew#donations")}\n" + puts " #{Formatter.url("https://github.com/Homebrew/brew#donations")}\n\n" # Consider the message possibly missed if not a TTY. Settings.write "donationmessage", true if $stdout.tty?