WIP

ruby · Jul 5, 2023 · bec1924 · bec1924
1 parent eb11ecb
commit bec1924
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/test/reline/test_ansi_with_terminfo.rb b/test/reline/test_ansi_with_terminfo.rb
@@ -4,8 +4,8 @@
 class Reline::ANSI::TestWithTerminfo < Reline::TestCase
   def setup
     Reline.send(:test_mode, ansi: true)
-    @config = Reline::Config.new(Reline::IOGate)
-    Reline::IOGate.set_default_key_bindings(@config, allow_terminfo: true)
+    @config = Reline::Config.new(Reline.core.io_gate)
+    Reline.core.io_gate.set_default_key_bindings(@config, allow_terminfo: true)
   end
 
   def teardown

diff --git a/test/reline/test_ansi_without_terminfo.rb b/test/reline/test_ansi_without_terminfo.rb
@@ -4,8 +4,8 @@
 class Reline::ANSI::TestWithoutTerminfo < Reline::TestCase
   def setup
     Reline.send(:test_mode, ansi: true)
-    @config = Reline::Config.new(Reline::IOGate)
-    Reline::IOGate.set_default_key_bindings(@config, allow_terminfo: false)
+    @config = Reline::Config.new(Reline.core.io_gate)
+    Reline.core.io_gate.set_default_key_bindings(@config, allow_terminfo: false)
   end
 
   def teardown

diff --git a/test/reline/test_key_actor_emacs.rb b/test/reline/test_key_actor_emacs.rb
@@ -4,7 +4,7 @@ class Reline::KeyActor::Emacs::Test < Reline::TestCase
   def setup
     Reline.send(:test_mode)
     @prompt = '> '
-    @config = Reline::Config.new(Reline::IOGate) # Emacs mode is default
+    @config = Reline::Config.new(Reline.core.io_gate) # Emacs mode is default
     @config.autocompletion = false
     Reline::HISTORY.instance_variable_set(:@config, @config)
     Reline::HISTORY.clear

diff --git a/test/reline/test_key_actor_vi.rb b/test/reline/test_key_actor_vi.rb
@@ -4,7 +4,7 @@ class Reline::KeyActor::ViInsert::Test < Reline::TestCase
   def setup
     Reline.send(:test_mode)
     @prompt = '> '
-    @config = Reline::Config.new(Reline::IOGate)
+    @config = Reline::Config.new(Reline.core.io_gate)
     @config.read_lines(<<~LINES.split(/(?<=\n)/))
       set editing-mode vi
     LINES

diff --git a/test/reline/test_key_stroke.rb b/test/reline/test_key_stroke.rb
@@ -14,7 +14,7 @@ def to_keys
   }
 
   def test_match_status
-    config = Reline::Config.new(Reline::IOGate)
+    config = Reline::Config.new(Reline.core.io_gate)
     {
       'a' => 'xx',
       'ab' => 'y',
@@ -37,7 +37,7 @@ def test_match_status
   end
 
   def test_expand
-    config = Reline::Config.new(Reline::IOGate)
+    config = Reline::Config.new(Reline.core.io_gate)
     {
       'abc' => '123',
     }.each_pair do |key, func|
@@ -48,7 +48,7 @@ def test_expand
   end
 
   def test_oneshot_key_bindings
-    config = Reline::Config.new(Reline::IOGate)
+    config = Reline::Config.new(Reline.core.io_gate)
     {
       'abc' => '123',
     }.each_pair do |key, func|
@@ -60,7 +60,7 @@ def test_oneshot_key_bindings
   end
 
   def test_with_reline_key
-    config = Reline::Config.new(Reline::IOGate)
+    config = Reline::Config.new(Reline.core.io_gate)
     {
       [
         Reline::Key.new(100, 228, true), # Alt+d

diff --git a/test/reline/test_line_editor.rb b/test/reline/test_line_editor.rb
@@ -3,7 +3,7 @@
 
 class Reline::LineEditor::Test < Reline::TestCase
   def test_range_subtract
-    config = Reline::Config.new(Reline::IOGate)
+    config = Reline::Config.new(Reline::GeneralIO)
     editor = Reline::LineEditor.new(config, 'ascii-8bit')
     base_ranges = [3...5, 4...10, 6...8, 12...15, 15...20]
     subtract_ranges = [5...7, 8...9, 11...13, 17...18, 18...19]

diff --git a/test/reline/test_macro.rb b/test/reline/test_macro.rb
@@ -3,7 +3,7 @@
 class Reline::MacroTest < Reline::TestCase
   def setup
     Reline.send(:test_mode)
-    @config = Reline::Config.new(Reline::IOGate)
+    @config = Reline::Config.new(Reline.core.io_gate)
     @encoding = Reline.core.encoding
     @line_editor = Reline::LineEditor.new(@config, @encoding)
     @line_editor.instance_variable_set(:@screen_size, [24, 80])

diff --git a/test/reline/test_reline.rb b/test/reline/test_reline.rb
@@ -284,7 +284,7 @@ def test_set_input_and_output
     input, to_write = IO.pipe
     to_read, output = IO.pipe
     unless Reline.__send__(:input=, input)
-      omit "Setting to input is not effective on #{Reline::IOGate}"
+      omit "Setting to input is not effective on #{Reline.core.io_gate}"
     end
     Reline.output = output
 
@@ -373,7 +373,7 @@ def test_read_io
 
   def test_dumb_terminal
     lib = File.expand_path("../../lib", __dir__)
-    out = IO.popen([{"TERM"=>"dumb"}, Reline.test_rubybin, "-I#{lib}", "-rreline", "-e", "p Reline::IOGate"], &:read)
+    out = IO.popen([{"TERM"=>"dumb"}, Reline.test_rubybin, "-I#{lib}", "-rreline", "-e", "p Reline.core.io_gate"], &:read)
     assert_equal("Reline::GeneralIO", out.chomp)
   end
 

diff --git a/test/reline/test_string_processing.rb b/test/reline/test_string_processing.rb
@@ -4,7 +4,7 @@ class Reline::LineEditor::StringProcessingTest < Reline::TestCase
   def setup
     Reline.send(:test_mode)
     @prompt = '> '
-    @config = Reline::Config.new(Reline::IOGate)
+    @config = Reline::Config.new(Reline.core.io_gate)
     Reline::HISTORY.instance_variable_set(:@config, @config)
     @encoding = Reline.core.encoding
     @line_editor = Reline::LineEditor.new(@config, @encoding)

diff --git a/test/reline/yamatanooroti/test_rendering.rb b/test/reline/yamatanooroti/test_rendering.rb
@@ -490,7 +490,7 @@ def test_no_escape_sequence_passed_to_dynamic_prompt
     end
 
     def test_enable_bracketed_paste
-      omit if Reline::IOGate.win?
+      omit if Reline.core.io_gate.win?
       write_inputrc <<~LINES
         set enable-bracketed-paste on
       LINES
@@ -877,7 +877,7 @@ def test_force_enter
     end
 
     def test_with_newline
-      omit if Reline::IOGate.win?
+      omit if Reline.core.io_gate.win?
       cmd = %Q{ruby -e 'print(%Q{abc def \\e\\r})' | ruby -I#{@pwd}/lib -rreline -e 'p Reline.readline(%{> })'}
       start_terminal(40, 50, ['bash', '-c', cmd])
       sleep 1