tebako-runtime 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e6335f63f8a3104c6ad7b50f20d8194023a67726cf2bb98f41c6a4d7393132c
-  data.tar.gz: c30b8c93b4cb5635674899a5a7144e6e0da06ddd5aba440bab6d78ab9a4387a4
+  metadata.gz: 6ba52d9e206dd564fbe88cf079186d2dbfe06fad5b842cf4163230f9871c3b07
+  data.tar.gz: 7850d54601ade1c550764b32707b37ba79aeb607b40ebb9ac47e9bb5c37a76a5
 SHA512:
-  metadata.gz: 81c147d430ca924de2a18ae0f055ac06a45927c041337af0f77a090568c2dc514bd996816ff0a7d5163e8b81d792deb90e65a0583c6ae114cf3f2494cf4d03de
-  data.tar.gz: babbc69b875c0ce6c5308bcb41ab9e06457d1ab5f007556b14acc4dcc52ff63a9014fa343a6a667523f51efbc1ba6dd14e2edd835d7a07b4276a7370e92a75b2
+  metadata.gz: 9df00fb7bd933634a0348458be54624f701b3106b12c0a358c8e4603c53a309508a28cad0bfdd00cc4e761f2a346676f24d3f1ab55bd4a0d1196c7cdb2b34842
+  data.tar.gz: 2e1c99b83a6c9b763378afc693c994d3b8b527f4a78c70de656a2709c279d5b71e4c00f81e7188edd1e15c3d2190c8690381b40b7b4281cfdc1492f1be228a9f

data/lib/tebako-runtime/adapters/jing.rb

@@ -41,9 +41,28 @@ class Jing
     # path. Force the extracted path per-instance (a nil option hash
     # leaves @options empty, and the builder's stale default would win).
     @options[:jar] = DEFAULT_JAR
+    # The mounted openjdk toolkit payload's java wins over PATH (the
+    # memfs-binary exec path; the bare "java" keeps the PATH answer).
+    @options[:java] = TebakoRuntime.mounted_exe("openjdk", "java")
   end
 
   def validate(xml)
     original_validate(TebakoRuntime.extract_memfs(xml))
   end
+
+  # The spawn shape, array form (the stock execute() backticks a shell
+  # string, which the tebako spawn hook deliberately skips; the mounted
+  # java only execs through the hook from an absolute-path array spawn).
+  def execute(options) # rubocop:disable Metrics/AbcSize
+    cmd = [options[:java]]
+    cmd += options[:java_opts].split if options[:java_opts]
+    cmd += ["-jar", options[:jar].to_s]
+    cmd << "-c" if options[:compact]
+    cmd += ["-e", options[:encoding]] if options[:encoding]
+    cmd << "-i" if options[:id_check]
+    cmd += [options[:schema].to_s, options[:xmlfile].to_s]
+    IO.popen(cmd, err: %i[child out], &:read)
+  rescue SystemCallError => e
+    raise ExecutionError, "jing execution failed: #{e}"
+  end
 end

data/lib/tebako-runtime/adapters/mn2pdf.rb

@@ -55,3 +55,50 @@ module Mn2pdf
                  options)
   end
 end
+
+# The java resolution + the spawn shape (the memfs-binary exec path):
+# when the openjdk toolkit payload is mounted, its /opt/openjdk/bin/java
+# wins over PATH; the spawn is the ARRAY form — the shell form
+# (`Open3.capture3(string)`) goes through /bin/sh, which the tebako
+# spawn hook deliberately skips.
+module Jvm
+  singleton_class.send(:alias_method, :run_orig, :run)
+  singleton_class.send(:remove_method, :run)
+
+  def self.run(args = [])
+    java = TebakoRuntime.mounted_exe("openjdk", "java")
+    return run_orig(args) if java == "java"
+
+    # The stock form joins everything into a SHELL string: values ride
+    # shell-quoted (whole-value and inner forms), and legacy callers pass
+    # whole fragments in one element (`--param baseassetpath="/dir"`).
+    # The array spawn needs shell-word rules applied — split on unquoted
+    # spaces, shed the quotes — exactly what the shell did with the
+    # stock string.
+    clean = args.flat_map { |a| TebakoRuntime.shell_split(a.to_s) }
+    cmd = [java, *options, "-jar", MN2PDF_JAR_PATH.to_s, *clean]
+    puts cmd.join(" ")
+    Open3.capture3(*cmd).then { |stdout, stderr, status| [stdout, stderr, status] }
+  end
+end
+
+# options_to_cmd's joined form (`--param "k=v"` in ONE shell word) is
+# shell-string machinery; the array spawn takes flag and value as
+# separate elements with the shell quotes removed. Stock behavior
+# stands for the PATH java.
+module Mn2pdf
+  singleton_class.send(:alias_method, :options_to_cmd_orig, :options_to_cmd)
+  singleton_class.send(:remove_method, :options_to_cmd)
+
+  def self.options_to_cmd(options, cmd)
+    return options_to_cmd_orig(options, cmd) if TebakoRuntime.mounted_exe("openjdk", "java") == "java"
+
+    options.each do |k, v|
+      if k.to_s.end_with?("=")
+        cmd << "#{k}#{v.to_s.delete('"')}"
+      else
+        cmd << k.to_s << v.to_s.delete('"')
+      end
+    end
+  end
+end

