time_left 0.1.1 → 0.1.2

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('time_left', '0.1.0') do |p|
+Echoe.new('time_left', '0.1.2') do |p|
   p.description    = "Print out time that left doing some process"
   p.url            = ""
   p.author         = "Artur Meisters"

data/lib/time_left.rb

@@ -9,27 +9,39 @@ class TimeLeft
   #       use_format "%S.%U"
   #     end
   #   end
+  #   t.finish
   #
-  #   t2=TimeLeft.new()
-  #   while data_processed?
-  #     data=collect_data_from_remote
-  #     t.tick do
-  #       data=collect_data_from_remote unless data
-  #       self.total=data.size if data
-  #       show_when Time.now-self.start_time>0.5
+  #   TimeLeft.timer(:total=>total_records) do |t|
+  #     1.upto(100) do |i|
+  #       t.tick(i)
   #     end
   #   end
-  attr_accessor :start_time,:visible,:format,:total,:value
+  #   
+  attr_accessor :start_time,:format,:total,:value
 
-  def initialize(options={})
+  def initialize(options={},out=STDERR)
+    @out=out
+    @finished=false
+    @terminal_width=80
     self.reset(options)
   end
 
+  def self.timer(options={},out=STDERR)
+    timer=self.new(options,out)
+    yield timer
+    timer.finish
+  end
+
   def reset(options={})
     options.each{|k,v| self.send(:"#{k}=",v)}
     self.format="%H:%M:%S" unless self.format
   end
 
+  def finish
+    @finished=true
+    self.calculate_time
+    show
+  end
   # Start to show time
   # ===Example
   #    t=TimeLeft.new(:total=>1000)
@@ -45,11 +57,12 @@ class TimeLeft
     if block_given?
       self.instance_eval(&block)
     else
-      self.visible=true
+      @visible=true
     end
-    if self.visible
-      self.time_out
-      self.visible=false
+    if @visible
+      self.calculate_time
+      self.show if @current_time
+      @visible=false
     end
   end
 
@@ -58,7 +71,7 @@ class TimeLeft
   #   show_when a%5==0
   #   show_when Time.now-self.start_time>0.5 # every half second
   def show_when conditions
-    self.visible=true if conditions
+    @visible=true if conditions
   end
 
   # Available format
@@ -70,7 +83,8 @@ class TimeLeft
     self.format=format
   end
 
-  def time_out
+  def calculate_time
+    @current_time=nil
     if self.total.to_f>0
       part_done=self.value.to_f/self.total.to_f
     end
@@ -82,8 +96,39 @@ class TimeLeft
         time_left=Time.at(difference)
         h,m,s,ms=(time_left.hour-2),time_left.min,time_left.sec,time_left.usec
         h,m,s,ms=(h>9 ? h.to_s : "0#{h}"),(m>9 ? m.to_s : "0#{m}"),(s>9 ? s.to_s : "0#{s}"),(ms>99 ? ms.to_s : (ms>9 ? "0#{ms}" : "00#{ms}"))[0..2]
-        puts self.format.gsub(/%H/,h).gsub(/%M/,m).gsub(/%S/,s).gsub(/%U/,ms)
+        @current_time=self.format.gsub(/%H/,h).gsub(/%M/,m).gsub(/%S/,s).gsub(/%U/,ms)
       end
     end
   end
+
+  def get_width #from ruby progress_bar
+    default_width = 80
+    begin
+      tiocgwinsz = 0x5413
+      data = [0, 0, 0, 0].pack("SSSS")
+      if @out.ioctl(tiocgwinsz, data) >= 0 then
+        rows, cols, xpixels, ypixels = data.unpack("SSSS")
+        if cols >= 0 then cols else default_width end
+      else
+        default_width
+      end
+    rescue Exception
+      default_width
+    end
+  end
+
+  def eol
+    @finished ? "\n" : "\r"
+  end
+  
+  def show
+    line =@current_time 
+    width = get_width
+    if line.to_s.length < width - 1
+      @out.print("#{line}#{eol}")
+    elsif line.length >= width
+      @out.print("#{line}\n")
+    end
+    @out.flush
+  end
 end

data/time_left.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{time_left}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Artur Meisters"]
-  s.date = %q{2010-04-28}
+  s.date = %q{2010-04-29}
   s.description = %q{Print out time that left doing some process}
   s.email = %q{arturs@ithouse.lv}
   s.extra_rdoc_files = ["README.rdoc", "lib/time_left.rb"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Time_left", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{time_left}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Print out time that left doing some process}
 
   if s.respond_to? :specification_version then

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Artur Meisters
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +03:00
+date: 2010-04-29 00:00:00 +03:00
 default_executable: 
 dependencies: []