Merge pull request #62 from keyasuda/ruby320

make it working with ruby 3.2.0 (and preview2)
keyasuda · Dec 30, 2022 · e5e9c85 · e5e9c85
2 parents c64316b + a2e3f18
commit e5e9c85
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 14 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.0-preview2
+3.2.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.1.12] - 2022-12-30
+
+- allow ruby 3.2.0
+
 ## [0.1.11] - 2022-12-03
 
 - use ruby.wasm 0.5.0

diff --git a/gem/Gemfile.lock b/gem/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bormashino (0.1.11)
+    bormashino (0.1.12)
       json_pure (~> 2.6, >= 2.6.1)
       os (~> 1.1, >= 1.1.4)
       ruby2_keywords (= 0.0.4)

diff --git a/gem/bormashino.gemspec b/gem/bormashino.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   DESCRIPTION
   spec.homepage      = 'https://github.com/keyasuda/bormashino'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 3.2.0-preview1'
+  spec.required_ruby_version = '~> 3.2.0-preview1'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage

diff --git a/gem/lib/bormashino/version.rb b/gem/lib/bormashino/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bormashino
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end
diff --git a/npm/package-lock.json b/npm/package-lock.json
diff --git a/npm/package.json b/npm/package.json
@@ -2,7 +2,7 @@
   "name": "bormashino",
   "description": "The package to build SPAs with Ruby",
   "homepage": "https://github.com/keyasuda/bormashino",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "main": "src/index.js",
   "scripts": {
     "test": "jest --notify src/",

diff --git a/npm/src/ruby.js b/npm/src/ruby.js
@@ -81,7 +81,8 @@ export const initVmFromRubyModule = async (
   vm.initialize(initializeOption)
 
   vm.eval(`
-    Gem.paths = {'GEM_PATH' => '/src/bundle/ruby/3.2.0+1'}
+    gem_path = Dir.glob('/src/bundle/ruby/*').join(':')
+    Gem.paths = {'GEM_PATH' => gem_path}
     # workaround
     require 'rack'
     Rack::Response

diff --git a/test-app/Gemfile.lock b/test-app/Gemfile.lock
@@ -11,7 +11,7 @@ GIT
 PATH
   remote: ../gem
   specs:
-    bormashino (0.1.11)
+    bormashino (0.1.12)
       json_pure (~> 2.6, >= 2.6.1)
       os (~> 1.1, >= 1.1.4)
       ruby2_keywords (= 0.0.4)

diff --git a/test-app/package-lock.json b/test-app/package-lock.json