wslc-wip 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49996dea1b8ae083cceb0caaafc0b8ddcc6de0a3ab8a7f5f4f856156948840d3
-  data.tar.gz: cca5758770d9f4364427c1ae7519ee8026c598b1002206fc9af8f22f5ffc0a64
+  metadata.gz: 37c2e70c286c4dd7b163201674eff9b4111fbe3f05ef032500a5b7ac516f97b5
+  data.tar.gz: fbad7b94e10bb0cbd9efc8c70f1a2546830ac0c20f276a925b48e0d668679902
 SHA512:
-  metadata.gz: df63da254bbbb1b6dedf5e56b5a78d8fbb09fd7d6dfa41ae0b3b58db600f07e8703ea3d729a4bb125e8d1a29e498ce8c3e4504e93d74ad51ce37b7d4a3bad0db
-  data.tar.gz: 8b8607bdda225610b7c7389210c16a04764aa95ba45748f9bcd3c384f9b6eb3ccb371342cea89a12749d7c4226f9fe6b94729c191513690b40168b339d21dd7b
+  metadata.gz: 70319980be04f8abdbb6d5e167e8941ca4fa3a8ab65b0cd71ec884daff639205a70935b4c5a756ec3403678982c2859423051930379aa3d79f302506b0f88326
+  data.tar.gz: f100b5622d566ab77da4437cb028138a7fa33f47d4d19ff70874c683e2995e9c3213bc95b0109c03c82556827a26ee22b47a034bf7fc96895effc2c8fcb3950f

data/lib/wip/command_runner.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'open3'
-require 'pty'
+require 'pty' unless Gem.win_platform?
 require 'io/console'
 
 module Wip
@@ -18,7 +18,7 @@ module Wip
 
     def run(command, env: {}, interactive: false, chdir: nil)
       @stderr.puts "+ #{CommandDisplay.for_debug(command)}" if @debug
-      return run_attached(command, env, chdir) if interactive
+      return run_interactive(command, env, chdir) if interactive
 
       opts = chdir ? { chdir: chdir } : {}
       captured = +''
@@ -41,6 +41,10 @@ module Wip
 
     private
 
+    def run_interactive(command, env, chdir)
+      Gem.win_platform? ? run_inherited(command, env, chdir) : run_attached(command, env, chdir)
+    end
+
     # exitstatus is nil when the process was killed by a signal instead of
     # exiting normally; fall back to the conventional 128+signal shell code
     # so callers always get a comparable integer.
@@ -82,6 +86,50 @@ module Wip
       130
     end
 
+    # Ruby's PTY library wraps openpty(3), which native Windows builds don't
+    # ship (require 'pty' is skipped there entirely, see the top of this
+    # file). Fall back to letting the child inherit wip's real stdio
+    # directly, same as `run` would've done pre-pty for the piped case: it
+    # still gives the child a real console (job control, Ctrl-C, isatty
+    # rendering all work), just without a way for wip to see the output, so
+    # report_hint can't run on failure here.
+    def run_inherited(command, env, chdir)
+      opts = chdir ? { chdir: chdir } : {}
+      opts[:in] = @stdin if io_stream?(@stdin)
+      opts[:out] = @stdout if io_stream?(@stdout)
+      opts[:err] = @stderr if io_stream?(@stderr)
+      pid = nil
+      pid = Process.spawn(env, *command, opts)
+      _, status = Process.wait2(pid)
+      exitstatus(status)
+    rescue Errno::ENOENT => e
+      @stderr.puts e.message
+      127
+    rescue Interrupt
+      reap_interrupted_child(pid)
+      @stderr.puts "\nwip: interrupted"
+      130
+    end
+
+    # Process.spawn can only redirect to real OS-backed streams (an IO, or
+    # something that wraps one via to_io) — StringIO and friends (used by
+    # tests, and by wip's own quiet/capture modes) aren't valid redirection
+    # targets. Fall back to the process's own inherited fds for those rather
+    # than passing them through and having Process.spawn reject them.
+    def io_stream?(stream) = stream.respond_to?(:to_io)
+
+    # The child shares wip's real controlling terminal here (unlike the pty
+    # path), so it already received the same Ctrl-C the terminal delivered to
+    # wip; there's nothing to kill, just something to reap so it doesn't
+    # linger as a zombie once wip moves on.
+    def reap_interrupted_child(pid)
+      return unless pid
+
+      Process.wait2(pid)
+    rescue Errno::ECHILD, Interrupt
+      nil
+    end
+
     def pump_attached(output, input, captured)
       stdin_thread = forward_stdin(input)
       loop do

data/lib/wip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wip
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wslc-wip
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Wip contributors