Deprecate HighLine::Terminal::CHARACTER_MODE constant and unify #character_mode approach

5 files changed, 7 insertions, 20 deletions

diff --git a/lib/highline/terminal.rb b/lib/highline/terminal.rb
index ac06b3b..a76a136 100755
--- a/lib/highline/terminal.rb
+++ b/lib/highline/terminal.rb
@@ -172,6 +172,12 @@ class HighLine
 
     # @!endgroup
 
+    # Returns the class name as String. Useful for debuggin.
+    # @return [String] class name. Ex: "HighLine::Terminal::IOConsole"
+    def character_mode
+      self.class.name
+    end
+
     private
 
     # Yield a block using stty shell commands to preserve the terminal state.
diff --git a/lib/highline/terminal/io_console.rb b/lib/highline/terminal/io_console.rb
index b39e675..eee152f 100644
--- a/lib/highline/terminal/io_console.rb
+++ b/lib/highline/terminal/io_console.rb
@@ -10,10 +10,6 @@ class HighLine
         output.winsize.reverse
       end
 
-      # Easy to query active terminal (character mode).
-      # For debugging purposes.
-      CHARACTER_MODE = "io_console"   # For Debugging purposes only.
-
       # (see Terminal#raw_no_echo_mode)
       def raw_no_echo_mode
         input.echo = false
@@ -28,11 +24,6 @@ class HighLine
       def get_character
         input.getch # from ruby io/console
       end
-
-      # Same as CHARACTER_MODE constant. "io_console"
-      def character_mode
-        "io_console"
-      end
     end
   end
 end
\ No newline at end of file
diff --git a/lib/highline/terminal/ncurses.rb b/lib/highline/terminal/ncurses.rb
index dda193a..817cc23 100644
--- a/lib/highline/terminal/ncurses.rb
+++ b/lib/highline/terminal/ncurses.rb
@@ -6,7 +6,6 @@ class HighLine
     # @note Code migrated +UNTESTED+ from the old code base to the new terminal api.
     class NCurses < Terminal
       require 'ffi-ncurses'
-      CHARACTER_MODE = "ncurses"    # For Debugging purposes only.
 
       # (see Terminal#raw_no_echo_mode)
       def raw_no_echo_mode
diff --git a/lib/highline/terminal/unix_stty.rb b/lib/highline/terminal/unix_stty.rb
index 46e87f4..3b9668a 100644
--- a/lib/highline/terminal/unix_stty.rb
+++ b/lib/highline/terminal/unix_stty.rb
@@ -27,10 +27,6 @@ class HighLine
         end
       end
 
-      # Easy to query active terminal (character mode).
-      # For debugging purposes.
-      CHARACTER_MODE = "unix_stty"
-
       # (see Terminal#raw_no_echo_mode)
       def raw_no_echo_mode
         @state = `stty -g`
@@ -47,11 +43,6 @@ class HighLine
       def get_character( input = STDIN )
         input.getc
       end
-
-      # Same as CHARACTER_MODE constant. "unix_stty"
-      def character_mode
-        "unix_stty"
-      end
     end
   end
 end
\ No newline at end of file
diff --git a/test/test_highline.rb b/test/test_highline.rb
index 19fd989..a5101c1 100755
--- a/test/test_highline.rb
+++ b/test/test_highline.rb
@@ -959,7 +959,7 @@ class TestHighLine < Minitest::Test
   end
   
   def test_mode
-    assert(%w[io_console Win32API termios ncurses stty unix_stty jline].include?(@terminal.terminal.character_mode),
+    assert(%w[HighLine::Terminal::IOConsole HighLine::Terminal::NCurses HighLine::Terminal::UnixStty].include?(@terminal.terminal.character_mode),
            "#{@terminal.terminal.character_mode} not in list")
   end