formatador 0.1.4 → 0.1.5

data/formatador.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'formatador'
-  s.version           = '0.1.4'
-  s.date              = '2011-05-20'
+  s.version           = '0.1.5'
+  s.date              = '2011-07-05'
   s.rubyforge_project = 'formatador'
 
   ## Make sure your summary is short. The description may be as long

data/lib/formatador.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'formatador', 'progressbar')
 
 class Formatador
 
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   STYLES = {
     :"\/"             => "0",

data/lib/formatador/progressbar.rb

@@ -24,18 +24,29 @@ class Formatador
       output << options[:label]
     end
 
-    padding = ' ' * (total.to_s.size - current.to_s.size)
-    output << "[#{color}]#{padding}#{current}/#{total}[/]"
+    # width
+    # we are going to write a string that looks like "   current/total"
+    # It would be nice if it were left padded with spaces in such a way that
+    # it puts the progress bar in a constant place on the page. This witdh
+    # calculation allows for the "current" string to be up to two characters
+    # longer than the "total" string without problems. eg- current =
+    # 9.99, total = 10
+    padding = total.to_s.size * 2 + 3
+    
+    output << "[#{color}]%#{padding}s[/]" % "#{current}/#{total}"
 
     percent = current.to_f / total.to_f
+    percent = 0 if percent < 0
+    percent = 1 if percent > 1
+
     done = '*' * (percent * width).ceil
     remaining = ' ' * (width - done.length)
     output << "[_white_]|[/][#{color}][_#{color}_]#{done}[/]#{remaining}[_white_]|[/]"
 
     if started_at
       elapsed = Time.now - started_at
-      minutes = (elapsed / 60).round.to_s
-      seconds = (elapsed % 60).round.to_s
+      minutes = (elapsed / 60).truncate.to_s
+      seconds = (elapsed % 60).truncate.to_s
       output << "#{minutes}:#{'0' if seconds.size < 2}#{seconds}"
     end
 

data/tests/table_tests.rb

@@ -20,6 +20,7 @@ output = <<-OUTPUT
     +--------+
     | \e[1mheader\e[0m |
     +--------+
+    +--------+
 OUTPUT
 
   tests("#display_table([], [:header])").returns(output) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: formatador
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 -07:00
+date: 2011-07-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency