Make HighLine::Terminal instances respect HighLine defined input and output

Also save input and output as HighLine::Terminal instance variables
reducing argument passing needs.

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/highline/terminal.rb b/lib/highline/terminal.rb
index d0ea906..e7a2516 100755
--- a/lib/highline/terminal.rb
+++ b/lib/highline/terminal.rb
@@ -13,27 +13,34 @@ require "highline/compatibility"
 
 class HighLine
   class Terminal
-    def self.get_terminal
+    def self.get_terminal(input, output)
       terminal = nil
 
       # First of all, probe for io/console
       begin
         require "io/console"
         require "highline/terminal/io_console"
-        terminal = HighLine::Terminal::IOConsole.new
+        terminal = HighLine::Terminal::IOConsole.new(input, output)
       rescue LoadError
       end
 
       # Fall back to UnixStty
       unless terminal
         require 'highline/terminal/unix_stty'
-        terminal = HighLine::Terminal::UnixStty.new
+        terminal = HighLine::Terminal::UnixStty.new(input, output)
       end
 
       terminal.initialize_system_extensions
       terminal
     end
 
+    attr_reader :input, :output
+
+    def initialize(input, output)
+      @input  = input
+      @output = output
+    end
+
     def initialize_system_extensions
     end