formatador 0.0.10 → 0.0.11

data/Rakefile

@@ -10,10 +10,9 @@ begin
     gem.email = "wbeary@engineyard.com"
     gem.homepage = "http://github.com/geemus/formatador"
     gem.authors = ["Wesley Beary"]
-    gem.add_development_dependency "shindo", ">= 0"
+    # gem.add_development_dependency "shindo", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/formatador.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{formatador}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wesley Beary"]
-  s.date = %q{2010-03-04}
+  s.date = %q{2010-04-03}
   s.description = %q{STDOUT text formatting}
   s.email = %q{wbeary@engineyard.com}
   s.extra_rdoc_files = [
@@ -17,14 +17,16 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "formatador.gemspec",
-     "lib/formatador.rb",
-     "tests/formatador_tests.rb",
-     "tests/tests_helper.rb"
+    ".gitignore",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "formatador.gemspec",
+    "lib/formatador.rb",
+    "lib/formatador/progressbar.rb",
+    "lib/formatador/table.rb",
+    "tests/formatador_tests.rb",
+    "tests/tests_helper.rb"
   ]
   s.homepage = %q{http://github.com/geemus/formatador}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -37,12 +39,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shindo>, [">= 0"])
     else
-      s.add_dependency(%q<shindo>, [">= 0"])
     end
   else
-    s.add_dependency(%q<shindo>, [">= 0"])
   end
 end
 

data/lib/formatador.rb

@@ -1,3 +1,6 @@
+require File.join(File.dirname(__FILE__), 'formatador', 'table')
+require File.join(File.dirname(__FILE__), 'formatador', 'progressbar')
+
 class Formatador
 
   STYLES = {
@@ -67,54 +70,6 @@ class Formatador
     nil
   end
 
-  def display_table(hashes, keys = nil, &block)
-    headers = keys || []
-    widths = {}
-    for hash in hashes
-      for key in hash.keys
-        unless keys
-          headers << key
-        end
-        widths[key] = [key.to_s.length, widths[key] || 0, hash[key] && hash[key].to_s.length || 0].max
-      end
-      headers = headers.uniq
-    end
-
-    unless block_given?
-      headers = headers.sort {|x,y| x.to_s <=> y.to_s}
-    else
-      headers = headers.sort(&block)
-    end
-
-    split = "+"
-    if headers.empty?
-      split << '--+'
-    else
-      for header in headers
-        split << ('-' * (widths[header] + 2)) << '+'
-      end
-    end
-
-    display_line(split)
-    columns = []
-    for header in headers
-      columns << "#{header}#{' ' * (widths[header] - header.to_s.length)}"
-    end
-    display_line("| #{columns.join(' | ')} |")
-    display_line(split)
-
-    for hash in hashes
-      columns = []
-      for header in headers
-        datum = hash[header] || ''
-        columns << "#{datum}#{' ' * (widths[header] - datum.to_s.length)}"
-      end
-      display_line("| #{columns.join(' | ')} |")
-      display_line(split)
-    end
-    nil
-  end
-
   def format(string)
     if STDOUT.tty?
       string.gsub(FORMAT_REGEX) { "\e[#{STYLES[$1.to_sym]}m" }.gsub(INDENT_REGEX) { indentation }
@@ -139,7 +94,7 @@ class Formatador
     nil
   end
 
-  %w{display display_line display_table format redisplay}.each do |method|
+  %w{display display_line display_table format redisplay redisplay_progressbar}.each do |method|
     eval <<-DEF
       def self.#{method}(*args, &block)
         new.#{method}(*args, &block)

data/lib/formatador/progressbar.rb

@@ -0,0 +1,40 @@
+class Formatador
+
+  def redisplay_progressbar(current, total, options = {})
+    options = { :color => 'white', :width => 50 }.merge!(options)
+    data = progressbar(current, total, options)
+    if current < total
+      redisplay(data)
+    else
+      redisplay("#{data}\n")
+      @progressbar_started_at = nil
+    end
+  end
+
+  private
+
+  def progressbar(current, total, options)
+    color = options[:color]
+    started_at = options[:started_at]
+    width = options[:width]
+
+    output = []
+
+    padding = ' ' * (total.to_s.size - current.to_s.size)
+    output << "[#{color}]#{padding}#{current}/#{total}[/]"
+
+    percent = current.to_f / total.to_f
+    output << "[_white_]|[/][#{color}][_#{color}_]#{'*' * (percent * width).ceil}[/]#{' ' * (width - (percent * width).ceil)}[_white_]|[/]"
+
+    if started_at
+      elapsed = Time.now - started_at
+      minutes = (elapsed / 60).round.to_s
+      seconds = (elapsed % 60).round.to_s
+      output << "#{minutes}:#{'0' if seconds.size < 2}#{seconds}"
+    end
+
+    output << ''
+    output.join(' ')
+  end
+
+end

data/lib/formatador/table.rb

@@ -0,0 +1,51 @@
+class Formatador
+
+  def display_table(hashes, keys = nil, &block)
+    headers = keys || []
+    widths = {}
+    for hash in hashes
+      for key in hash.keys
+        unless keys
+          headers << key
+        end
+        widths[key] = [key.to_s.length, widths[key] || 0, hash[key] && hash[key].to_s.length || 0].max
+      end
+      headers = headers.uniq
+    end
+
+    if block_given?
+      headers = headers.sort(&block)
+    elsif !keys
+      headers = headers.sort {|x,y| x.to_s <=> y.to_s}
+    end
+
+    split = "+"
+    if headers.empty?
+      split << '--+'
+    else
+      for header in headers
+        split << ('-' * (widths[header] + 2)) << '+'
+      end
+    end
+
+    display_line(split)
+    columns = []
+    for header in headers
+      columns << "#{header}#{' ' * (widths[header] - header.to_s.length)}"
+    end
+    display_line("| #{columns.join(' | ')} |")
+    display_line(split)
+
+    for hash in hashes
+      columns = []
+      for header in headers
+        datum = hash[header] || ''
+        columns << "#{datum}#{' ' * (widths[header] - datum.to_s.length)}"
+      end
+      display_line("| #{columns.join(' | ')} |")
+      display_line(split)
+    end
+    nil
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Wesley Beary
@@ -14,21 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 -08:00
+date: 2010-04-03 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: shindo
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
+dependencies: []
+
 description: STDOUT text formatting
 email: wbeary@engineyard.com
 executables: []
@@ -45,6 +34,8 @@ files:
 - VERSION
 - formatador.gemspec
 - lib/formatador.rb
+- lib/formatador/progressbar.rb
+- lib/formatador/table.rb
 - tests/formatador_tests.rb
 - tests/tests_helper.rb
 has_rdoc: true