From 6336b394ecdfd57c02504dca8813e3fa5b77151a Mon Sep 17 00:00:00 2001 From: hsbt Date: Wed, 13 Sep 2017 09:06:05 +0000 Subject: [PATCH] Fixup r59856. Added workaround for JRuby. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rdoc/stats/normal.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/rdoc/stats/normal.rb b/lib/rdoc/stats/normal.rb index ba00b6cbdf..9f7ca59c34 100644 --- a/lib/rdoc/stats/normal.rb +++ b/lib/rdoc/stats/normal.rb @@ -1,5 +1,10 @@ # frozen_string_literal: false -require 'io/console/size' +begin + require 'io/console/size' +rescue LoadError + # for JRuby + require 'io/console' +end ## # Stats printer that prints just the files being documented with a progress @@ -23,7 +28,8 @@ class RDoc::Stats::Normal < RDoc::Stats::Quiet # Print a progress bar, but make sure it fits on a single line. Filename # will be truncated if necessary. - terminal_width = IO.console_size[1].to_i.nonzero? || 80 + size = IO.respond_to?(:console_size) ? IO.console_size : IO.console.winsize + terminal_width = size[1].to_i.nonzero? || 80 max_filename_size = terminal_width - progress_bar.size if filename.size > max_filename_size then