From ae93666aa91c94f5dbce15b11abe1dce7b77886e Mon Sep 17 00:00:00 2001 From: Michael Ries Date: Mon, 14 Sep 2015 14:58:56 -0600 Subject: support jruby9k for system extensions --- lib/highline/system_extensions.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/highline/system_extensions.rb b/lib/highline/system_extensions.rb index 96a39c1..1ea27c4 100755 --- a/lib/highline/system_extensions.rb +++ b/lib/highline/system_extensions.rb @@ -12,10 +12,12 @@ class HighLine JRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' if JRUBY + JRUBY_OVER_17 = JRUBY_VERSION =~ /^1.7/ || JRUBY_VERSION =~ /^9/ + def initialize_system_extensions require 'java' require 'readline' - if JRUBY_VERSION =~ /^1.7/ + if JRUBY_OVER_17 java_import 'jline.console.ConsoleReader' input = @input && @input.to_inputstream @@ -160,7 +162,7 @@ class HighLine CHARACTER_MODE = "jline" # For Debugging purposes only. def terminal_size - if JRUBY_VERSION =~ /^1.7/ + if JRUBY_OVER_17 [ @java_terminal.get_width, @java_terminal.get_height ] else [ @java_terminal.getTerminalWidth, @java_terminal.getTerminalHeight ] -- cgit v1.2.1