data/lib/tebako-runtime/memfs.rb

@@ -97,6 +97,29 @@ module TebakoRuntime
 
     is_quoted ? memfs_extracted_file.to_path.quote : memfs_extracted_file.to_path
   end
+
+  # The mounted-toolkit resolution (spec 03 §2.2): an executable the
+  # named toolkit payload provides at its declared mount. Returns the
+  # in-image absolute path when the mounts hold it (the spawn hook
+  # execs those through dlmap2file + the preload), the bare name
+  # otherwise (the consumer's PATH answer stands).
+  #
+  #   TebakoRuntime.mounted_exe("openjdk", "java")
+  #   # => "/opt/openjdk/bin/java" when the openjdk payload is mounted,
+  #        else "java"
+  def self.mounted_exe(toolkit, name)
+    mounted = "/opt/#{toolkit}/bin/#{name}"
+    embedded_path?(mounted) ? mounted : name
+  end
+
+  # Shell-word split for the array spawn (the memfs-binary exec path):
+  # legacy adapters compose arguments as a SHELL fragment in ONE element
+  # (`--param baseassetpath="/dir"`), and shell-quoted whole values ride
+  # as single elements. Split on unquoted spaces, then shed the quotes —
+  # exactly the shell's own word rules (a quoted space never splits).
+  def self.shell_split(word)
+    word.scan(/"([^"]*)"|(\S+)/).map { |quoted, bare| quoted || bare }
+  end
 end
 
 at_exit do

data/lib/tebako-runtime/pre/excavate.rb

@@ -28,4 +28,7 @@
 # For some reason on Windows an attempt to require "seven_zip_ruby" from excavate fails
 # I cannot debug it effectively because of https://github.com/tamatebako/tebako/issues/119
 
-require "seven_zip_ruby"
+# Only legacy excavate loads seven_zip_ruby; omnizip-era excavate has no
+# seven-zip gem at all — wiring it then would crash the require chain
+# with Gem::MissingSpecError (metanorma dogfood, 2026-08-11).
+require "seven_zip_ruby" if Gem::Specification.find_all_by_name("seven-zip").any?

data/lib/tebako-runtime/pre/seven-zip.rb

@@ -28,15 +28,20 @@
 require_relative "../memfs"
 require_relative "../../tebako-runtime"
 
-# Fix path for 7zip load
+# Fix path for 7zip load.
+# Legacy-excavate only: omnizip-era excavate ships no seven-zip gem —
+# when it is absent there is nothing to excavate, so the hook is a
+# no-op (never a Gem::MissingSpecError — metanorma dogfood, 2026-08-11).
 module TebakoRuntime
-  sevenz_lib = RUBY_PLATFORM.downcase.match(/mswin|mingw/) ? "7z*.dll" : "7z.so"
-  sevenz_path = File.join(full_gem_path("seven-zip"), "lib", "seven_zip_ruby", sevenz_lib)
-  sevenz_paths = Dir.glob(sevenz_path)
-  sevenz_new_folder = COMPILER_MEMFS_LIB_CACHE / "seven_zip_ruby"
-  FileUtils.mkdir_p(sevenz_new_folder)
-  sevenz_paths.each do |file|
-    FileUtils.cp(file, sevenz_new_folder)
+  if Gem::Specification.find_all_by_name("seven-zip").any?
+    sevenz_lib = RUBY_PLATFORM.downcase.match(/mswin|mingw/) ? "7z*.dll" : "7z.so"
+    sevenz_path = File.join(full_gem_path("seven-zip"), "lib", "seven_zip_ruby", sevenz_lib)
+    sevenz_paths = Dir.glob(sevenz_path)
+    sevenz_new_folder = COMPILER_MEMFS_LIB_CACHE / "seven_zip_ruby"
+    FileUtils.mkdir_p(sevenz_new_folder)
+    sevenz_paths.each do |file|
+      FileUtils.cp(file, sevenz_new_folder)
+    end
+    $LOAD_PATH.unshift(COMPILER_MEMFS_LIB_CACHE.to_s)
   end
-  $LOAD_PATH.unshift(COMPILER_MEMFS_LIB_CACHE.to_s)
 end

data/lib/tebako-runtime/version.rb

@@ -26,5 +26,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module TebakoRuntime
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tebako-runtime
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ribose Inc.