svn commit: r990400 - /buildr/trunk/lib/buildr/core/progressbar.rb

[boisvert]

Author: boisvert
Date: Sat Aug 28 18:00:22 2010
New Revision: 990400

URL: http://svn.apache.org/viewvc?rev=990400&view=rev
Log:
BUILDR-498 Artifact download fails with "negative argument" if terminal 
capabilities are undefined

Modified:
    buildr/trunk/lib/buildr/core/progressbar.rb

Modified: buildr/trunk/lib/buildr/core/progressbar.rb
URL: 
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/progressbar.rb?rev=990400&r1=990399&r2=990400&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/progressbar.rb (original)
+++ buildr/trunk/lib/buildr/core/progressbar.rb Sat Aug 28 18:00:22 2010
@@ -23,7 +23,7 @@ class ProgressBar
     end
 
     def width
-      @width ||= $terminal.output_cols || 80
+      @width ||= $terminal.output_cols || 0
     end
 
   end
@@ -66,6 +66,7 @@ class ProgressBar
   end
 
   def title
+    return @title if ProgressBar.width <= 10
     @title.size > ProgressBar.width / 5 ? (@title[0, ProgressBar.width / 5 - 
2] + '..') : @title
   end
 
@@ -126,7 +127,7 @@ class ProgressBar
 protected
 
   def clear
-    return unless @output
+    return if @output == nil || ProgressBar.width <= 0
     @output.print "\r", " " * (ProgressBar.width - 1), "\r"
     @output.flush
   end
@@ -135,7 +136,11 @@ protected
     return unless @output
     format, *args = @format
     line = format % args.map { |arg| send(arg) }
-    @output.print line.sub('|--|') { progress(ProgressBar.width - line.size + 
3) }
+    if ProgressBar.width >= line.size
+      @output.print line.sub('|--|') { progress(ProgressBar.width - line.size 
+ 3) }
+    else
+      @output.print line.sub('|--|', '')
+    end
     @output.print @finished ? "\n" : "\r"
     @output.flush
     @previous = @count