From 9f6969b110f828ccbbfe5f44c09766795628d04a Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Fri, 3 Feb 2023 12:58:07 +0900
Subject: [PATCH] Ensure NEWS entry when tagging

---
 rakelib/version.rake | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/rakelib/version.rake b/rakelib/version.rake
index d000562..d8b5644 100644
--- a/rakelib/version.rake
+++ b/rakelib/version.rake
@@ -19,11 +19,8 @@ class << (helper = Bundler::GemHelper.instance)
 
   def version=(v)
     unless v == version
-      news = File.read(File.join(__dir__, "../NEWS.md"))
-      unless /^## +#{Regexp.quote(version.to_s)} -/ =~ news
-        abort "Previous version #{version} is not mentioned in NEWS.md"
-      end
       unless already_tagged?
+        ensure_news("Previous", version)
         abort "Previous version #{version} is not tagged yet"
       end
     end
@@ -31,6 +28,18 @@ class << (helper = Bundler::GemHelper.instance)
     update_source_version
     commit_bump
   end
+
+  def tag_version
+    ensure_news("New", version)
+    super
+  end
+
+  def ensure_news(that, version)
+    news = File.read(File.join(__dir__, "../NEWS.md"))
+    unless /^## +#{Regexp.quote(version.to_s)} -/ =~ news
+      abort "#{that} version #{version} is not mentioned in NEWS.md"
+    end
+  end
 end
 
 major, minor, teeny = helper.gemspec.version.segments
@@ -54,5 +63,5 @@ desc "Bump teeny version"
 task "bump" => "bump:teeny"
 
 task "tag" do
-  helper.__send__(:tag_version)
+  helper.tag_version
 end