ruby_wasm 2.5.0-x64-mingw-ucrt → 2.5.2-x64-mingw-ucrt

data/lib/ruby_wasm/packager.rb

@@ -2,11 +2,19 @@
 class RubyWasm::Packager
   # Initializes a new instance of the RubyWasm::Packager class.
   #
+  # @param root [String] The root directory of the Ruby project.
+  #   The root directory (will) contain the following files:
+  #    * build_manifest.json
+  #    * rubies
+  #    * build
   # @param config [Hash] The build config used for building Ruby.
   # @param definition [Bundler::Definition] The Bundler definition.
-  def initialize(config = nil, definition = nil)
+  # @param features [RubyWasm::FeatureSet] The features used for packaging.
+  def initialize(root, config = nil, definition = nil, features: RubyWasm::FeatureSet.derive_from_env)
+    @root = root
     @definition = definition
     @config = config
+    @features = features
   end
 
   # Packages the Ruby code into a Wasm binary. (including extensions)
@@ -22,14 +30,13 @@ class RubyWasm::Packager
     fs = RubyWasm::Packager::FileSystem.new(dest_dir, self)
     fs.package_ruby_root(tarball, executor)
 
-    ruby_wasm_bin = File.expand_path("bin/ruby", fs.ruby_root)
-    wasm_bytes = File.binread(ruby_wasm_bin).bytes
+    wasm_bytes = File.binread(File.join(fs.ruby_root, "bin", "ruby"))
 
     fs.package_gems
     fs.remove_non_runtime_files(executor)
     fs.remove_stdlib(executor) unless options[:stdlib]
 
-    if full_build_options[:target] == "wasm32-unknown-wasi"
+    if full_build_options[:target] == "wasm32-unknown-wasip1"
       # wasi-vfs supports only WASI target
       wasi_vfs = RubyWasmExt::WasiVfs.new
       wasi_vfs.map_dir("/bundle", fs.bundle_dir)
@@ -37,6 +44,7 @@ class RubyWasm::Packager
 
       wasm_bytes = wasi_vfs.pack(wasm_bytes)
     end
+    wasm_bytes = ruby_core.build_and_link_exts(executor, wasm_bytes)
 
     wasm_bytes = RubyWasmExt.preinitialize(wasm_bytes) if options[:optimize]
     wasm_bytes
@@ -52,79 +60,22 @@ class RubyWasm::Packager
   # Retrieves the specs from the Bundler definition, excluding the excluded gems.
   def specs
     return [] unless @definition
-    @definition.specs.reject { |spec| EXCLUDED_GEMS.include?(spec.name) }
+    @specs ||= @definition.resolve.materialize(@definition.requested_dependencies)
+      .reject { |spec| EXCLUDED_GEMS.include?(spec.name) }
+    @specs
   end
 
-  # Checks if dynamic linking is supported.
-  def support_dynamic_linking?
-    @ruby_channel == "head"
-  end
-
-  # Retrieves the root directory of the Ruby project.
-  # The root directory contains the following stuff:
-  #  * patches/*.patch
-  #  * build_manifest.json
-  #  * rubies
-  #  * build
-  def root
-    __skip__ =
-      @root ||=
-        begin
-          if explicit = ENV["RUBY_WASM_ROOT"]
-            File.expand_path(explicit)
-          elsif defined?(Bundler)
-            Bundler.root
-          else
-            Dir.pwd
-          end
-        rescue Bundler::GemfileNotFound
-          Dir.pwd
-        end
-  end
-
-  # Retrieves the alias definitions for the Ruby sources.
-  def self.build_source_aliases(root)
-    patches = Dir[File.join(root, "patches", "*.patch")]
-    sources = {
-      "head" => {
-        type: "github",
-        repo: "ruby/ruby",
-        rev: "master",
-        patches: patches.map { |p| File.expand_path(p) }
-      },
-      "3.3" => {
-        type: "tarball",
-        url: "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.0.tar.gz"
-      },
-      "3.2" => {
-        type: "tarball",
-        url: "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.3.tar.gz"
-      }
-    }
-    sources.each { |name, source| source[:name] = name }
-
-    build_manifest = File.join(root, "build_manifest.json")
-    if File.exist?(build_manifest)
-      begin
-        manifest = JSON.parse(File.read(build_manifest))
-        manifest["ruby_revisions"].each do |name, rev|
-          sources[name][:rev] = rev
-        end
-      rescue StandardError => e
-        RubyWasm.logger.warn "Failed to load build_manifest.json: #{e}"
-      end
-    end
-    sources
+  def features
+    @features
   end
 
   ALL_DEFAULT_EXTS =
-    "bigdecimal,cgi/escape,continuation,coverage,date,dbm,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,fiber,gdbm,json,json/generator,json/parser,nkf,objspace,pathname,psych,racc/cparse,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl"
+    "cgi/escape,continuation,coverage,date,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,json,json/generator,json/parser,objspace,pathname,psych,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl"
 
   # Retrieves the build options used for building Ruby itself.
   def build_options
     default = {
-      target: "wasm32-unknown-wasi",
-      src: "3.3",
+      target: RubyWasm::Target.new("wasm32-unknown-wasip1"),
       default_exts: ALL_DEFAULT_EXTS
     }
     override = @config || {}
@@ -135,25 +86,14 @@ class RubyWasm::Packager
   # Retrieves the resolved build options
   def full_build_options
     options = build_options
-    build_dir = File.join(root, "build")
-    rubies_dir = File.join(root, "rubies")
+    build_dir = File.join(@root, "build")
+    rubies_dir = File.join(@root, "rubies")
     toolchain = RubyWasm::Toolchain.get(options[:target], build_dir)
-    src =
-      if options[:src].is_a?(Hash)
-        options[:src]
-      else
-        src_name = options[:src]
-        aliases = self.class.build_source_aliases(root)
-        aliases[src_name] ||
-          raise(
-            "Unknown Ruby source: #{src_name} (available: #{aliases.keys.join(", ")})"
-          )
-      end
     options.merge(
       toolchain: toolchain,
       build_dir: build_dir,
       rubies_dir: rubies_dir,
-      src: src
+      src: options[:src]
     )
   end
 end

data/lib/ruby_wasm/rake_task.rb

@@ -16,6 +16,7 @@ class RubyWasm::BuildTask < ::Rake::TaskLib
     **options,
     &block
   )
+    target = Target.new(target)
     @build =
       RubyWasm::Build.new(
         name,

data/lib/ruby_wasm/version.rb

@@ -1,3 +1,3 @@
 module RubyWasm
-  VERSION = "2.5.0"
+  VERSION = "2.5.2"
 end

data/lib/ruby_wasm.rb

@@ -3,7 +3,9 @@ require "logger"
 require_relative "ruby_wasm/version"
 require_relative "ruby_wasm/util"
 require_relative "ruby_wasm/build"
+require_relative "ruby_wasm/feature_set"
 require_relative "ruby_wasm/packager"
+require_relative "ruby_wasm/packager/component_adapter"
 require_relative "ruby_wasm/packager/file_system"
 require_relative "ruby_wasm/packager/core"