summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-12 23:41:35 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-12 23:41:35 +0000
commit7ed51785df6c4c3999cb9ef2d9893c5f4fac4672 (patch)
tree1812db2874aa3f073d59abb7373b37ef0e8faa25
parent57580b76e8a20b266df05d1e099ae7af9bab4612 (diff)
* 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/rdoc/rdoc.rb2
-rw-r--r--lib/rdoc/stats/normal.rb43
3 files changed, 27 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index b532e72..772bf00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 13 08:34:00 2011 Eric Hodel <drbrain@segment7.net>
+
+ * 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@segment7.net>
* lib/fileutils.rb: Hide internal methods from RDoc. Patch by Darragh
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index c66e66a..3eab6cd 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -455,7 +455,7 @@ The internal error was:
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
diff --git a/lib/rdoc/stats/normal.rb b/lib/rdoc/stats/normal.rb
index 2057332..c971973 100644
--- a/lib/rdoc/stats/normal.rb
+++ b/lib/rdoc/stats/normal.rb
@@ -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
-
- 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}"
+ # 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")
$stdout.flush
end
def done_adding # :nodoc:
- puts
+ puts if $stdout.tty?
end
end