beni 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6d668b6f67ab7af2c0bd498ae991426eafaa8f18766191879ef994dd77d7be2
-  data.tar.gz: c21ea30a1f5e43b7570282aa29dbd3e10712209998544a4c0ccb50aaa7b5868f
+  metadata.gz: ca0624d64b327fd094db28953e237a37ba0c4adaa4cd8991cf30ec2cf69e2bd7
+  data.tar.gz: efcceca68fe021fbca31612ec4abd5f68bea328ef7bcd8f39da4e0eb76afbe88
 SHA512:
-  metadata.gz: fcca13aadd01ff0de6f657aff014b57e137b2615bf6a70a25c2e9886ec9f889060903181d53376f0d7de0d4419fb87a4b80a08a3d4341fdbe8eee7f0c78e731c
-  data.tar.gz: a059e6e170582881583f7ad1e78f1bfe5d5a05244a3cd379477f5743c12ce55f173d92383650b5177b72172064f55ef6fc2134e0b9189003c4bcb868dae13c18
+  metadata.gz: 836749b747f2add6ca702b9249fdb91c67c2c58f7ae5459243adf1ad322e796117adb77938518510bba0f9c3418a27d23c717585ec819d3adb0134883d380963
+  data.tar.gz: ceac3a0bdeb1f2f6996fc5b651f0af974d046d929b245d7bcb4440081a32d216c6f143ddae665d741b62ef44713f3aa387505dcd863774dc319747083f89f548

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [0.14.0](https://github.com/elct9620/beni/compare/v0.13.0...v0.14.0) (2026-09-10)
+
+
+### ⚠ BREAKING CHANGES
+
+* **beni:** `Range::end_` is now `Range::end`.
+* **beni:** `Mrb::load_bytecode` returns `Result<Value, Error>` instead of `c_int`, and `Mrb::load_irep_buf` is removed — call `load_bytecode`.
+
+### Features
+
+* **beni-sys:** build for the other macOS architecture ([61b1dc9](https://github.com/elct9620/beni/commit/61b1dc92b36ffd977db5a5a1cb8eb9694d1f8bbd))
+* **beni-sys:** look the archive up under the name its sidecar gives ([135f2d1](https://github.com/elct9620/beni/commit/135f2d17aba19b91dd5b7dffd8874799104f8069))
+* **beni-sys:** read a link set named in either toolchain's form ([c300b73](https://github.com/elct9620/beni/commit/c300b73b56e9924e7dc8654275178d26392872a7))
+* **beni-sys:** read an archive's compile flags in MSVC's spelling ([901ccb3](https://github.com/elct9620/beni/commit/901ccb36f945224e1d8c85b2a8e8b404fd6141b0))
+* **beni:** answer a bytecode load the way every other load does ([f2d5af2](https://github.com/elct9620/beni/commit/f2d5af2244447d43c611fabdaf43316e8cf228b5))
+* **beni:** graduate the Mrb::ensure combinator ([47abf29](https://github.com/elct9620/beni/commit/47abf29d286303ccaab4bac85f29dd35d387fb92))
+
+
+### Bug Fixes
+
+* **beni-sys:** keep the POSIX pre-include off a platform without it ([0d8d50e](https://github.com/elct9620/beni/commit/0d8d50e8f789c3c20f6187cbd50017c188710c5e))
+* **beni-sys:** parse under a standard the archive's own compiler kept ([e80507c](https://github.com/elct9620/beni/commit/e80507c6620643ffb54a1426639e3a5e14eae0ad))
+* **beni:** verify the archive the sidecar names, not one file name ([d53d67c](https://github.com/elct9620/beni/commit/d53d67c48f1bc1d5e07ab87bc050bb48e9e387fa))
+* **coverage:** mark every coverage state the same way ([2a5b19f](https://github.com/elct9620/beni/commit/2a5b19fc7bea2ca6d2a06f37d4c7b44e73b6572d))
+* **rust:** probe for cargo without a lookup tool ([622dbb9](https://github.com/elct9620/beni/commit/622dbb9cbb2ec0354426a7939e0e5a9ccd987cd0))
+* **scenarios:** probe for cargo the way every other harness does ([96d673b](https://github.com/elct9620/beni/commit/96d673bae074204617c8c0a84291d44133b71454))
+* **vendor:** name a build platform beni pins no tarball for ([4dac535](https://github.com/elct9620/beni/commit/4dac53598c4e5d937ee1838eedb31af2e0cb1cd7))
+* **vendor:** name the tarball from the directory it unpacks into ([e10f0c6](https://github.com/elct9620/beni/commit/e10f0c68fb540543feb8260508ac3eaab8f35536))
+
+
+### Code Refactoring
+
+* **beni:** name a range's end after what it reads ([fec0c2f](https://github.com/elct9620/beni/commit/fec0c2fe21f84ae9ff2e9c54e3194afbaa364476))
+
 ## [0.13.0](https://github.com/elct9620/beni/compare/v0.12.0...v0.13.0) (2026-09-08)
 
 

data/README.md

@@ -2,7 +2,7 @@
 
 beni gives Rust developers a magnus-like experience for mruby: a Ruby gem
 manages the mruby build chain, and Rust crates expose a safe, typed API over
-the resulting `libmruby.a`. Extracted from the
+the archive it builds. Extracted from the
 [kobako](https://github.com/elct9620/kobako) project; APIs follow 0.x semver
 semantics and may still evolve between minor versions.
 
@@ -17,13 +17,13 @@ All three packages release in lockstep under a single version.
 
 | Package | Registry | Role |
 |---|---|---|
-| `beni` gem | rubygems.org | Rake tasks + DSL config that download mruby and build `libmruby.a` |
+| `beni` gem | rubygems.org | Rake tasks + DSL config that download mruby and build the archive |
 | `beni-sys` crate | crates.io | bindgen FFI surface over the mruby C API |
 | `beni` crate | crates.io | safe typed wrapper over `beni-sys`, aligned with magnus idioms |
 
 ## Getting started
 
-### Build `libmruby.a` with the gem
+### Build the mruby archive with the gem
 
 Add `beni` to your Gemfile and install the task library in your Rakefile:
 
@@ -38,9 +38,10 @@ rake beni:build
 ```
 
 This downloads the pinned mruby release, builds it with mruby's untouched
-upstream default config, and stages `vendor/mruby/build/host/lib/` with
-`libmruby.a` and its `libmruby.flags.mak` compile-flags sidecar — everything
-the crates need.
+upstream default config, and stages `vendor/mruby/build/host/lib/` with the
+archive and its `libmruby.flags.mak` compile-flags sidecar — everything the
+crates need. The archive's own file name follows the toolchain that built it
+(`libmruby.a`, `libmruby.lib` under MSVC), and the sidecar names it.
 
 To tune the build, declare a config path and generate the seed:
 
@@ -151,8 +152,8 @@ After checking out the repo, run `bin/setup` to install dependencies, then
 `bundle exec rake` for the default gate (tests + RuboCop + Steep). The repo
 dogfoods its own gem: the Rakefile wires `Beni::Tasks` with the validation
 config `build_config/mruby.rb` (host + wasi targets), and a repo-local rake
-chain verifies the crates compile against a real `libmruby.a` on both the
-host target and wasm32-wasip1:
+chain verifies the crates compile against a real archive on both the host
+target and wasm32-wasip1:
 
 ```bash
 bundle exec rake rust:verify   # beni:build + check/test (host) + check (wasm32)

data/lib/beni/builder.rb

@@ -5,7 +5,7 @@ require "rbconfig"
 
 module Beni
   # Drives the vendored mruby tree's build to produce the per-target
-  # +libmruby.a+ archives, by running mruby's own +Rakefile+ — the
+  # archives, by running mruby's own +Rakefile+ — the
   # documented build entry point (doc/guides/compile.md). With no
   # +build_config+, mruby falls back to its own
   # +build_config/default.rb+; an explicit config is wired in via the
@@ -13,10 +13,18 @@ module Beni
   class Builder
     # mruby's anonymous +MRuby::Build.new+ names its target "host"
     # (lib/mruby/build.rb), so the upstream default config produces
-    # +build/host/lib/libmruby.a+. A custom build config with
-    # different target names supplies its own list via +Beni::Tasks+.
+    # +build/host/lib/+. A custom build config with different target
+    # names supplies its own list via +Beni::Tasks+.
     DEFAULT_TARGETS = %w[host].freeze
 
+    # The sidecar line naming the archive's own path. An archive's file
+    # name follows the toolchain that built it, so the sidecar is what
+    # says which file to look for.
+    ARCHIVE_PATH_KEY = "MRUBY_LIBMRUBY_PATH = "
+
+    # The sidecar mruby writes beside every archive it builds.
+    FLAGS_MAK = "libmruby.flags.mak"
+
     attr_reader :vendor_dir, :build_config, :targets
 
     def initialize(vendor_dir:, build_config: nil, targets: DEFAULT_TARGETS)
@@ -29,21 +37,38 @@ module Beni
       File.join(vendor_dir, "mruby")
     end
 
-    def libmruby_path(target)
-      File.join(mruby_dir, "build", target, "lib", "libmruby.a")
+    # Where one target's archive and its sidecar stage.
+    def staged_path(target)
+      File.join(mruby_dir, "build", target, "lib")
     end
 
-    def libmruby_paths
-      targets.map { |target| libmruby_path(target) }
+    def staged_paths
+      targets.map { |target| staged_path(target) }
     end
 
-    # True when every target's artifacts — +libmruby.a+ plus the
-    # +libmruby.flags.mak+ sidecar +beni-sys+ parses for ABI alignment
-    # — are already present, letting callers skip the build without
-    # spawning a subprocess. An archive without its sidecar triggers
-    # a rebuild, which is incremental and only emits the missing file.
+    # Per-target +libmruby.flags.mak+ file-task paths, matching the
+    # task names mruby defines in tasks/libmruby.rake (absolute,
+    # anchored on the default +build/<target>+ layout).
+    def flags_mak_path(target)
+      File.join(staged_path(target), FLAGS_MAK)
+    end
+
+    # The archive one target's sidecar names, or +nil+ when no sidecar
+    # is there to name one.
+    def archive_path(target)
+      sidecar = flags_mak_path(target)
+      return nil unless File.exist?(sidecar)
+
+      File.join(staged_path(target), archive_file_name(sidecar))
+    end
+
+    # True when every target has its +libmruby.flags.mak+ sidecar — the
+    # channel +beni-sys+ parses for ABI alignment — and the archive that
+    # sidecar names, letting callers skip the build without spawning a
+    # subprocess. A missing sidecar triggers a rebuild, which is
+    # incremental and only emits what it lacks.
     def built?
-      artifact_paths.all? { |path| File.exist?(path) }
+      targets.all? { |target| exist?(archive_path(target)) }
     end
 
     # Idempotent build entry point for +rake beni:build+: skip with a
@@ -53,16 +78,16 @@ module Beni
     def ensure_built
       check_build_config!
       if built?
-        puts "[beni] libmruby.a already present for #{targets.join(" + ")} — skipping"
+        puts "[beni] archive already present for #{targets.join(" + ")} — skipping"
         return
       end
 
       build
-      puts "[beni] libmruby.a ready for #{targets.join(" + ")}"
+      puts "[beni] archive ready for #{targets.join(" + ")}"
     end
 
-    # Run mruby's rake and raise unless every target's +libmruby.a+
-    # exists afterwards. Alongside the default task, each target's
+    # Run mruby's rake and raise unless every target's archive exists
+    # afterwards. Alongside the default task, each target's
     # +libmruby.flags.mak+ file task is requested explicitly — mruby's
     # embedder interface recording the exact compile flags, which
     # +beni-sys+'s build script parses to keep bindgen's view of the
@@ -89,10 +114,18 @@ module Beni
 
     private
 
-    # Every artifact the build must leave behind: the per-target
-    # archive and its flags.mak sidecar.
-    def artifact_paths
-      libmruby_paths + flags_mak_paths
+    # The archive's file name, as its sidecar names the path to it.
+    # mruby writes that path through a make variable no reader outside
+    # make can expand, so the name is what is taken from it.
+    def archive_file_name(sidecar)
+      line = File.foreach(sidecar).find { |candidate| candidate.start_with?(ARCHIVE_PATH_KEY) }
+      raise Error, "[beni] #{sidecar} has no #{ARCHIVE_PATH_KEY.strip} line" unless line
+
+      File.basename(line.delete_prefix(ARCHIVE_PATH_KEY).strip.tr("\\", "/"))
+    end
+
+    def exist?(path)
+      !path.nil? && File.exist?(path)
     end
 
     # Spawn mruby's rake with the parent environment plus the +env+
@@ -113,11 +146,8 @@ module Beni
       env
     end
 
-    # Per-target +libmruby.flags.mak+ file-task paths, matching the
-    # task names mruby defines in tasks/libmruby.rake (absolute,
-    # anchored on the default +build/<target>+ layout).
     def flags_mak_paths
-      targets.map { |target| File.join(mruby_dir, "build", target, "lib", "libmruby.flags.mak") }
+      targets.map { |target| flags_mak_path(target) }
     end
 
     # The declared config belongs to the consumer; a path that does
@@ -129,9 +159,14 @@ module Beni
     end
 
     # Report every missing artifact at once, so a multi-target build
-    # failure shows the whole gap instead of one path per run.
+    # failure shows the whole gap instead of one path per run. A target
+    # with no sidecar is reported by the sidecar, which is the artifact
+    # naming the other one.
     def verify_artifacts!
-      missing = artifact_paths.reject { |path| File.exist?(path) }
+      missing = targets.flat_map do |target|
+        archive = archive_path(target)
+        archive.nil? ? [flags_mak_path(target)] : [archive].reject { |path| File.exist?(path) }
+      end
       return if missing.empty?
 
       raise Error, "[beni] build completed but artifacts are missing:\n  #{missing.join("\n  ")}"

data/lib/beni/tasks.rb

@@ -31,7 +31,7 @@ module Beni
   #
   # Defined tasks:
   #
-  #   rake beni:build           — fetch toolchains + build libmruby.a per target
+  #   rake beni:build           — fetch toolchains + build the archive per target
   #   rake beni:clean           — remove mruby build trees (keeps source)
   #   rake beni:config          — generate the upstream default build config
   #   rake beni:vendor:setup    — download & unpack the selected toolchains
@@ -126,7 +126,7 @@ module Beni
 
     def define_build_task
       desc "Build vendored mruby for #{configuration.targets.join(" + ")} " \
-           "(produces #{builder.libmruby_paths.join(", ")})"
+           "(stages the archive and its compile-flags sidecar in #{builder.staged_paths.join(", ")})"
       task build: "vendor:setup" do
         builder.ensure_built
       end

data/lib/beni/vendor/tarball.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "fileutils"
+require "pathname"
 
 module Beni
   module Vendor
@@ -53,7 +54,19 @@ module Beni
       def extract_to_staging(staging)
         FileUtils.rm_rf(staging)
         FileUtils.mkdir_p(staging)
-        system("tar", "-xzf", @tarball, "-C", staging, exception: true)
+        # An absolute Windows path opens with a drive letter, which GNU
+        # tar reads as the host half of a +host:path+ remote spec and
+        # tries to connect to. Naming the tarball from the directory it
+        # unpacks into leaves no colon for any tar to find.
+        from_staging = Pathname.new(@tarball).relative_path_from(Pathname.new(staging))
+        run_tar(from_staging.to_s, staging)
+      end
+
+      # Spawn tar with the staging directory as its working directory.
+      # Extracted as a seam so tests can observe the argument shape
+      # without unpacking anything.
+      def run_tar(tarball, staging)
+        system("tar", "-xzf", tarball, chdir: staging, exception: true)
       end
 
       # Move the expected +top_level_dir+ subtree out of +staging+ into

data/lib/beni/vendor.rb

@@ -21,7 +21,7 @@ module Beni
     # ---- Built-in pairs ----------------------------------------------------
     # The version and checksum pair this release vendors per toolchain.
     # wasi-sdk ships one tarball per build platform, so its checksum is
-    # keyed by +WASI_SDK_PLATFORM+ (values from the GitHub release asset
+    # keyed by +BUILD_PLATFORM+ (values from the GitHub release asset
     # digests); mruby's source archive is host-agnostic with a single
     # checksum.
     #
@@ -50,21 +50,34 @@ module Beni
     # task-definition time: referencing wasi-sdk implies mruby.
     DEPENDENCIES = { "wasi-sdk" => %w[mruby] }.freeze
 
-    # Map a host triple to the platform token wasi-sdk keys its per-platform
-    # tarballs by (wasi-sdk only; mruby's tarball is host-agnostic).
-    # +x86_64-linux+ is both the most common host and the safest fallback
-    # for unrecognised triples, so it is the +else+ branch.
-    def self.wasi_sdk_platform(platform = RUBY_PLATFORM)
-      case platform
-      when /arm64-darwin|aarch64-darwin/ then "arm64-macos"
-      when /x86_64-darwin/               then "x86_64-macos"
-      when /aarch64-linux|arm64-linux/   then "arm64-linux"
-      else "x86_64-linux"
-      end
+    # +RUBY_PLATFORM+ spells the same architecture and operating system
+    # differently across hosts; toolchains key their per-platform tarballs
+    # by one spelling each.
+    ARCH_ALIASES = { "x64" => "x86_64", "amd64" => "x86_64", "aarch64" => "arm64" }.freeze
+    OS_ALIASES = { /darwin/ => "macos", /linux/ => "linux", /mingw|mswin/ => "windows" }.freeze
+
+    # The build platform: the architecture and operating system the Rake
+    # tasks run on, spelled the way toolchains key their tarballs. Derived
+    # from the host rather than matched against a covered set, so a host no
+    # toolchain vendors a tarball for still has a name to be named in.
+    def self.build_platform(platform = RUBY_PLATFORM)
+      "#{platform_arch(platform)}-#{platform_os(platform)}"
     end
 
-    # The build platform's wasi-sdk token, resolved once at load.
-    WASI_SDK_PLATFORM = wasi_sdk_platform
+    def self.platform_arch(platform)
+      arch = platform.split("-").first.to_s
+      ARCH_ALIASES.fetch(arch, arch)
+    end
+
+    def self.platform_os(platform)
+      OS_ALIASES.find { |pattern, _| pattern.match?(platform) }&.last ||
+        platform.split("-")[1].to_s
+    end
+
+    private_class_method :platform_arch, :platform_os
+
+    # The build platform, resolved once at load.
+    BUILD_PLATFORM = build_platform
 
     # Known toolchain names mapped to their factory methods — the name
     # domain the DSL validates against and +Beni::Tasks+ dispatches on.
@@ -81,10 +94,10 @@ module Beni
       # full version plus the platform.
       Toolchain.new(
         name: "wasi-sdk",
-        version_label: "#{version} (#{WASI_SDK_PLATFORM})",
+        version_label: "#{version} (#{BUILD_PLATFORM})",
         base_url: "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-#{version.split(".").first}",
-        tarball_name: "wasi-sdk-#{version}-#{WASI_SDK_PLATFORM}.tar.gz",
-        top_level_dir: "wasi-sdk-#{version}-#{WASI_SDK_PLATFORM}",
+        tarball_name: "wasi-sdk-#{version}-#{BUILD_PLATFORM}.tar.gz",
+        top_level_dir: "wasi-sdk-#{version}-#{BUILD_PLATFORM}",
         vendor_dir: vendor_dir,
         expected_sha256: sha256 || built_in_sha256("wasi-sdk", version)
       )
@@ -116,12 +129,21 @@ module Beni
     # The built-in checksum for +name+ at +version+: the build platform's
     # entry when the toolchain's checksums are platform-keyed, +nil+ for
     # any version other than the vendored one — mruby's TOFU pinning path.
-    def built_in_sha256(name, version)
+    # A platform-keyed pair carrying no entry for +platform+ vendors no
+    # tarball there, and says so rather than letting another platform's
+    # checksum stand in.
+    def built_in_sha256(name, version, platform = BUILD_PLATFORM)
       pair = BUILT_IN_PAIRS.fetch(name)
       return nil unless version == pair.fetch(:version)
 
       checksum = pair.fetch(:sha256)
-      checksum.is_a?(Hash) ? checksum.fetch(WASI_SDK_PLATFORM) : checksum
+      return checksum unless checksum.is_a?(Hash)
+
+      checksum.fetch(platform) do
+        raise Error, "[beni] #{name} #{version} vendors no tarball for build platform " \
+                     "#{platform}; declare the toolchain with its own version and sha256 " \
+                     "to name one beni does not pin here"
+      end
     end
 
     # Write the gem-shipped wasi toolchain file into the staged mruby

data/lib/beni/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Beni
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/sig/beni/builder.rbs

@@ -1,6 +1,8 @@
 module Beni
   class Builder
     DEFAULT_TARGETS: Array[String]
+    ARCHIVE_PATH_KEY: String
+    FLAGS_MAK: String
 
     attr_reader vendor_dir: String
     attr_reader build_config: String?
@@ -10,9 +12,13 @@ module Beni
 
     def mruby_dir: () -> String
 
-    def libmruby_path: (String target) -> String
+    def staged_path: (String target) -> String
 
-    def libmruby_paths: () -> Array[String]
+    def staged_paths: () -> Array[String]
+
+    def flags_mak_path: (String target) -> String
+
+    def archive_path: (String target) -> String?
 
     def built?: () -> bool
 
@@ -24,7 +30,9 @@ module Beni
 
     private
 
-    def artifact_paths: () -> Array[String]
+    def archive_file_name: (String sidecar) -> String
+
+    def exist?: (String? path) -> bool
 
     def run_mruby_rake: (Hash[String, String] env, Array[String] cmd) -> void
 

data/sig/beni/vendor/tarball.rbs

@@ -18,6 +18,8 @@ module Beni
 
       def extract_to_staging: (String staging) -> void
 
+      def run_tar: (String tarball, String staging) -> void
+
       def promote: (String staging) -> void
     end
   end

data/sig/beni/vendor.rbs

@@ -4,10 +4,16 @@ module Beni
 
     BUILT_IN_PAIRS: Hash[String, built_in_pair]
     DEPENDENCIES: Hash[String, Array[String]]
-    WASI_SDK_PLATFORM: String
+    ARCH_ALIASES: Hash[String, String]
+    OS_ALIASES: Hash[Regexp, String]
+    BUILD_PLATFORM: String
     TOOLCHAIN_FACTORIES: Hash[String, Symbol]
 
-    def self.wasi_sdk_platform: (?String platform) -> String
+    def self.build_platform: (?String platform) -> String
+
+    def self.platform_arch: (String platform) -> String
+
+    def self.platform_os: (String platform) -> String
 
     def self?.wasi_sdk: (vendor_dir: String, ?version: String?, ?sha256: String?) -> Toolchain
 
@@ -15,7 +21,7 @@ module Beni
 
     def self?.base_url_for: (String default) -> String
 
-    def self?.built_in_sha256: (String name, String version) -> String?
+    def self?.built_in_sha256: (String name, String version, ?String platform) -> String?
 
     def self?.stage_wasi_toolchain_file: (vendor_dir: String) -> String
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beni
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Aotokitsuruya