formatador 0.1.5 → 0.2.0

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.5'
-  s.date              = '2011-07-05'
+  s.version           = '0.2.0'
+  s.date              = '2011-07-14'
   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.5'
+  VERSION = '0.2.0'
 
   STYLES = {
     :"\/"             => "0",
@@ -68,7 +68,7 @@ class Formatador
 
   def display_line(string = '')
     display(string)
-    print("\n")
+    new_line
     nil
   end
 
@@ -97,13 +97,24 @@ class Formatador
     '  ' * @indent
   end
 
-  def redisplay(string = '')
-    print("\r#{' ' * 80}\r")
+  def redisplay(string = '', width = 120)
+    print("\r#{' ' * width}\r")
     display("#{string}")
     nil
   end
 
-  %w{display display_line display_lines display_table display_compact_table indent parse redisplay redisplay_progressbar}.each do |method|
+  def redisplay_line(string = '', width = 120)
+    redisplay(string, width)
+    new_line
+    nil
+  end
+
+  def new_line
+    print("\n")
+    nil
+  end
+
+  %w{display display_line display_lines display_table display_compact_table indent parse redisplay redisplay_line new_line redisplay_progressbar}.each do |method|
     eval <<-DEF
       def self.#{method}(*args, &block)
         Thread.current[:formatador] ||= new

data/lib/formatador/progressbar.rb

@@ -1,12 +1,15 @@
 class Formatador
 
   def redisplay_progressbar(current, total, options = {})
-    options = { :color => 'white', :width => 50 }.merge!(options)
+    options = { :color => 'white', :width => 50, :new_line => true }.merge!(options)
     data = progressbar(current, total, options)
     if current < total
       redisplay(data)
     else
-      redisplay("#{data}\n")
+      redisplay("#{data}")
+      if options[:new_line]
+        new_line
+      end
       @progressbar_started_at = nil
     end
   end
@@ -32,7 +35,7 @@ class Formatador
     # 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: formatador
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 5
-  version: 0.1.5
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 -05:00
+date: 2011-07-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: formatador
-rubygems_version: 1.4.1
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 2
 summary: Ruby STDOUT text formatting