speedometer 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 365dcb09e53a5d5e670bf77b662e1d135dbc6900
-  data.tar.gz: 507223abcb13dd50efea0e7287556c7886e489a5
+  metadata.gz: d4146ad9c933e1bdb3a8e83255c41448af41387e
+  data.tar.gz: 75930156a91df6b4f9df2f8b158602a215e5f59a
 SHA512:
-  metadata.gz: 71d8617b08907ad55aa9a9f8ead30301027fafdf2febbaa4c5cfb31f010dc5f4bec77b29026dbe4c777df54b202b38cdce02f041e8c2c315f7944d11d3c6fc65
-  data.tar.gz: 6f18b14fe6b8669ff6fb3973937d2e50a83dac1eafc0dc1d289a1f87f37af222db5653b6abe70a78646611b21d2e9f3f0a9a682e518042e2061f3b2c32b1328c
+  metadata.gz: fe4ba0898dd1a193e5e95c6b26481537f0038cf8bb5b1d2d4224d324c0112a82aecd20caa1d22a499dbe89b9323c81b3af34d874659cbb429f23f6b283c83742
+  data.tar.gz: e2c425c989d215ed9d6040fe049a364426aecb10910072f59636b4bc02148eaa49360764efa5c04da798900bd595ad65a9b904abe5d067cd60241bd62c31da3a

data/lib/speedometer.rb

@@ -16,18 +16,29 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 ########################################################################
 # = Methods
-# * new - accepts units in KB/MB/GB
+# * new - accepts hash with: units in KB/MB(default)/GB; progressbar - bool
 # * start - start displaying upload speed
 # * stop - stops displaying upload rate
-# * display - displays upload speed
+# * done(bytesize) - increments uploaded byte counter for progressbar
 # * log(message) - you need to use this instead of puts
 ########################################################################
 class Speedometer
 
-  attr_accessor :uploaded, :refresh_time, :active
+  attr_accessor :uploaded, :refresh_time, :active, :to_upload
 
-  def initialize(units="MB")
+  def initialize(**options)
+    units = options[:units]
+    units = 'MB' if units.nil?
+    if options[:progressbar]
+      @progressbar = true
+    else
+      @progressbar = false
+    end
+    @to_upload = 0
+    @done = 0
+    @cols = `tput cols`.split.last.to_i
     @active = true
+    @work_to_do = false
     @refresh_time = 1000
     @msg_lock = Mutex.new
     if ["KB","MB","GB"].include?(units)
@@ -39,34 +50,15 @@ class Speedometer
 
   def clear
     @msg_lock.synchronize do
-      length = `tput cols`
-      length = length.split.last.to_i
       print "\r"
       STDOUT.flush
-      print "#{' ' * length}"
+      print "#{' ' * @cols}"
       STDOUT.flush
       print "\r"
       STDOUT.flush
     end
   end
 
-  def display
-    clear
-    time = Time.now
-    speed = (uploaded.to_f / (time - @start_time)) / 1024
-    if @units == "MB" or @units == "GB"
-      speed = speed / 1024
-    end
-    if @units == "GB"
-      speed = speed / 1024
-    end
-    @msg_lock.synchronize do
-      print "#{speed.round(2)}#{@units}/s"
-      STDOUT.flush
-    end
-    sleep @refresh_time.to_f / 1000
-  end
-
   def log(msg)
     clear
     @msg_lock.synchronize do
@@ -80,9 +72,9 @@ class Speedometer
   def start
     @start_time = Time.now if @start_time.nil?
     if !@started
-      Thread.new {
-        while @active
-	  self.display
+      @t = Thread.new {
+        while @active || @work_to_do
+	  display
         end
       }
       @started = true
@@ -92,5 +84,50 @@ class Speedometer
   def stop
     @active = false
     @started = false
+    @t.join
+  end
+
+  def done(size)
+    abort "Upload size needs to be positive!" if size < 0
+    @done += size
+  end
+
+  private
+
+  def progress(taken)
+    abort "Upload size needs to be positive!" if @to_upload < 0
+    available = (@cols / 2).ceil - 2
+    bar = ' ' * (@cols - available - taken - 2)
+    done_pr = (@done.to_f / @to_upload.to_f).round(3)
+    done_sc = (available * done_pr).ceil
+    bar += '|'
+    if done_sc < available - 1
+      @work_to_do = true
+      bar += '=' * done_sc + '>'
+      bar += '.' * (@cols - bar.length - taken - 1)
+    else
+      bar += '=' * available
+      @work_to_do = false
+    end
+    bar += '|'
+  end
+
+  def display
+    clear
+    time = Time.now
+    speed = (uploaded.to_f / (time - @start_time)) / 1024
+    if @units == "MB" or @units == "GB"
+      speed = speed / 1024
+    end
+    if @units == "GB"
+      speed = speed / 1024
+    end
+    @msg_lock.synchronize do
+      print "#{speed.round(2)}#{@units}/s"
+      print progress(speed.round(2).to_s.length + 4) if (@to_upload > 0) && @progressbar && (@done > 0)
+      STDOUT.flush
+    end
+    sleep @refresh_time.to_f / 1000
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speedometer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Tadeus Dobrovolskij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Library to track and display bandwith usage inside the application
 email: root@tad-do.net