formatador 0.0.12 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/formatador.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{formatador}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wesley Beary"]
-  s.date = %q{2010-04-07}
+  s.date = %q{2010-04-13}
   s.description = %q{STDOUT text formatting}
   s.email = %q{wbeary@engineyard.com}
   s.extra_rdoc_files = [

data/lib/formatador.rb

@@ -51,7 +51,7 @@ class Formatador
     :_light_cyan_     => "106",
   }
 
-  FORMAT_REGEX = /\[(#{ STYLES.keys.join('|') })\]/ix
+  PARSE_REGEX  = /\[(#{ STYLES.keys.join('|') })\]/ix
   INDENT_REGEX = /\[indent\]/ix
 
   def initialize
@@ -59,7 +59,7 @@ class Formatador
   end
 
   def display(string = '')
-    print(format("[indent]#{string}"))
+    print(parse("[indent]#{string}"))
     STDOUT.flush
     nil
   end
@@ -70,11 +70,11 @@ class Formatador
     nil
   end
 
-  def format(string)
+  def parse(string)
     if STDOUT.tty?
-      string.gsub(FORMAT_REGEX) { "\e[#{STYLES[$1.to_sym]}m" }.gsub(INDENT_REGEX) { indentation }
+      string.gsub(PARSE_REGEX) { "\e[#{STYLES[$1.to_sym]}m" }.gsub(INDENT_REGEX) { indentation }
     else
-      string.gsub(FORMAT_REGEX, '').gsub(INDENT_REGEX) { indentation }
+      string.gsub(PARSE_REGEX, '').gsub(INDENT_REGEX) { indentation }
     end
   end
 
@@ -94,7 +94,7 @@ class Formatador
     nil
   end
 
-  %w{display display_line display_table format redisplay redisplay_progressbar}.each do |method|
+  %w{display display_line display_table parse redisplay redisplay_progressbar}.each do |method|
     eval <<-DEF
       def self.#{method}(*args, &block)
         new.#{method}(*args, &block)
@@ -103,3 +103,9 @@ class Formatador
   end
 
 end
+
+if __FILE__ == $0
+
+  Formatador.display_line("[negative]Formatador![/]")
+
+end

data/lib/formatador/progressbar.rb

@@ -28,7 +28,9 @@ class Formatador
     output << "[#{color}]#{padding}#{current}/#{total}[/]"
 
     percent = current.to_f / total.to_f
-    output << "[_white_]|[/][#{color}][_#{color}_]#{'*' * (percent * width).ceil}[/]#{' ' * (width - (percent * width).ceil)}[_white_]|[/]"
+    done = '*' * (percent * width).ceil
+    remaining = ' ' * (width - done.length)
+    output << "[_white_]|[/][#{color}][_#{color}_]#{done}[/]#{remaining}[_white_]|[/]"
 
     if started_at
       elapsed = Time.now - started_at

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Wesley Beary
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -07:00
+date: 2010-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: []