tebako-release 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 704f713348ac797af821eb4ad5a18d8a4e0df36e2cdba2367539322a766a9c73
-  data.tar.gz: 34a74c0de836562a84ff77f9f287025b01e8a8ca1049bd0ed1e123b3e31e37da
+  metadata.gz: 70f6056da28a7c62a6025b10993b3e1998ab8b4284a5a6ee86bfe799fd6608f7
+  data.tar.gz: 877d474e2f19e6af7c6d3b49f366ea2040c6fef4e06275d0858409069f82a1e3
 SHA512:
-  metadata.gz: faf9b0a2eadb2e3555676e9430d94f029429e39da686c96065eb0b44ed226a63dc9eed22fc0018278cff0c0b9c38eab67543401a8047b16c68f259c6aede7d69
-  data.tar.gz: 1f5347adb990a2165ea736575d7f98374cd2fcdf3f339838abe9004bf1826bb5918946b4e06b3d661b8a32e986299645a7d0d8276464c54d88fb4dcef9bc2d2f
+  metadata.gz: 1f63cb53bc85a2fb99df775a471f799b1c70ae139ab1525d87458b5bb052bf7e6e32175c990abcccf1f2bc35a0ef69e1a7709a0cb0075c91a6c401a04be49010
+  data.tar.gz: 02a288b0ac6155e10429137d5d7e2d8e4e0fc1afb3f98b6315e15fd763e4cd97de6e8e063c3d0f01f6384b0a83253c2b0e3b2b6a756d8dac7fae296aea6682c7

data/lib/tebako_release/adapter.rb

@@ -47,6 +47,16 @@ module TebakoRelease
       "\\d+\\.\\d+\\.\\d+"
     end
 
+    # The language segment of the package-name grammar
+    # (`tebako-runtime-<ver>-<lang>-<lv>-<triplet>` — tebako#716):
+    # declared by factories publishing the post-#716 spelling. Default
+    # nil — the pre-#716 spelling carried no language segment, and this
+    # machinery keeps composing/parsing it for the immutable releases
+    # that already carry it.
+    def lang_name
+      nil
+    end
+
     # Spec 36's publish shape: when true, each leg publishes ONE bundle
     # (<stem>.tar.gz — exe + env image + DLLs + in-bundle SHA256SUMS) plus
     # its sidecar and shard, instead of the per-file asset enumeration.

data/lib/tebako_release/uploader.rb

@@ -256,7 +256,7 @@ module TebakoRelease
         next unless @config.adapter.capable_pair?(env["os"], env["arch"], version)
 
         platform = Platform.host_id_for(env["os"], env["arch"])
-        "tebako-runtime-#{@version}-#{version}-#{platform}"
+        "tebako-runtime-#{@version}-#{lang_infix}#{version}-#{platform}"
       end
     rescue JSON::ParserError => e
       puts "::warning::Could not compute expected package list: #{e.message}"
@@ -656,15 +656,42 @@ module TebakoRelease
       "#{package.basename.to_s.sub(/\.exe\z/, "")}.dll"
     end
 
+    # The language infix of the package-name grammar: "ruby-" on
+    # post-#716 publishes, empty on the pre-#716 spelling.
+    def lang_infix
+      name = @config.adapter.lang_name
+      name.nil? || name.empty? ? "" : "#{name}-"
+    end
+
+    # The dual-era package-name parse (tebako#716): the pre-#716 spelling
+    # is `tebako-runtime-<ver>-<lv>-<triplet>`; the post-#716 spelling
+    # inserts the factory's language segment. A present segment that
+    # disagrees with the adapter's lang_name is a foreign file, never
+    # this factory's package.
     def parse_package_filename(filename)
       grammar = @config.adapter.version_grammar_source
-      match = /\Atebako-runtime-#{Regexp.escape(@version)}-(#{grammar})-(.+?)(?:\.exe)?\z/.match(filename)
-      unless match
-        puts "::warning::Cannot infer version/platform from package filename: #{filename}"
-        return [nil, nil]
-      end
+      pattern = /\Atebako-runtime-#{Regexp.escape(@version)}-(?:([a-z0-9]+)-)?(#{grammar})-(.+?)(?:\.exe)?\z/
+      match = pattern.match(filename)
+      return warn_unparseable_name(filename) unless match
+      return [match[2], match[3]] unless foreign_lang_segment?(match[1])
+
+      warn_foreign_segment(filename, match[1])
+    end
+
+    # The optional language capture vs the adapter's declaration.
+    def foreign_lang_segment?(lang)
+      lang && @config.adapter.lang_name && lang != @config.adapter.lang_name
+    end
+
+    def warn_unparseable_name(filename)
+      puts "::warning::Cannot infer version/platform from package filename: #{filename}"
+      [nil, nil]
+    end
 
-      [match[1], match[2]]
+    def warn_foreign_segment(filename, lang)
+      puts "::warning::package filename carries a foreign language segment " \
+           "(#{lang}, this factory is #{@config.adapter.lang_name}): #{filename}"
+      [nil, nil]
     end
 
     # The upload retry budget: escalating delays, ~4.5 minutes of patience.

data/lib/tebako_release/version.rb

@@ -5,5 +5,5 @@
 # This file is a part of tamatebako
 
 module TebakoRelease
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tebako-release
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ribose Inc