yamatanooroti 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f7c72bc6c902dd8b5cdf5d02183954cba1180960c702e5642c208b074e2ccd5
-  data.tar.gz: d5dfea77ef4a055e0e278fa7447d96e1c473ce7aa4108062c99e3fc1d3e3d499
+  metadata.gz: 92dcb67921820e4dedad1aed9de7d18c062f623c9b73c4a05427049111217f4a
+  data.tar.gz: 5683fb3c7544c67dc4c1f024df1b8fd9953c6378be0826a6f834191cf5c694e8
 SHA512:
-  metadata.gz: d4242ac34c419417a1e8035968b26f4587d6d5c332852a73dad9d413b0b06447b1cd0969272b344bd3bc4a26fc4934e2a156cfc740d44fe53344f4d1f130048a
-  data.tar.gz: 1f2679e02d8183d15c5ded5baa273d6ca1b4b299335145a4141066c3f315a0277623ca64caa1e0f5bdffe205280ce2b9b27cfe7b1f728c71e03f8293d7211b1c
+  metadata.gz: 6c614da80dcaf5b4ff0799be9be726fa0ea61fcc8ae1f53a4219e61cb17a86d3dee3e9e3fce5663b7224493b53ee0f379359859f448b10963306959647169c16
+  data.tar.gz: 0e2d1c4d031666509d85c5abc5a8d0f847d3c50392aec52df6f920269ebdff7fb99ac0442c1e582e8edd06f74f124dc9de559a5db8bc271510b331afbdc0f53b

data/lib/yamatanooroti/version.rb

@@ -1,3 +1,3 @@
 class Yamatanooroti
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/yamatanooroti/vterm.rb

@@ -5,6 +5,7 @@ require 'pty'
 module Yamatanooroti::VTermTestCaseModule
   def start_terminal(height, width, command, wait: 0.1)
     @wait = wait
+    @result = nil
 
     @pty_output, @pty_input, @pid = PTY.spawn(*command)
 
@@ -27,6 +28,7 @@ module Yamatanooroti::VTermTestCaseModule
     sync
     @pty_input.close
     sync
+    Process.kill('KILL', @pid)
   end
 
   private def sync
@@ -45,17 +47,23 @@ module Yamatanooroti::VTermTestCaseModule
     end
   end
 
-  def assert_screen(expected_lines)
-    actual_lines = []
+  def result
+    return @result if @result
+    @result = []
     rows, cols = @vterm.size
     rows.times do |r|
-      actual_lines << ''
+      @result << ''
       cols.times do |c|
         cell = @screen.cell_at(r, c)
-        actual_lines.last << cell.char if cell.char
+        @result.last << cell.char if cell.char
       end
-      actual_lines.last.gsub!(/ *$/, '')
+      @result.last.gsub!(/ *$/, '')
     end
+    @result
+  end
+
+  def assert_screen(expected_lines)
+    actual_lines = result
     case expected_lines
     when Array
       assert_equal(expected_lines, actual_lines)

data/lib/yamatanooroti/vterm.rb.orig

@@ -0,0 +1,70 @@
+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

data/lib/yamatanooroti/windows.rb

@@ -212,10 +212,10 @@ module Yamatanooroti::WindowsTestCaseModule
 
   private def setup_console(height, width)
 
-    result = DL.FreeConsole
-    error_message(result, 'FreeConsole')
-    result = DL.AllocConsole
-    error_message(result, 'AllocConsole')
+    r = DL.FreeConsole
+    error_message(r, 'FreeConsole')
+    r = DL.AllocConsole
+    error_message(r, 'AllocConsole')
     @output_handle = DL.GetStdHandle(DL::STD_OUTPUT_HANDLE)
 
 =begin
@@ -228,8 +228,8 @@ module Yamatanooroti::WindowsTestCaseModule
     font.FontFamily = 0
     font.FontWeight = 0
     font.FaceName[0] = "\x00".ord
-    result = DL.SetCurrentConsoleFontEx(@output_handle, 0, font)
-    error_message(result, 'SetCurrentConsoleFontEx')
+    r = DL.SetCurrentConsoleFontEx(@output_handle, 0, font)
+    error_message(r, 'SetCurrentConsoleFontEx')
 =end
 
     rect = DL::SMALL_RECT.malloc
@@ -237,16 +237,16 @@ module Yamatanooroti::WindowsTestCaseModule
     rect.Top = 0
     rect.Right = width - 1
     rect.Bottom = height - 1
-    result = DL.SetConsoleWindowInfo(@output_handle, 1, rect)
-    error_message(result, 'SetConsoleWindowInfo')
+    r = DL.SetConsoleWindowInfo(@output_handle, 1, rect)
+    error_message(r, 'SetConsoleWindowInfo')
 
     size = DL.GetSystemMetrics(DL::SM_CYMIN) * 65536 + DL.GetSystemMetrics(DL::SM_CXMIN)
-    result = DL.SetConsoleScreenBufferSize(@output_handle, size)
-    error_message(result, 'SetConsoleScreenBufferSize')
+    r = DL.SetConsoleScreenBufferSize(@output_handle, size)
+    error_message(r, 'SetConsoleScreenBufferSize')
 
     size = height * 65536 + width
-    result = DL.SetConsoleScreenBufferSize(@output_handle, size)
-    error_message(result, 'SetConsoleScreenBufferSize')
+    r = DL.SetConsoleScreenBufferSize(@output_handle, size)
+    error_message(r, 'SetConsoleScreenBufferSize')
   end
 
   private def mb2wc(str)
