Merge pull request #366 from ruby/katei/package-all-files-in-dot-gem

Package all files in packaged .gem

Author: kateinoigakukun

.github/workflows/build.yml

@@ -126,7 +126,8 @@ jobs:
             ${{ steps.builder-image.outputs.imageid }} /bin/sh
           echo 'docker exec -u me builder "$@"' > ./build-exec
           chmod +x ./build-exec
-      - run: ./build-exec bundle config set --local without check
+          # wait for docker exec to be ready
+          timeout 10 bash -c 'until ./build-exec bundle config set --local without check; do sleep 1; done'
       - run: ./build-exec ./bin/setup
       - run: ./build-exec bundle exec rake compile
       - name: Pre-release configuration

Rakefile

@@ -42,10 +42,7 @@ NPM_PACKAGES = [
     gemfile: "packages/npm-packages/ruby-wasm-wasi/Gemfile",
     target: "wasm32-unknown-wasi"
   },
-  {
-    name: "ruby-wasm-wasi",
-    target: "wasm32-unknown-wasi"
-  }
+  { name: "ruby-wasm-wasi", target: "wasm32-unknown-wasi" }
 ]
 
 STANDALONE_PACKAGES = [

lib/ruby_wasm/packager/file_system.rb

@@ -115,19 +115,20 @@ def each_gem_content_path(&block)
     @packager.specs.each do |spec|
       next unless File.exist?(spec.full_gem_path)
 
-      spec.files
-        .each do |require_path|
-          source = File.expand_path(require_path, spec.full_gem_path)
-          next unless File.exist?(source)
-          relative =
-            File.join(
-              bundle_relative_path,
-              "gems",
-              spec.full_name,
-              require_path
-            )
-          yield relative, source
-        end
+      # spec.files is only valid before the gem is packaged.
+      if spec.source.path?
+        relative_paths = spec.files
+      else
+        # All files in .gem are required.
+        relative_paths = Dir.children(spec.full_gem_path)
+      end
+      relative_paths.each do |require_path|
+        source = File.expand_path(require_path, spec.full_gem_path)
+        next unless File.exist?(source)
+        relative =
+          File.join(bundle_relative_path, "gems", spec.full_name, require_path)
+        yield relative, source
+      end
     end
   end
 

rakelib/format.rake

@@ -7,6 +7,7 @@ namespace :format do
         "Rakefile",
         "lib/**/*.rb",
         "ext/**/*.rb",
+        "test/**/*.rb",
         "rakelib/**/*.rake",
         "packages/**/*.rb"
       ]

rakelib/packaging.rake

@@ -41,7 +41,6 @@ namespace :npm do
     pkg_dir = "#{Dir.pwd}/packages/npm-packages/#{pkg[:name]}"
 
     namespace pkg[:name] do
-
       desc "Build ruby for npm package #{pkg[:name]}"
       task "ruby" do
         build_command = npm_pkg_build_command(pkg)

test/test_build_smoke.rb

@@ -0,0 +1,40 @@
+require "test-unit"
+require "tmpdir"
+require "bundler"
+
+class TestBuildSmoke < Test::Unit::TestCase
+  def run_rbwasm(*args)
+    rbwasm_path = File.expand_path("../../exe/rbwasm", __FILE__)
+    system("bundle", "exec", rbwasm_path, *args, exception: true)
+  end
+
+  def run_wasmtime(*args)
+    IO.popen(["wasmtime", *args], &:read)
+  end
+
+  def test_build_rack
+    Dir.mktmpdir do |dir|
+      gemfile_path = File.join(dir, "Gemfile")
+      output_path = File.join(dir, "output.wasm")
+
+      File.write(gemfile_path, <<-GEMFILE)
+      source "https://rubygems.org"
+      gem "rack", "3.0.8"
+      GEMFILE
+      Bundler.with_unbundled_env do
+        ENV["RUBY_WASM_ROOT"] = File.expand_path("../../", __FILE__)
+        ENV["BUNDLE_GEMFILE"] = gemfile_path
+        assert system("bundle", "install")
+        run_rbwasm("build", "-o", output_path)
+        assert_equal "Rack::RELEASE=3.0.8\n",
+                     run_wasmtime(
+                       output_path,
+                       "-r/bundle/setup.rb",
+                       "-rrack",
+                       "-e",
+                       "puts \"Rack::RELEASE=\#{Rack::RELEASE}\""
+                     )
+      end
+    end
+  end
+end