[前][次][番号順一覧][スレッド一覧]

ruby-changes:33946

From: naruse <ko1@a...>
Date: Tue, 20 May 2014 15:39:13 +0900 (JST)
Subject: [ruby-changes:33946] naruse:r46027 (trunk): show progress of rdoc parsing to prevent timeout on chkbuild

naruse	2014-05-20 15:39:08 +0900 (Tue, 20 May 2014)

  New Revision: 46027

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=46027

  Log:
    show progress of rdoc parsing to prevent timeout on chkbuild
    
    http://c64b.rubyci.org/~chkbuild/ruby-trunk/log/20140520T030303Z.fail.html.gz

  Modified files:
    trunk/lib/rdoc/stats/normal.rb
Index: lib/rdoc/stats/normal.rb
===================================================================
--- lib/rdoc/stats/normal.rb	(revision 46026)
+++ lib/rdoc/stats/normal.rb	(revision 46027)
@@ -5,15 +5,13 @@ https://github.com/ruby/ruby/blob/trunk/lib/rdoc/stats/normal.rb#L5
 class RDoc::Stats::Normal < RDoc::Stats::Quiet
 
   def begin_adding # :nodoc:
-    puts "Parsing sources..." if $stdout.tty?
+    puts "Parsing sources..."
   end
 
   ##
   # Prints a file with a progress bar
 
   def print_file files_so_far, filename
-    return unless $stdout.tty?
-
     progress_bar = sprintf("%3d%% [%2d/%2d]  ",
                            100 * files_so_far / @num_files,
                            files_so_far,
@@ -30,18 +28,21 @@ class RDoc::Stats::Normal < RDoc::Stats: https://github.com/ruby/ruby/blob/trunk/lib/rdoc/stats/normal.rb#L28
       filename[0..2] = "..."
     end
 
-    # Pad the line with whitespaces so that leftover output from the
-    # previous line doesn't show up.
     line = "#{progress_bar}#{filename}"
-    padding = terminal_width - line.size
-    line << (" " * padding) if padding > 0
-
-    $stdout.print("#{line}\r")
+    if $stdout.tty?
+      # Pad the line with whitespaces so that leftover output from the
+      # previous line doesn't show up.
+      padding = terminal_width - line.size
+      line << (" " * padding) if padding > 0
+      $stdout.print("#{line}\r")
+    else
+      $stdout.puts(line)
+    end
     $stdout.flush
   end
 
   def done_adding # :nodoc:
-    puts if $stdout.tty?
+    puts
   end
 
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]