@@ -289,19 +289,19 @@ module Yamatanooroti::WindowsTestCaseModule
     (@pi.to_ptr + 0)[0, DL::PROCESS_INFORMATION.size] = "\x00" * DL::PROCESS_INFORMATION.size
     @startup_info_ex = DL::STARTUPINFOW.malloc
     (@startup_info_ex.to_ptr + 0)[0, DL::STARTUPINFOW.size] = "\x00" * DL::STARTUPINFOW.size
-    result = DL.CreateProcessW(
+    r = DL.CreateProcessW(
       Fiddle::NULL, converted_command,
       Fiddle::NULL, Fiddle::NULL, 0, 0, Fiddle::NULL, Fiddle::NULL,
       @startup_info_ex, @pi
     )
-    error_message(result, 'CreateProcessW')
+    error_message(r, 'CreateProcessW')
     sleep @wait
   rescue => e
     pp e
   end
 
-  private def error_message(result, method_name)
-    return if not result.zero?
+  private def error_message(r, method_name)
+    return if not r.zero?
     err = DL.GetLastError
     string = Fiddle::Pointer.malloc(Fiddle::SIZEOF_VOIDP)
     DL.FormatMessage(
@@ -349,8 +349,8 @@ module Yamatanooroti::WindowsTestCaseModule
       r.dwControlKeyState = 0
     end
     written_size = Fiddle::Pointer.malloc(Fiddle::SIZEOF_DWORD, DL::FREE)
-    result = DL.WriteConsoleInputW(DL.GetStdHandle(DL::STD_INPUT_HANDLE), records, str.size * 2, written_size)
-    error_message(result, 'WriteConsoleInput')
+    r = DL.WriteConsoleInputW(DL.GetStdHandle(DL::STD_INPUT_HANDLE), records, str.size * 2, written_size)
+    error_message(r, 'WriteConsoleInput')
   end
 
   private def free_resources
@@ -358,27 +358,28 @@ module Yamatanooroti::WindowsTestCaseModule
     pe = DL::PROCESSENTRY32W.malloc
     (pe.to_ptr + 0)[0, DL::PROCESSENTRY32W.size] = "\x00" * DL::PROCESSENTRY32W.size
     pe.dwSize = DL::PROCESSENTRY32W.size
-    result = DL.Process32FirstW(h_snap, pe)
-    error_message(result, "Process32First")
-    result = DL.FreeConsole()
-    #error_message(result, "FreeConsole")
-    result = DL.AttachConsole(DL::ATTACH_PARENT_PROCESS)
-    error_message(result, 'AttachConsole')
+    r = DL.Process32FirstW(h_snap, pe)
+    error_message(r, "Process32First")
     loop do
       #log "a #{pe.th32ParentProcessID.inspect} -> #{pe.th32ProcessID.inspect} #{wc2mb(pe.szExeFile.pack('S260')).unpack('Z*').pack('Z*')}"
       if pe.th32ParentProcessID == DL.GetCurrentProcessId
         h_child_proc = DL.OpenProcess(DL::PROCESS_ALL_ACCESS, 0, pe.th32ProcessID)
         if (h_child_proc)
-          result = DL.TerminateProcess(h_child_proc, 0)
-          error_message(result, "TerminateProcess")
-          result = DL.CloseHandle(h_child_proc)
-          error_message(result, "CloseHandle")
+          r = DL.TerminateProcess(h_child_proc, 0)
+          error_message(r, "TerminateProcess")
+          r = DL.CloseHandle(h_child_proc)
+          error_message(r, "CloseHandle")
         end
       end
       break if DL.Process32NextW(h_snap, pe).zero?
     end
-    result = DL.TerminateThread(@pi.hThread, 0)
-    error_message(result, "TerminateThread")
+    r = DL.TerminateThread(@pi.hThread, 0)
+    error_message(r, "TerminateThread")
+    sleep @wait
+    r = DL.FreeConsole()
+    #error_message(r, "FreeConsole")
+    r = DL.AttachConsole(DL::ATTACH_PARENT_PROCESS)
+    error_message(r, 'AttachConsole')
   end
 
   def close
@@ -390,8 +391,8 @@ module Yamatanooroti::WindowsTestCaseModule
     region.Top = 0
     region.Right = @width
     region.Bottom = @height
-    result = DL.ReadConsoleOutputW(@output_handle, char_info_matrix, @height * 65536 + @width, 0, region)
-    error_message(result, "ReadConsoleOutputW")
+    r = DL.ReadConsoleOutputW(@output_handle, char_info_matrix, @height * 65536 + @width, 0, region)
+    error_message(r, "ReadConsoleOutputW")
     @result = []
     prev_c = nil
     @height.times do |y|
@@ -413,6 +414,10 @@ module Yamatanooroti::WindowsTestCaseModule
     free_resources
   end
 
+  def result
+    @result
+  end
+
   def assert_screen(expected_lines)
     case expected_lines
     when Array
@@ -426,6 +431,7 @@ module Yamatanooroti::WindowsTestCaseModule
     @height = height
     @width = width
     @wait = wait
+    @result = nil
     setup_console(height, width)
     launch(command.join(' '))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yamatanooroti
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - aycabta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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
@@ -50,6 +64,7 @@ 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: