toy-progress 0.0.1 → 0.0.2

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems/specification'
 require 'date'
 
 GEM = "progress"
-GEM_VERSION = "0.0.1"
+GEM_VERSION = "0.0.2"
 AUTHOR = "toy"
 EMAIL = "ivan@workisfun.ru"
 HOMEPAGE = ""

data/TODO

@@ -1 +1,2 @@
-TODO:
+TODO: good specs
+TODO: good gem

data/lib/progress.rb

@@ -1,40 +1,100 @@
+require 'singleton'
+
 class Progress
+  include Singleton
+
+  # start progress indication
+  # ==== Examples
+  #   Progress.start('Test', 1000)
+  #   ...
+  #   Progress.step
+  #   ...
+  #   Progress.stop('Test', 1000)
+  #
+  #   Progress.start('Test', 1000) do
+  #     ...
+  #     Progress.step
+  #     ...
+  #   end
   def self.start(name, total = 100)
-    @io ||= $stdout
-    @io.sync = true
-    
-    @each = total / 1000
-    @count = 0
+    levels << new(name, total, levels.length)
+    print_message
+    if block_given?
+      yield
+      stop
+    end
+  end
 
-    @current = 0
-    @total = total
+  def self.step
+    levels[-1].step
+    print_message
+  end
+
+  def self.stop
+    levels.pop.stop
+    unless levels.empty?
+      print_message
+    else
+      puts
+    end
+  end
+
+  # :nodoc:
+  def self.io=(io)
+    @io = io
+  end
+
+  # :nodoc:
+  def initialize(name, total, level)
     @name = name + ': %s'
-    message highight('...')
-    yield
-    message percent
-    @io.puts
+    @total = total
+    @level = level
+    @current = 0
+    start
   end
 
-  def self.step
+  # :nodoc:
+  def start
+    self.message = '...'
+  end
+
+  # :nodoc:
+  def step
     @current += 1
-    if (@count += 1) >= @each
-      message highight(percent)
-      @count = 0
-    end
+    self.message = percent
   end
 
-private
+  # :nodoc:
+  def stop
+    self.message = percent
+  end
 
-  def self.percent
-    '%5.1f%%' % (@current * 100.0 / @total)
+  # :nodoc:
+  def message
+    @message
+  end
+
+protected
+
+  def self.print_message
+    message = levels.map{ |level| level.message } * ' > '
+    @io ||= $stdout
+    @io.sync = true
+    @io.print "\r" + message.ljust(@previous_length || 0).gsub(/\d+\.\d+/){ |s| s == '100.0' ? s : "\e[1m#{s}\e[0m" }
+    @previous_length = message.length
   end
-  
-  def self.message(s)
-    @io.print "\r\e[0K#{@name % s}"
+
+  def self.levels
+    @levels ||= []
+  end
+
+  def percent
+    '%5.1f%%' % (@current * 100.0 / @total)
   end
 
-  def self.highight(s)
-    "\e[1m#{s}\e[0m"
+  def message=(s)
+    formatted = s.ljust(6)[0, 6]
+    @message = @name % formatted
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: toy-progress
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - toy
@@ -9,7 +9,7 @@ autorequire: progress
 bindir: bin
 cert_chain: []
 
-date: 2008-08-11 00:00:00 -07:00
+date: 2008-10-31 00:00:00 -07:00
 default_executable: 
 dependencies: []