Do a better job of cleaning up keypress listener thread

lib/mighty_test/watcher.rb

@@ -33,12 +33,13 @@ def run(iterations: :indefinitely) # rubocop:disable Metrics/MethodLength
       end
     ensure
       puts "\nExiting."
-      listener&.stop
+      file_system_listener&.stop
+      keypress_listener&.kill
     end
 
     private
 
-    attr_reader :console, :extra_args, :file_system, :listener, :system_proc
+    attr_reader :console, :extra_args, :file_system, :file_system_listener, :keypress_listener, :system_proc
 
     def run_all_tests
       console.clear
@@ -81,26 +82,24 @@ def mt(*test_paths)
     end
 
     def start_file_system_listener
-      listener.stop if listener && !listener.stopped?
+      file_system_listener.stop if file_system_listener && !file_system_listener.stopped?
 
-      @listener = file_system.listen do |modified, added, _removed|
+      @file_system_listener = file_system.listen do |modified, added, _removed|
         # Pause listener so that subsequent changes are queued up while we are running the tests
-        listener.pause unless listener.stopped?
+        file_system_listener.pause unless file_system_listener.stopped?
         post_event(:file_system_changed, [*modified, *added].uniq)
       end
     end
     alias restart_file_system_listener start_file_system_listener
 
     def start_keypress_listener
-      Thread.new do
+      @keypress_listener = Thread.new do
         loop do
           key = console.wait_for_keypress
-          post_event(:keypress, key)
+          post_event(:keypress, key) if key
         rescue Interrupt
           retry
         end
-      rescue StandardError
-        # ignore
       end
     end
 
@@ -109,7 +108,7 @@ def loop_for(iterations, &)
     end
 
     def await_next_event
-      listener.start if listener.paused?
+      file_system_listener.start if file_system_listener.paused?
       @event.take
     end
 

test/mighty_test/watcher_test.rb

@@ -190,7 +190,7 @@ def paused?
 
     def run_watcher(iterations: :indefinitely, in: ".", extra_args: [], stdin: nil, file_system: FileSystem.new)
       listen_thread = @listen_thread
-      console = Console.new(stdin: stdin.nil? ? File::NULL : StringIO.new(stdin))
+      console = Console.new(stdin: stdin.nil? ? StringIO.new("") : StringIO.new(stdin))
       console.define_singleton_method(:clear) { puts "[CLEAR]" }
       console.define_singleton_method(:play_sound) { |sound| puts "[SOUND] #{sound.inspect}" }
       file_system.define_singleton_method(:listen) { |&callback| Listener.new(listen_thread, callback) }