bormashino 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 746545a9c19d9636a66fe0f695a2960bf96ec9d549eb54eea02f8421033df62c
-  data.tar.gz: b5d32e291df6331f2a653ff27a795fc94893dc0d45ad9d793fc3999ce3fe7bd0
+  metadata.gz: 19046da45e61a5eb600c18e2081d09bd9637ff1b940d05945ec248560de9db01
+  data.tar.gz: f288a032b1ca977e44080893ad30d86de44e4d6f08718cea2f9b66240cc3c5d4
 SHA512:
-  metadata.gz: 0a7e007e9615dd0b759c2b8cc30fbb4292c678a241db0bde8dd2ddb472c1f3640e839caac24d2b813ef4be547c01deb69319bc8ebaa61304f63bdc379833d022
-  data.tar.gz: ebbf53d4c6d772aea0fc4dff5ed9ac204fd0c0e0550eab18906cc8d5a4846a6e9586def616f7eafebc3ae2f4121fa75b6f36c5f7931b4563f638328190fabccc
+  metadata.gz: 6ae99fa09be0419565a648ec7d3f9d01613dbf0f4dd1df12d7db866f4d27aaf5ae38ce107dc1186174ee93fff6a224d2d1864eb686e63520745445ad88c782af
+  data.tar.gz: c3041acff2f933a2863e0f20f7207b5c1a2a6b423a81a9aa58822a38a5127baaba3679ee1caae0b5529950ec9663e75af8cd6d989baf238621f6a4fb42c460d1

data/lib/bormashino/tasks/bormashino.rake

@@ -1,25 +1,42 @@
 require 'fileutils'
 require 'uri'
+require 'os'
+require 'digest/md5'
 
 RUBY_RELEASE = 'https://github.com/ruby/ruby.wasm/releases/download/2022-04-25-a/ruby-head-wasm32-unknown-wasi-full-js.tar.gz'.freeze
 WASI_VFS_RELEASE = 'https://github.com/kateinoigakukun/wasi-vfs/releases/download/v0.1.1/wasi-vfs-cli-x86_64-unknown-linux-gnu.zip'.freeze
+WASI_VFS_RELEASE_MAC_X86_64 = 'https://github.com/kateinoigakukun/wasi-vfs/releases/download/v0.1.1/wasi-vfs-cli-x86_64-apple-darwin.zip'.freeze
+WASI_VFS_RELEASE_MAC_ARM64 = 'https://github.com/kateinoigakukun/wasi-vfs/releases/download/v0.1.1/wasi-vfs-cli-aarch64-apple-darwin.zip'.freeze
+
 RUBY_ROOT = File.basename(URI(RUBY_RELEASE).path).split('.').first.sub('ruby-', '')
 WASI_VFS = './wasi-vfs'.freeze
 TMP = 'tmp'.freeze
 DIGEST = 'js/ruby-digest.js'.freeze
 
 namespace :bormashino do
-  desc 'ruby.wasm及びwasi-vfsをダウンロードする'
+  desc 'download ruby.wasm and wasi-vfs'
   task :download do
     system "curl -L #{RUBY_RELEASE} | tar xz"
     FileUtils.rm(File.join(RUBY_ROOT, '/usr/local/lib/libruby-static.a'))
     FileUtils.rm_rf(File.join(RUBY_ROOT, '/usr/local/include'))
 
-    system "curl -L '#{WASI_VFS_RELEASE}' | gzip -d > wasi-vfs"
+    case
+    when OS.linux?
+      system "curl -L '#{WASI_VFS_RELEASE}' | gzip -d > wasi-vfs"
+    when OS.mac?
+      if OS.host_cpu == 'x86_64'
+        system "curl -L -o wasi-vfs.zip '#{WASI_VFS_RELEASE_MAC_X86_64}'"
+      else
+        system "curl -L -o wasi-vfs.zip '#{WASI_VFS_RELEASE_MAC_ARM64}'"
+      end
+      system 'unzip wasi-vfs.zip'
+      system 'rm wasi-vfs.zip'
+    end
+
     system 'chmod u+x wasi-vfs'
   end
 
-  desc 'wasi_vfsでアプリに使用するRubyスクリプト群を埋め込む'
+  desc 'embed ruby scripts with wasi-vfs'
   task :pack, [:additional_args] do |_, args|
     gem_dir = Gem::Specification.find_by_name('bormashino').gem_dir
 
@@ -35,9 +52,9 @@ namespace :bormashino do
     ].compact.join(' '))
   end
 
-  desc 'pack済みのruby.wasmのMD5を取りファイル名につけてコピーし、import用のJSを出力する'
+  desc 'add MD5 to packed ruby.wasm and write JS for importing'
   task :digest, [:destination] do |_, args|
-    digest = `md5sum tmp/ruby.wasm`.split.first
+    digest = Digest::MD5.file('tmp/ruby.wasm').hexdigest
     FileUtils.cp('tmp/ruby.wasm', "#{args[:destination]}/ruby.#{digest}.wasm")
     File.open(DIGEST, 'w') { |f|
       f.puts "export default rubyDigest = '#{digest}'
@@ -45,7 +62,7 @@ namespace :bormashino do
     }
   end
 
-  desc '指定ディレクトリ中のdigest付きruby.wasmを削除する'
+  desc 'clean built ruby.wasm files'
   task :delete_wasms, [:target] do |_, args|
     Dir.glob(File.join(args[:target], 'ruby.*.wasm')).each { |f| FileUtils.rm(f) }
   end

data/lib/bormashino/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bormashino
-  VERSION = '0.1.4'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bormashino
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Kenichiro Yasuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-08 00:00:00.000000000 Z
+date: 2022-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -58,6 +58,26 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.4
 description: '  With "Bormaŝino" you can build SPAs written in Ruby powered by Ruby
   WebAssembly build and Sinatra (or other rack-based web application frameworks).