yamatanooroti 0.0.5 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 642a33b1504b4ecfdf9698597be8c5cff356950cfe71379cfb8c05ae6af45ec6
-  data.tar.gz: 8f4c37ab46ff74d2f14f4f2069c0b7c1847ea59c5d6b43990eaeff462c99474e
+  metadata.gz: a51e36e0f854db73b07bb49b5d1d5814daba6677de910fe7e3abc9b2099364f7
+  data.tar.gz: 00d11181f6e956a9fca14e84d4ec5b39896575bab9044b6092b6733c32805f8b
 SHA512:
-  metadata.gz: d017372f678c86f9e7f3dc0f6a6d96b4f26a0de534d96e508fe92b63e2ff129f2ae664dff1dcb4170aea0208420d014d5587ba66b6081c13d98713157f3a9c17
-  data.tar.gz: 77e04395752636618fd8202ccd8942440e7d5dfaa920d5650f60dd8b5ad4e83581d07297fcae62af46147ef063e25ee3ea0a2ab9531d840a2818d24a79c9fbeb
+  metadata.gz: fd489a9b4f90e6736fb035176d1942d87a8057dc6578a516703a0da4f9110a497b07983d5028db8747afe754f59191dacbda937dd29e28acf52fce1937998e0b
+  data.tar.gz: cd56856af0b8fd4f6809cf838389a2a199013ccf4d0f19c886bb7ffc3c769bc1447a87e36abfc1c359bf346cf2e60f94898f2b034427921410a1913a8b9641f5

data/lib/yamatanooroti/version.rb

@@ -1,3 +1,3 @@
 class Yamatanooroti
-  VERSION = '0.0.5'
+  VERSION = '0.0.9'
 end

data/lib/yamatanooroti/vterm.rb

@@ -30,7 +30,18 @@ module Yamatanooroti::VTermTestCaseModule
 
   def write(str)
     sync
-    @pty_input.write(str)
+    str_to_write = String.new(encoding: Encoding::ASCII_8BIT)
+    str.chars.each do |c|
+      byte = c.force_encoding(Encoding::ASCII_8BIT).ord
+      if c.bytesize == 1 and byte.allbits?(0x80) # with Meta key
+        c = (byte ^ 0x80).chr
+        str_to_write << "\e"
+        str_to_write << c
+      else
+        str_to_write << c
+      end
+    end
+    @pty_input.write(str_to_write)
     sync
   end
 
@@ -79,7 +90,15 @@ module Yamatanooroti::VTermTestCaseModule
       @result << ''
       cols.times do |c|
         cell = @screen.cell_at(r, c)
-        @result.last << cell.char if cell.char
+        if cell.char # The second cell of fullwidth char will be nil.
+          if cell.char.empty?
+            # There will be no char to the left of the rendered area if moves
+            # the cursor.
+            @result.last << ' '
+          else
+            @result.last << cell.char
+          end
+        end
       end
       @result.last.gsub!(/ *$/, '')
     end

data/lib/yamatanooroti/windows.rb

@@ -147,6 +147,7 @@ module Yamatanooroti::WindowsDefinition
   TH32CS_SNAPPROCESS = 0x00000002
   PROCESS_ALL_ACCESS = 0x001FFFFF
   SW_HIDE = 0
+  LEFT_ALT_PRESSED = 0x0002
 
   # HANDLE GetStdHandle(DWORD nStdHandle);
   extern 'HANDLE GetStdHandle(DWORD);', :stdcall
@@ -169,6 +170,10 @@ module Yamatanooroti::WindowsDefinition
   extern 'BOOL SetConsoleWindowInfo(HANDLE, BOOL, PSMALL_RECT);', :stdcall
   # BOOL WriteConsoleInputW(HANDLE hConsoleInput, const INPUT_RECORD *lpBuffer, DWORD nLength, LPDWORD lpNumberOfEventsWritten);
   extern 'BOOL WriteConsoleInputW(HANDLE, const INPUT_RECORD*, DWORD, LPDWORD);', :stdcall
+  # SHORT VkKeyScanW(WCHAR ch);
+  extern 'SHORT VkKeyScanW(WCHAR);', :stdcall
+  # UINT MapVirtualKeyW(UINT uCode, UINT uMapType);
+  extern 'UINT MapVirtualKeyW(UINT, UINT);', :stdcall
   # BOOL ReadConsoleOutputW(HANDLE hConsoleOutput, PCHAR_INFO lpBuffer, COORD dwBufferSize, COORD dwBufferCoord, PSMALL_RECT lpReadRegion);
   extern 'BOOL ReadConsoleOutputW(HANDLE, PCHAR_INFO, COORD, COORD, PSMALL_RECT);', :stdcall
   # BOOL WINAPI SetCurrentConsoleFontEx(HANDLE hConsoleOutput, BOOL bMaximumWindow, PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx);
@@ -362,33 +367,43 @@ module Yamatanooroti::WindowsTestCaseModule
 
   def write(str)
     sleep @wait
-    str.tr!("\n", "\r")
+    str.force_encoding(Encoding::ASCII_8BIT).tr!("\n", "\r")
     records = Fiddle::Pointer.malloc(DL::INPUT_RECORD_WITH_KEY_EVENT.size * str.size * 2, DL::FREE)
     str.chars.each_with_index do |c, i|
