bormashino 0.1.3 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c6c917023f14695a0b5ae88b3c50b8f2b37d9516d05c1427ed859d8d12c710f
-  data.tar.gz: c72487b632f901f7d40b68c979cbcf908e53ed2e98323707d0d4e7c0ab806438
+  metadata.gz: 5a99890edb18fa7c816a6c559640b99eac3ef69431a4085565c3a2d71d0d9972
+  data.tar.gz: 5c6a2cde12f3e4d1150b4395f04d9e970078fd275dd8dd7beae11f7765610a50
 SHA512:
-  metadata.gz: 37c859264a65f0af907c3faaabb74cb2f96afe3daeb8de91d65ce1511bf4c41ccfc592f54b30616be68a6de910ef5696d23727befac12471eff45c89adbe235b
-  data.tar.gz: 2fa7b38d1018c9e0f7ab31fb41d84b0a5ff81a0decd16814ba213953cbbaf615a8227facfafb99947b96c4241e12f5be7e5717401efd02bc25797ab03fb225b7
+  metadata.gz: 4d3a8387730fa96251441d2d023749eedbabf757ecea260d887e1363595d4be06ab78c0733782d350f53071e32811f301a3ace964202ff76d344c1f1f36b44c9
+  data.tar.gz: b144c2b03fcca6e2ae0486c53a4e1223a06c33c0cfb005a4dc0885831519c687997e68cf616a981965f27d8e7d342d1370491979a838344883aae48fdbe82259

data/lib/bormashino/fetch.rb

@@ -1,18 +1,20 @@
 require 'js'
 require_relative 'ext/js'
+require 'cgi'
 
 module Bormashino
   class Fetch
-    attr_accessor :resource, :init, :resolved_to
+    attr_accessor :resource, :init, :resolved_to, :options
 
-    def initialize(resource:, resolved_to:, init: {})
+    def initialize(resource:, resolved_to:, init: {}, options: {})
       @resource = resource
       @init = init
       @resolved_to = resolved_to
+      @options = options
     end
 
     def run
-      raise 'No app is mounted' unless Bormashino::Server.mounted?
+      raise 'No mounted apps' unless Bormashino::Server.mounted?
 
       # rubocop:disable Style::DocumentDynamicEvalDefinition
       JS.eval <<-ENDOFEVAL
@@ -25,7 +27,8 @@ module Bormashino
               'post',
               #{@resolved_to.to_json},
               'status=' + r.status +
-              '&payload=' + encodeURIComponent(t)
+              '&payload=' + encodeURIComponent(t) +
+              '&options=' + #{CGI.escape(@options.to_json).to_json}
             )
           })
         })

data/lib/bormashino/tasks/bormashino.rake

@@ -1,8 +1,13 @@
 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
@@ -15,7 +20,19 @@ namespace :bormashino do
     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
 
@@ -37,7 +54,7 @@ namespace :bormashino do
 
   desc 'pack済みのruby.wasmのMD5を取りファイル名につけてコピーし、import用のJSを出力する'
   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}'

data/lib/bormashino/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bormashino
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Kenichiro Yasuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-05-14 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).