binaryen 1.1.6.1 → 1.1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f28c12d0f3983f4a8856a70bd62767df1021eac072a97edea0174b59648519d1
-  data.tar.gz: 6973598a0a4d375e1445a6d463853b6a37a4343b735c191fa10b7457cdb4273e
+  metadata.gz: ae90a4e59e6f813687257623ab4d4a35633c9409de5459101d8080d65fe1fdf1
+  data.tar.gz: 20c161cfa875c14801d03ae2f7a43f5342a0e0a8b9c70f9d9e2d1f44b722f3e7
 SHA512:
-  metadata.gz: 31693bb150232527b2ebae35f6a44f72d3af7a02ec3d6370df366226eb7e4b718375db2c832f6fe169a843c1c4b4ced9116d0d4e247a4805d473c01f8d9677a9
-  data.tar.gz: feac4bb36b20f5b5e0d7907fb2cad013e2c90c23bb5cdb7b233ca0e74407ab558de9f765b2bd8adcbe9148976363b1dca9781b6dbf37dead3f0dac867c36eaad
+  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.
@@ -18,107 +17,49 @@ module Binaryen
       "wasm-opt" => ["--output=-"],
     }.freeze
 
-    def initialize(cmd, timeout: 10, ignore_missing: false)
-      @cmd = command_path(cmd, ignore_missing) || raise(ArgumentError, "command not found: #{cmd}")
-      @timeout = timeout
-      @default_args = DEFAULT_ARGS_FOR_COMMAND.fetch(cmd, [])
-    end
-
-    def run(*arguments, stdin: nil, stderr: File::NULL)
-      command = build_command(*arguments)
-      pipe = IO.popen(command, "rb+", err: stderr)
-      pid = pipe.pid
-      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      remaining_timeout = @timeout
-
-      if stdin
-        start_time, remaining_timeout = write_to_pipe(pipe, stdin, start_time, remaining_timeout)
+    class TimeoutChecker
+      def initialize(end_time:, pid:)
+        @end_time = end_time
+        @pid = pid
       end
 
-      output, remaining_timeout = read_from_pipe(pipe, start_time, remaining_timeout)
-
-      wait_or_kill(pid, start_time, remaining_timeout)
-
-      output
-    end
-
-    private
-
-    def write_to_pipe(pipe, stdin, start_time, remaining_timeout)
-      offset = 0
-      length = stdin.bytesize
-
-      while offset < length
-        start_time, remaining_timeout = update_timeout(start_time, remaining_timeout)
-        if IO.select(nil, [pipe], nil, remaining_timeout)
-          written = pipe.write_nonblock(stdin.byteslice(offset, length), exception: false)
-          case written
-          when Integer
-            offset += written
-          when :wait_writable
-            puts "wait"
-            # If the pipe is not ready for writing, retry
-          end
-        else
+      def check!
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        if now >= @end_time
+          Process.kill("KILL", @pid)
           raise Timeout::Error, "Command timed out"
         end
+        remaining_time = @end_time - now
+        remaining_time
       end
-
-      pipe.close_write
-      [start_time, remaining_timeout]
-    end
-
-    def read_from_pipe(pipe, start_time, remaining_timeout)
-      output = +""
-
-      while (result = pipe.read_nonblock(8192, exception: false))
-        start_time, remaining_timeout = update_timeout(start_time, remaining_timeout)
-
-        case result
-        when :wait_readable
-          IO.select([pipe], nil, nil, remaining_timeout)
-        when nil
-          break
-        else
-          output << result
-        end
-      end
-
-      [output, remaining_timeout]
     end
 
-    def update_timeout(start_time, remaining_timeout)
-      elapsed_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time
-      remaining_timeout -= elapsed_time
-
-      raise Timeout::Error, "command timed out" if remaining_timeout <= 0
-
-      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-
-      [start_time, remaining_timeout]
+    def initialize(cmd, timeout: 10, ignore_missing: false)
+      @cmd = command_path(cmd, ignore_missing) || raise(ArgumentError, "command not found: #{cmd}")
+      @timeout = timeout
+      @default_args = DEFAULT_ARGS_FOR_COMMAND.fetch(cmd, [])
     end
 
-    def wait_or_kill(pid, start_time, remaining_timeout)
-      while remaining_timeout > 0
-        start_time, remaining_timeout = update_timeout(start_time, remaining_timeout)
-
-        if (_, status = Process.wait2(pid, Process::WNOHANG))
-          if status.exitstatus != 0
-            raise Binaryen::NonZeroExitStatus, "command exited with status #{status.exitstatus}"
-          end
-
-          return true
-        else
-          sleep(0.1)
-        end
+    def run(*arguments, stdin: nil, stderr: File::NULL)
+      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
 
-      Process.kill("KILL", pid)
-      raise Timeout::Error, "timed out waiting on process"
+      child.out
+    rescue POSIX::Spawn::TimeoutExceeded => e
+      raise Timeout::Error, e.message
     end
 
-    def build_command(*arguments)
-      Shellwords.join([@cmd] + arguments + @default_args)
+    private
+
+    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.1"
+  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.1
+  version: 1.1.6.3
 platform: ruby
 authors:
 - Shopify Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-02 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
@@ -92,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.22
 signing_key: 
 specification_version: 4
 summary: Vendors binaryen libraries, headers, and executables for use in Ruby