drbrain	2011-05-13 08:41:35 +0900 (Fri, 13 May 2011)

  New Revision: 31542

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

  Log:
    * lib/rdoc/rdoc.rb:  Output summary after documentation report.
    * lib/rdoc/stats/normal.rb:  Don't output information for users when
      we're not on a TTY

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/rdoc.rb
    trunk/lib/rdoc/stats/normal.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31541)
+++ ChangeLog	(revision 31542)
@@ -1,3 +1,9 @@
+Fri May 13 08:34:00 2011  Eric Hodel  <drbrain@s...>
+
+	* lib/rdoc/rdoc.rb:  Output summary after documentation report.
+	* lib/rdoc/stats/normal.rb:  Don't output information for users when
+	  we're not on a TTY
+
 Fri May 13 07:49:02 2011  Eric Hodel  <drbrain@s...>
 
 	* lib/fileutils.rb:  Hide internal methods from RDoc.  Patch by Darragh
Index: lib/rdoc/rdoc.rb
===================================================================
--- lib/rdoc/rdoc.rb	(revision 31541)
+++ lib/rdoc/rdoc.rb	(revision 31542)
@@ -455,7 +455,7 @@
       end
     end
 
-    unless @options.quiet or not @stats then
+    if @stats and (@options.coverage_report or not @options.quiet) then
       puts
       puts @stats.summary
     end
Index: lib/rdoc/stats/normal.rb
===================================================================
--- lib/rdoc/stats/normal.rb	(revision 31541)
+++ lib/rdoc/stats/normal.rb	(revision 31542)
@@ -5,46 +5,43 @@
 class RDoc::Stats::Normal < RDoc::Stats::Quiet
 
   def begin_adding # :nodoc:
-    puts "Parsing sources..."
+    puts "Parsing sources..." if $stdout.tty?
   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,
                            @num_files)
 
-    if $stdout.tty? then
-      # Print a progress bar, but make sure it fits on a single line. Filename
-      # will be truncated if necessary.
-      terminal_width = (ENV['COLUMNS'] || 80).to_i
-      max_filename_size = terminal_width - progress_bar.size
+    # Print a progress bar, but make sure it fits on a single line. Filename
+    # will be truncated if necessary.
+    terminal_width = (ENV['COLUMNS'] || 80).to_i
+    max_filename_size = terminal_width - progress_bar.size
 
-      if filename.size > max_filename_size then
-        # Turn "some_long_filename.rb" to "...ong_filename.rb"
-        filename = filename[(filename.size - max_filename_size) .. -1]
-        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")
-    else
-      $stdout.puts "#{progress_bar} #{filename}"
+    if filename.size > max_filename_size then
+      # Turn "some_long_filename.rb" to "...ong_filename.rb"
+      filename = filename[(filename.size - max_filename_size) .. -1]
+      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")
     $stdout.flush
   end
 
   def done_adding # :nodoc:
-    puts
+    puts if $stdout.tty?
   end
 
 end

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