make-snapshot: Branch if it's X.Y.Z or X.Y using when

k0kubun · k0kubun · commit 6601640c68b0 · 2025-12-11T16:45:04.000-08:00
It just seems like a completely different input, so it makes more sense
to me to have it as a separate case.

Also, we don't need to support Ruby 2.0 or older.
diff --git a/tool/make-snapshot b/tool/make-snapshot
@@ -274,14 +274,12 @@ def package(vcs, rev, destdir, tmp = nil)
     prerelease = true
     tag = "#{$4}#{$5}"
     url = vcs.tag("v#{$1}_#{$2}_#{$3}_#{$4}#{$5}")
-  when /\A(\d+)\.(\d+)(?:\.(\d+))?\z/
-    if $3 && ($1 > "2" || $1 == "2" && $2 >= "1")
-      patchlevel = true
-      tag = ""
-      url = vcs.tag("v#{$1}_#{$2}_#{$3}")
-    else
-      url = vcs.branch("ruby_#{rev.tr('.', '_')}")
-    end
+  when /\A(\d+)\.(\d+)\.(\d+)\z/
+    patchlevel = true
+    tag = ""
+    url = vcs.tag("v#{$1}_#{$2}_#{$3}")
+  when /\A(\d+)\.(\d+)\z/
+    url = vcs.branch("ruby_#{rev.tr('.', '_')}")
   else
     warn "#{$0}: unknown version - #{rev}"
     return
