tool/format-release: Carve out the version format logic

k0kubun · k0kubun · commit ec4c46709b74 · 2025-12-11T17:50:29.000-08:00
to share it with tool/releng/update-www-meta.rb and another place I'm
going to modify next.
diff --git a/tool/format-release b/tool/format-release
@@ -9,6 +9,7 @@ end
 
 require "open-uri"
 require "yaml"
+require_relative "./ruby-version"
 
 Diffy::Diff.default_options.merge!(
   include_diff_info: true,
@@ -54,27 +55,7 @@ eom
     unless /\A(\d+)\.(\d+)\.(\d+)(?:-(?:preview|rc)\d+)?\z/ =~ version
       raise "unexpected version string '#{version}'"
     end
-    x = $1.to_i
-    y = $2.to_i
-    z = $3.to_i
-    # previous tag for git diff --shortstat
-    # It's only for x.y.0 release
-    if z != 0
-      prev_tag = nil
-    elsif y != 0
-      prev_ver = "#{x}.#{y-1}.0"
-      prev_tag = version_tag(prev_ver)
-    else # y == 0 && z == 0
-      case x
-      when 3
-        prev_ver = "2.7.0"
-      when 4
-        prev_ver = "3.4.0"
-      else
-        raise "it doesn't know what is the previous version of '#{version}'"
-      end
-      prev_tag = version_tag(prev_ver)
-    end
+    teeny = Integer($3)
 
     uri = "https://cache.ruby-lang.org/pub/tmp/ruby-info-#{version}-draft.yml"
     info = YAML.unsafe_load(URI(uri).read)
@@ -92,9 +73,10 @@ eom
       tarballs << tarball
     end
 
-    if prev_tag
+    if teeny == 0
       # show diff shortstat
-      tag = version_tag(version)
+      tag = RubyVersion.tag(version)
+      prev_tag = RubyVersion.tag(RubyVersion.previous(version))
       stat = `git -C #{rubydir} diff -l0 --shortstat #{prev_tag}..#{tag}`
       files_changed, insertions, deletions = stat.scan(/\d+/)
     end
@@ -188,7 +170,7 @@ eom
     if /\.0(?:-\w+)?\z/ =~ ver
       # preview, rc, or first release
       entry <<= <<eom
-  tag: #{version_tag(ver)}
+  tag: #{RubyVersion.version_tag(ver)}
   stats:
     files_changed: #{files_changed}
     insertions: #{insertions}
@@ -247,15 +229,6 @@ eom
       puts line
     end
   end
-
-  def self.version_tag(version)
-    major_version = Integer(version.split('.', 2)[0])
-    if major_version >= 4
-      "v#{version}"
-    else
-      "v#{version.tr('.-', '_')}"
-    end
-  end
 end
 
 def main
diff --git a/tool/releng/update-www-meta.rb b/tool/releng/update-www-meta.rb
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require "open-uri"
 require "yaml"
+require_relative "../ruby-version"
 
 class Tarball
   attr_reader :version, :size, :sha1, :sha256, :sha512
@@ -41,27 +42,7 @@ def self.parse(wwwdir, version)
     unless /\A(\d+)\.(\d+)\.(\d+)(?:-(?:preview|rc)\d+)?\z/ =~ version
       raise "unexpected version string '#{version}'"
     end
-    x = $1.to_i
-    y = $2.to_i
-    z = $3.to_i
-    # previous tag for git diff --shortstat
-    # It's only for x.y.0 release
-    if z != 0
-      prev_tag = nil
-    elsif y != 0
-      prev_ver = "#{x}.#{y-1}.0"
-      prev_tag = version_tag(prev_ver)
-    else # y == 0 && z == 0
-      case x
-      when 3
-        prev_ver = "2.7.0"
-      when 4
-        prev_ver = "3.4.0"
-      else
-        raise "it doesn't know what is the previous version of '#{version}'"
-      end
-      prev_tag = version_tag(prev_ver)
-    end
+    teeny = Integer($3)
 
     uri = "https://cache.ruby-lang.org/pub/tmp/ruby-info-#{version}-draft.yml"
     info = YAML.load(URI(uri).read)
@@ -79,9 +60,10 @@ def self.parse(wwwdir, version)
       tarballs << tarball
     end
 
-    if prev_tag
+    if teeny == 0
       # show diff shortstat
-      tag = version_tag(version)
+      tag = RubyVersion.tag(version)
+      prev_tag = RubyVersion.tag(RubyVersion.previous(version))
       rubydir = File.expand_path(File.join(__FILE__, '../../../'))
       puts %`git -C #{rubydir} diff --shortstat #{prev_tag}..#{tag}`
       stat = `git -C #{rubydir} diff --shortstat #{prev_tag}..#{tag}`
@@ -160,7 +142,7 @@ def self.update_releases_yml(ver, xy, ary, wwwdir, files_changed, insertions, de
     date = Time.now.utc # use utc to use previous day in midnight
     entry = <<eom
 - version: #{ver}
-  tag: #{version_tag(ver)}
+  tag: #{RubyVersion.tag(ver)}
   date: #{date.strftime("%Y-%m-%d")}
   post: /en/news/#{date.strftime("%Y/%m/%d")}/ruby-#{ver.tr('.', '-')}-released/
   stats:
@@ -196,15 +178,6 @@ def self.update_releases_yml(ver, xy, ary, wwwdir, files_changed, insertions, de
     end
     File.write(File.join(wwwdir, filename), data)
   end
-
-  def self.version_tag(version)
-    major_version = Integer(version.split('.', 2)[0])
-    if major_version >= 4
-      "v#{version}"
-    else
-      "v#{version.tr('.-', '_')}"
-    end
-  end
 end
 
 # Confirm current directory is www.ruby-lang.org's working directory
diff --git a/tool/ruby-version.rb b/tool/ruby-version.rb
@@ -0,0 +1,37 @@
+module RubyVersion
+  def self.tag(version)
+    major_version = Integer(version.split('.', 2)[0])
+    if major_version >= 4
+      "v#{version}"
+    else
+      "v#{version.tr('.-', '_')}"
+    end
+  end
+
+  # Return the previous version to be used for release diff links.
+  # For a ".0" version, it returns the previous ".0" version.
+  # For a non-".0" version, it returns the previous teeny version.
+  def self.previous(version)
+    unless /\A(\d+)\.(\d+)\.(\d+)(?:-(?:preview|rc)\d+)?\z/ =~ version
+      raise "unexpected version string '#{version}'"
+    end
+    major = Integer($1)
+    minor = Integer($2)
+    teeny = Integer($3)
+
+    if teeny != 0
+      "#{major}.#{minor}.#{teeny-1}"
+    elsif minor != 0 # && teeny == 0
+      "#{major}.#{minor-1}.#{teeny}"
+    else # minor == 0 && teeny == 0
+      case major
+      when 3
+        "2.7.0"
+      when 4
+        "3.4.0"
+      else
+        raise "it doesn't know what is the previous version of '#{version}'"
+      end
+    end
+  end
+end