+      byte = c.ord
+      if c.bytesize == 1 and byte.allbits?(0x80) # with Meta key
+        c = (byte ^ 0x80).chr
+        control_key_state = DL::LEFT_ALT_PRESSED
+      else
+        control_key_state = 0
+      end
       record_index = i * 2
       r = DL::INPUT_RECORD_WITH_KEY_EVENT.new(records + DL::INPUT_RECORD_WITH_KEY_EVENT.size * record_index)
-      r.EventType = DL::KEY_EVENT
-      r.bKeyDown = 1
-      r.wRepeatCount = 0
-      r.wVirtualKeyCode = 0
-      r.wVirtualScanCode = 0
-      r.UnicodeChar = c.unpack('U').first
-      r.dwControlKeyState = 0
+      set_input_record(r, c, true, control_key_state)
       record_index = i * 2 + 1
       r = DL::INPUT_RECORD_WITH_KEY_EVENT.new(records + DL::INPUT_RECORD_WITH_KEY_EVENT.size * record_index)
-      r.EventType = DL::KEY_EVENT
-      r.bKeyDown = 0
-      r.wRepeatCount = 0
-      r.wVirtualKeyCode = 0
-      r.wVirtualScanCode = 0
-      r.UnicodeChar = c.unpack('U').first
-      r.dwControlKeyState = 0
+      set_input_record(r, c, false, control_key_state)
     end
     written_size = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DWORD, DL::FREE)
     r = DL.WriteConsoleInputW(DL.GetStdHandle(DL::STD_INPUT_HANDLE), records, str.size * 2, written_size)
     error_message(r, 'WriteConsoleInput')
   end
 
+  private def set_input_record(r, c, key_down, control_key_state)
+    begin
+      code = c.unpack('U').first
+    rescue ArgumentError
+      code = c.bytes.first
+    end
+    r.EventType = DL::KEY_EVENT
+    r.bKeyDown = key_down ? 1 : 0
+    r.wRepeatCount = 1
+    r.wVirtualKeyCode = DL.VkKeyScanW(code)
+    r.wVirtualScanCode = DL.MapVirtualKeyW(code, 0)
+    r.UnicodeChar = code
+    r.dwControlKeyState = control_key_state
+  end
+
   private def free_resources
     h_snap = DL.CreateToolhelp32Snapshot(DL::TH32CS_SNAPPROCESS, 0)
     pe = DL::PROCESSENTRY32W.malloc
@@ -478,7 +493,7 @@ module Yamatanooroti::WindowsTestCaseModule
     end
   end
 
-  def start_terminal(height, width, command, wait: 1)
+  def start_terminal(height, width, command, wait: 1, startup_message: nil)
     @height = height
     @width = width
     @wait = wait

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yamatanooroti
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.9
 platform: ruby
 authors:
 - aycabta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: reline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "    Yamatanooroti is a multi-platform real(?) terminal test framework.\n"
 email:
 - aycabta@gmail.com
@@ -64,7 +78,6 @@ files:
 - lib/yamatanooroti.rb
 - lib/yamatanooroti/version.rb
 - lib/yamatanooroti/vterm.rb
-- lib/yamatanooroti/vterm.rb.orig
 - lib/yamatanooroti/windows.rb
 homepage: https://github.com/aycabta/yamatanooroti
 licenses:
@@ -85,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Multi-platform real(?) terminal test framework

data/lib/yamatanooroti/vterm.rb.orig

@@ -1,70 +0,0 @@
-require 'test-unit'
-require 'vterm'
-require 'pty'
-
-module Yamatanooroti::VTermTestCaseModule
-  def start_terminal(height, width, command, wait: 0.1)
-    @wait = wait
-
-    @pty_output, @pty_input, @pid = PTY.spawn(*command)
-
-    @vterm = VTerm.new(height, width)
-    @vterm.set_utf8(true)
-
-    @screen = @vterm.screen
-    @screen.reset(true)
-
-    sync
-  end
-
-  def write(str)
-    sync
-    @pty_input.write(str)
-    sync
-  end
-
-  def close
-    sync
-    @pty_input.close
-    sync
-  end
-
-  private def sync
-    loop do
-      sleep @wait
-      chunk = @pty_output.read_nonblock(1024)
-      @vterm.write(chunk)
-      chunk = @vterm.read
-      @pty_input.write(chunk)
-    rescue Errno::EAGAIN, Errno::EWOULDBLOCK
-      break
-    rescue Errno::EIO # EOF
-      break
-    rescue IO::EAGAINWaitReadable # emtpy buffer
-      break
-    end
-  end
-
-  def assert_screen(expected_lines)
-    actual_lines = []
-    rows, cols = @vterm.size
-    rows.times do |r|
-      actual_lines << ''
-      cols.times do |c|
-        cell = @screen.cell_at(r, c)
-        actual_lines.last << cell.char if cell.char
-      end
-      actual_lines.last.gsub!(/ *$/, '')
-    end
-    case expected_lines
-    when Array
-      assert_equal(expected_lines, actual_lines)
-    when String
-      assert_equal(expected_lines, actual_lines.join("\n").sub(/\n*\z/, "\n"))
-    end
-  end
-end
-
-class Yamatanooroti::VTermTestCase < Test::Unit::TestCase
-  include Yamatanooroti::VTermTestCaseModule
-end