kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/test/unit.rb (Test::Unit::Runner#jobs_status): io/console may

Browse source 
not be available. use 80 as the last resort if IO#winsize and
  COLUMNS are unavailable.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-04-14 13:48:09 +00:00
parent 146bedd6c4
commit 3d41f4df43
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,4 +1,8 @@
Thu Apr 14 22:47:58 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Apr 14 22:48:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit.rb (Test::Unit::Runner#jobs_status): io/console may
not be available. use 80 as the last resort if IO#winsize and
COLUMNS are unavailable.
* lib/test/unit.rb (Test::Unit::Runner::Worker#died): rename using a * lib/test/unit.rb (Test::Unit::Runner::Worker#died): rename using a
verb. verb.

16
lib/test/unit.rb
View file

@ -4,7 +4,6 @@ require 'minitest/unit'
require 'test/unit/assertions' require 'test/unit/assertions'
require 'test/unit/testcase' require 'test/unit/testcase'
require 'optparse' require 'optparse'
require 'io/console'
module Test module Test
module Unit module Unit
@ -351,22 +350,27 @@ module Test
return unless @opts[:job_status] return unless @opts[:job_status]
puts "" unless @opts[:verbose] puts "" unless @opts[:verbose]
status_line = @workers.map(&:to_s).join(" ") status_line = @workers.map(&:to_s).join(" ")
if @opts[:job_status] == :replace if @opts[:job_status] == :replace and $stdout.tty?
@terminal_width ||= $stdout.winsize[1] || ENV["COLUMNS"].to_i || 80 @terminal_width ||=
begin
require 'io/console'
$stdout.winsize[1]
rescue LoadError, NoMethodError
ENV["COLUMNS"].to_i.nonzero? || 80
end
@jstr_size ||= 0 @jstr_size ||= 0
del_jobs_status del_jobs_status
$stdout.flush $stdout.flush
print status_line[0...@terminal_width] print status_line[0...@terminal_width]
$stdout.flush $stdout.flush
@jstr_size = status_line.size > @terminal_width ? \ @jstr_size = [status_line.size, @terminal_width].min
@terminal_width : status_line.size
else else
puts status_line puts status_line
end end
end end
def del_jobs_status def del_jobs_status
return unless @opts[:job_status] == :replace && @jstr_size return unless @opts[:job_status] == :replace && @jstr_size.nonzero?
print "\r"+" "*@jstr_size+"\r" print "\r"+" "*@jstr_size+"\r"
end end