From 679bc4f9cb6a5471df903436c6240ca2157986dd Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@ruby-lang.org>
Date: Sun, 8 Sep 2019 21:04:46 +0900
Subject: [ruby/reline] Use IO#raw to read one byte

https://github.com/ruby/reline/commit/be17740e82
---
 lib/reline/ansi.rb        | 23 ++++-------------------
 lib/reline/reline.gemspec |  1 +
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/lib/reline/ansi.rb b/lib/reline/ansi.rb
index 6246a27107..8d83da854c 100644
--- a/lib/reline/ansi.rb
+++ b/lib/reline/ansi.rb
@@ -1,3 +1,5 @@
+require 'io/console'
+
 class Reline::ANSI
   RAW_KEYSTROKE_CONFIG = {
     [27, 91, 65] => :ed_prev_history,     # ↑
@@ -30,7 +32,7 @@ class Reline::ANSI
     unless @@buf.empty?
       return @@buf.shift
     end
-    c = @@input.getbyte
+    c = @@input.raw(intr: true, &:getbyte)
     (c == 0x16 && @@input.raw(min: 0, tim: 0, &:getbyte)) || c
   end
 
@@ -127,29 +129,12 @@ class Reline::ANSI
   def self.prep
     retrieve_keybuffer
     int_handle = Signal.trap('INT', 'IGNORE')
-    begin
-      otio = IO.popen(%w[stty -g], in: @@input, &:read).chomp
-    rescue ArgumentError
-    else
-      setting = %w'-echo -icrnl cbreak -ixoff -iexten'
-      stty = IO.popen(%w[stty -a], in: @@input, &:read)
-      if /-parenb\b/ =~ stty
-        setting << 'pass8'
-      end
-      system("stty", *setting, in: @@input)
-    end
     Signal.trap('INT', int_handle)
-    otio
+    nil
   end
 
   def self.deprep(otio)
     int_handle = Signal.trap('INT', 'IGNORE')
-    if otio
-      begin
-        system("stty #{otio}", in: @@input, err: File::NULL)
-      rescue ArgumentError
-      end
-    end
     Signal.trap('INT', int_handle)
     Signal.trap('WINCH', @@old_winch_handler) if @@old_winch_handler
   end
diff --git a/lib/reline/reline.gemspec b/lib/reline/reline.gemspec
index d0b12ed36d..3ced4b8488 100644
--- a/lib/reline/reline.gemspec
+++ b/lib/reline/reline.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new('>= 2.5')
 
+  spec.add_dependency 'io-console', '~> 0.5'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'test-unit'
-- 
cgit v1.2.3