tebako-runtime 0.7.0 → 0.8.1

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

@@ -36,9 +36,33 @@ class Jing
 
   def initialize(schema, options = nil)
     original_initialize(TebakoRuntime.extract_memfs(schema, wild: true), options)
+    # ruby-jing captures `:default => DEFAULT_JAR` at class-load time —
+    # before this adapter replaced the constant with the extracted host
+    # 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

@@ -29,12 +29,38 @@ require "fileutils"
 require "pathname"
 require "rubygems"
 require "tempfile"
+require "fiddle"
 
 require_relative "string"
 
 # Module TebakoRuntime
 # Methods to extract files from memfs to temporary folder
 module TebakoRuntime
+  # The v2 multi-mount world: an extractable path is one HELD by the TFS
+  # mounts (the env image at COMPILER_MEMFS, payloads at their declared
+  # points) — the compiled-in prefix can no longer express it. The
+  # runtime executable's own tebako_fs_stat is the discriminator: it
+  # answers only mounted content (0); host paths (and jail-denied ones)
+  # answer otherwise. Fiddle::Handle::DEFAULT addresses the process
+  # image WITHOUT this gem's own fiddle adapter (dlopen(nil) routes
+  # through it and chokes on the nil).
+  MEMFS_STAT_FN = begin
+    Fiddle::Function.new(Fiddle::Handle::DEFAULT["tebako_fs_stat"],
+                         [Fiddle::TYPE_VOIDP, Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT)
+  rescue StandardError
+    nil
+  end
+
+  # struct stat is at most 512 bytes on every supported platform
+  # (darwin-arm64 and linux x86_64 use 144).
+  MEMFS_STAT_BUF = "\0".b * 512
+
+  def self.embedded_path?(path)
+    return path.start_with?(COMPILER_MEMFS) if MEMFS_STAT_FN.nil?
+
+    MEMFS_STAT_FN.call(path, MEMFS_STAT_BUF).zero? || path.start_with?(COMPILER_MEMFS)
+  end
+
   def self.initialize_compiler_memfs_lib_cache
     Pathname.new(Dir.mktmpdir("tebako-runtime-"))
   rescue StandardError
@@ -64,13 +90,36 @@ module TebakoRuntime
   def self.extract_memfs(file, wild: false, cache_path: COMPILER_MEMFS_LIB_CACHE)
     is_quoted = file.quoted?
     file = file.unquote if is_quoted
-    return is_quoted ? file.quote : file unless File.exist?(file) && file.start_with?(COMPILER_MEMFS)
+    return is_quoted ? file.quote : file unless File.exist?(file) && embedded_path?(file)
 
     memfs_extracted_file = cache_path + File.basename(file)
     extract(file, wild, cache_path) unless memfs_extracted_file.exist?
 
     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.7.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tebako-runtime
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 bindir: bin
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Run-time support of tebako executable packager
 test_files: []