binaryen 1.1.6.2 → 1.1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 502cfbb2e9e33d3b32d5ab1881bf097fc7321bcb8746e2ae4b4142a6dbe3727a
-  data.tar.gz: 20c543218c8b5c256012e3b386e4cf6ceda9461899f10d990edcba0b983dbc17
+  metadata.gz: ae90a4e59e6f813687257623ab4d4a35633c9409de5459101d8080d65fe1fdf1
+  data.tar.gz: 20c161cfa875c14801d03ae2f7a43f5342a0e0a8b9c70f9d9e2d1f44b722f3e7
 SHA512:
-  metadata.gz: 2a9d8542c524badbeb6721a9b6e9fc6cd9531e3a44134bce6206cba23c99c1d069850f85e0e222a0749de571d647e57a6f122dba6992661ef819f884581c7bcf
-  data.tar.gz: e62fa41cc97a4d777e10872d4ec9df6690ca5a5c6d773d8e01de897b93e41880e6bd676a5756776bbdf91629977402c6dec8f7e269a2c32909f1b62143773ba5
+  metadata.gz: 74f7b3010d06316d25eb8b3e74fc2fd33b60f50fcd3bd6db83db8b11c135e003f49f460779e02992e0826a86240b220d3c8e1c82e56361e1e6d054cc7b172679
+  data.tar.gz: 90de5bc2e078f8083116a8dc8244e3807185ff35c1697ef210070bcd4f01d7bf730f13fa1731f479b06032dcc778109faf848a0daa2da0915ab7fe18b033a3e0

data/lib/binaryen/command.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require "English"
-require "shellwords"
 require "timeout"
+require "posix/spawn"
 
 module Binaryen
   # Wrapper around a binaryen executable command with a timeout and streaming IO.
@@ -42,76 +41,25 @@ module Binaryen
     end
 
     def run(*arguments, stdin: nil, stderr: File::NULL)
-      end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
-      command = build_command(*arguments)
-      pipe = IO.popen(command, "rb+", err: stderr)
-      pid = pipe.pid
-      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)
-
-      output
-    end
-
-    private
-
-    def write_to_pipe(pipe, stdin, timeout_checker)
-      offset = 0
-      length = stdin.bytesize
-
-      while offset < length
-        remaining_time = timeout_checker.check!
-
-        if IO.select(nil, [pipe], nil, remaining_time)
-          written = pipe.write_nonblock(stdin.byteslice(offset, length), exception: false)
-          offset += written if written.is_a?(Integer)
-        else
-          raise Timeout::Error, "Command timed out"
-        end
+      args = build_arguments(*arguments)
+      child = POSIX::Spawn::Child.new(@cmd, *args, input: stdin, timeout: @timeout)
+      if child.status && !child.status.success?
+        err_io = stderr.is_a?(String) ? File.open(stderr, "w") : stderr
+        err_io.binmode
+        err_io.write(child.err)
+        err_io.rewind
+        raise NonZeroExitStatus, "command exited with non-zero status: #{child.status}"
       end
 
-      pipe.close_write
+      child.out
+    rescue POSIX::Spawn::TimeoutExceeded => e
+      raise Timeout::Error, e.message
     end
 
-    def read_from_pipe(pipe, timeout_checker)
-      output = +""
-
-      while (result = pipe.read_nonblock(8192, exception: false))
-        remaining_time = timeout_checker.check!
-        raise Timeout::Error, "Command timed out" if remaining_time <= 0
-
-        case result
-        when :wait_readable
-          IO.select([pipe], nil, nil, remaining_time)
-        when nil
-          break
-        else
-          output << result
-        end
-      end
-
-      output
-    end
-
-    def wait_or_kill(pid, timeout_checker)
-      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
-
-          return true
-        else
-          sleep(0.1)
-        end
-      end
-    end
+    private
 
-    def build_command(*arguments)
-      Shellwords.join([@cmd] + arguments + @default_args)
+    def build_arguments(*arguments)
+      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.3"
   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.3
 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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: 
 email:
 - gems@shopify.com