tarazed 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7770f7ce8eac23698c2c294317d339ac24135b86b9f8203ee43f63229c1c4d4
-  data.tar.gz: d3aecd412f31417f961d10e07b683c07d2feeea3d5596b8d6218fde0a01e117d
+  metadata.gz: c41400c6ac1b8380eac0eaebe756d80425c06b4273f709e8902467276d622d80
+  data.tar.gz: 1a859372283bf896d16bacfd9b444ed02ad891279cdd0315cc8d072d8d7852f9
 SHA512:
-  metadata.gz: 5c6164054701b25e94dac45e3cd5359126f591d450a9ad1c817b9e2537c3117f77286c23354cc9a1b5585d7e991ca919f29085f5fcbab1d414305e97358f0e2a
-  data.tar.gz: 660218a61bf1017d59d90219d9beb040847ccaa8154b2f5dabdca23a0dff72d30a92e4537619a32808dec6d9ea65d64b5c67281e618f389d7978d3ab9c38d7d5
+  metadata.gz: 3f007338660554ed33a141db5cf1b2fe4143837828cb5dbe723e083c4f9eba82d45593eef7c8c6ba3083a67150da1353515b34a9ff055a195e50cce788b83b5a
+  data.tar.gz: 912b5f4857e5cb99296ecfb7666eaeeb3c853397af6b8df1a94233f79c4aac3c0c9a3f5deb035d0f86d15ff260daaaa47ffddfb530da71f1eb36eb136f096191

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 0.2.3 - 2026-09-18
+
+- Report the executable basename from string commands that include arguments.
+
+## 0.2.2 - 2026-09-17
+
+- Drain final Windows ConPTY output to EOF after the primary process exits without racing resize or close.
+
 ## 0.2.1 - 2026-09-16
 
 - Report and cache natural Windows ConPTY process exit status through the cross-platform `PTY#status` API.

data/lib/tarazed/pty.rb

@@ -14,7 +14,16 @@ module Tarazed
       end
 
       @initial_cwd = File.expand_path(cwd)
-      @command_name = File.basename(Array(command).first.to_s)
+      executable = if command.is_a?(Array)
+        command.first
+      elsif Gem.win_platform?
+        value = command.to_s.lstrip
+        value.start_with?('"') ? value[/\A"([^"]*)"/, 1] : value.split(/\s/, 2).first
+      else
+        Shellwords.split(command.to_s).first
+      end
+      executable = executable.to_s.tr("\\", "/") if Gem.win_platform?
+      @command_name = File.basename(executable.to_s)
       @grid = Grid.new(columns: columns, rows: rows, scrollback: scrollback)
       if Gem.win_platform?
         require_relative "windows/conpty"

data/lib/tarazed/shell_integration.rb

@@ -8,7 +8,7 @@ module Tarazed
     module_function
 
     def path(shell)
-      name = File.basename(shell.to_s).to_sym
+      name = File.basename(shell.to_s).downcase.delete_suffix(".exe").to_sym
       file = NAMES.fetch(name) { raise ArgumentError, "unsupported shell: #{shell}" }
       File.expand_path("../../assets/shell-integration/#{file}", __dir__)
     end

data/lib/tarazed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tarazed
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/lib/tarazed/windows/conpty.rb

@@ -22,7 +22,10 @@ module Tarazed
       P, I, U, N, V = Fiddle::TYPE_VOIDP, Fiddle::TYPE_INT, Fiddle::TYPE_UINT, Fiddle::TYPE_SIZE_T,
         Fiddle::TYPE_VOID
       STILL_ACTIVE = 259
-      private_constant :P, :I, :U, :N, :V
+      WAIT_OBJECT_0 = 0
+      WAIT_TIMEOUT = 258
+      EXIT_POLL_MILLISECONDS = 10
+      private_constant :P, :I, :U, :N, :V, :WAIT_OBJECT_0, :WAIT_TIMEOUT, :EXIT_POLL_MILLISECONDS
 
       class Status
         attr_reader :exitstatus
@@ -41,6 +44,7 @@ module Tarazed
       attr_reader :pid
 
       def initialize(command: nil, columns: 80, rows: 24, cwd: nil, env: {}, kernel: nil)
+        @console_lock, @lifecycle_lock = Mutex.new, Mutex.new
         raise Error, "ConPTY requires 64-bit Windows Ruby" unless Fiddle::SIZEOF_VOIDP == 8
 
         @kernel = kernel || Library.new("kernel32.dll")
@@ -55,6 +59,7 @@ module Tarazed
         attributes = process_attributes(@console)
         @process, @pid = spawn(command, cwd, env, attributes)
         start_reader
+        start_exit_watcher
       rescue Fiddle::DLError, LoadError => error
         release
         raise Error, "ConPTY is unavailable: #{error.message}"
@@ -116,7 +121,12 @@ module Tarazed
       end
 
       def resize(columns, rows)
-        check_hresult(function(:ResizePseudoConsole, [P, I], I).call(@console, coordinate(columns, rows)))
+        size = coordinate(columns, rows)
+        @console_lock.synchronize do
+          return unless @console
+
+          check_hresult(function(:ResizePseudoConsole, [P, I], I).call(@console, size))
+        end
       end
 
       def status
@@ -127,17 +137,20 @@ module Tarazed
       def alive? = !@closed && !status
 
       def close
-        return self if @closed
-
-        safely { refresh_status }
-        @closed = true
-        close_handle(@input_write)
-        @input_write = nil
-        close_console
-        @reader&.join(2)
-        close_handle(@output_read)
-        close_handle(@process)
-        @output_read = @process = nil
+        @lifecycle_lock.synchronize do
+          return self if @closed
+
+          safely { refresh_status }
+          @closed = true
+          close_handle(@input_write)
+          @input_write = nil
+          close_console
+          @watcher&.join
+          @reader&.join(2)
+          close_handle(@output_read)
+          close_handle(@process)
+          @output_read = @process = nil
+        end
         self
       end
 
@@ -241,20 +254,43 @@ module Tarazed
         end
       end
 
+      def start_exit_watcher
+        wait = function(:WaitForSingleObject, [P, U], U, need_gvl: false)
+        @watcher = Thread.new do
+          loop do
+            result = wait.call(@process, EXIT_POLL_MILLISECONDS)
+            break if @closed
+            if result == WAIT_OBJECT_0
+              close_console
+              break
+            end
+            raise SystemCallError.new("WaitForSingleObject", Fiddle.last_error) unless result == WAIT_TIMEOUT
+          end
+        end
+      end
+
       def close_console
-        return unless @console
+        console = @console_lock.synchronize do
+          value = @console
+          @console = nil
+          value
+        end
+        return unless console
 
-        function(:ClosePseudoConsole, [P], V, need_gvl: false).call(@console)
-        @console = nil
+        function(:ClosePseudoConsole, [P], V, need_gvl: false).call(console)
       end
 
       def release
-        safely { close_handle(@input_write) }
-        safely { close_console }
-        @reader&.join(2)
-        safely { close_handle(@output_read) }
-        safely { close_handle(@process) }
-        @input_write = @output_read = @process = nil
+        @lifecycle_lock.synchronize do
+          @closed = true
+          safely { close_handle(@input_write) }
+          safely { close_console }
+          @watcher&.join
+          @reader&.join(2)
+          safely { close_handle(@output_read) }
+          safely { close_handle(@process) }
+          @input_write = @output_read = @process = nil
+        end
       end
 
       def safely

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarazed
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Yudai Takada