binaryen 1.1.6.2 → 1.1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 502cfbb2e9e33d3b32d5ab1881bf097fc7321bcb8746e2ae4b4142a6dbe3727a
-  data.tar.gz: 20c543218c8b5c256012e3b386e4cf6ceda9461899f10d990edcba0b983dbc17
+  metadata.gz: e0f235a249bcf6c38016c2033776997d2d636126cea0b37d47c98dc2b932dd08
+  data.tar.gz: 3f123ebb5bdb0f24ebf004097e02ccab417d09838e9ec663a87e43ae472cb9a1
 SHA512:
-  metadata.gz: 2a9d8542c524badbeb6721a9b6e9fc6cd9531e3a44134bce6206cba23c99c1d069850f85e0e222a0749de571d647e57a6f122dba6992661ef819f884581c7bcf
-  data.tar.gz: e62fa41cc97a4d777e10872d4ec9df6690ca5a5c6d773d8e01de897b93e41880e6bd676a5756776bbdf91629977402c6dec8f7e269a2c32909f1b62143773ba5
+  metadata.gz: 8d58caa196cbc38e9178dba6fa0efdcdde270d298ef5c3f34e523f5281630ae18c32bac9bd6da379fb7b758a536b94afc2c3c3faddb68118c5ccb64255c256da
+  data.tar.gz: 85f826a48ba40d0e3d48e4806cc52faf265c058b53421af32efdc67eb811075f99c7e83488f6aab85b141478cac104c2d1031931374df75c650972107c8acd5a

data/lib/binaryen/command.rb

@@ -3,6 +3,7 @@
 require "English"
 require "shellwords"
 require "timeout"
+require "posix/spawn"
 
 module Binaryen
   # Wrapper around a binaryen executable command with a timeout and streaming IO.
@@ -14,6 +15,8 @@ module Binaryen
   #   optimized_wasm = command.run("-O4", stdin: "(module)")
   #   ```
   class Command
+    include POSIX::Spawn
+
     DEFAULT_ARGS_FOR_COMMAND = {
       "wasm-opt" => ["--output=-"],
     }.freeze
@@ -41,23 +44,26 @@ module Binaryen
       @default_args = DEFAULT_ARGS_FOR_COMMAND.fetch(cmd, [])
     end
 
-    def run(*arguments, stdin: nil, stderr: File::NULL)
+    def run(*arguments, stdin: nil, stderr: nil)
       end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
       command = build_command(*arguments)
-      pipe = IO.popen(command, "rb+", err: stderr)
-      pid = pipe.pid
+      pid, iwr, ord, erd = popen4(*command)
       timeout_checker = TimeoutChecker.new(end_time: end_time, pid: pid)
 
-      write_to_pipe(pipe, stdin, timeout_checker) if stdin
-      output = read_from_pipe(pipe, timeout_checker)
-      wait_or_kill(pid, timeout_checker)
+      write_to_pipe(iwr, stdin, timeout_checker) if stdin
+      if stderr
+        err_output = read_from_pipe(erd, timeout_checker)
+        write_to_pipe(stderr, err_output, timeout_checker, close_write: false)
+      end
+      output = read_from_pipe(ord, timeout_checker)
+      wait_or_kill(pid, timeout_checker, erd, stderr)
 
       output
     end
 
     private
 
-    def write_to_pipe(pipe, stdin, timeout_checker)
+    def write_to_pipe(pipe, stdin, timeout_checker, close_write: true)
       offset = 0
       length = stdin.bytesize
 
@@ -72,7 +78,7 @@ module Binaryen
         end
       end
 
-      pipe.close_write
+      pipe.close_write if close_write
     end
 
     def read_from_pipe(pipe, timeout_checker)
@@ -95,13 +101,15 @@ module Binaryen
       output
     end
 
-    def wait_or_kill(pid, timeout_checker)
+    def wait_or_kill(pid, timeout_checker, err_read, err_write)
       loop do
         remaining_time = timeout_checker.check!
         raise Timeout::Error, "timed out waiting on process" if remaining_time <= 0
 
         if (_, status = Process.wait2(pid, Process::WNOHANG))
-          raise Binaryen::NonZeroExitStatus, "command exited with status #{status.exitstatus}" if status.exitstatus != 0
+
+          raise Binaryen::NonZeroExitStatus,
+            "command exited with status #{status.exitstatus}" if status.exitstatus != 0
 
           return true
         else
@@ -111,7 +119,7 @@ module Binaryen
     end
 
     def build_command(*arguments)
-      Shellwords.join([@cmd] + arguments + @default_args)
+      [@cmd] + arguments + @default_args
     end
 
     def command_path(cmd, ignore_missing)

data/lib/binaryen/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Binaryen
-  VERSION = "1.1.6.2"
+  VERSION = "1.1.6.4"
   BINARYEN_VERSION = "version_116"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: binaryen
 version: !ruby/object:Gem::Version
-  version: 1.1.6.2
+  version: 1.1.6.4
 platform: ruby
 authors:
 - Shopify Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
-dependencies: []
+date: 2023-12-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: posix-spawn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.15
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.15
 description: 
 email:
 - gems@shopify.com