powerbar 1.0.2 → 1.0.3

data/README.rdoc

@@ -17,9 +17,9 @@ This is PowerBar - The last progressbar-library you'll ever need.
   information (percentage-done, throughput, ETA, etc.) and then use the
   computed values elsewhere in your app.
 
-* All state can be updated at any time. If you're monitoring a
-  multi-part operation you can change the status-message of a running
-  PowerBar at any time.
+* All state can be updated at any time. For example: If you're monitoring a
+  multi-part operation then you can change the status-message of a running
+  PowerBar to reflect the current state.
 
 == Screenshot
 
@@ -49,6 +49,12 @@ Then look at the {source-code}[https://github.com/busyloop/powerbar/blob/master/
  step = 1000
 
  p = PowerBar.new
+
+ # Override some default values to demonstrate how the settings work
+ p.settings.tty.finite.template.barchar = '*'
+ p.settings.tty.finite.template.padchar = '.'
+
+ # Dummy loop to simulate some progress
  (0..total).step(step).each do |i|
    p.show(:msg => 'DEMO 1 - Ten seconds of progress', :done => i, :total => total)
    sleep 0.1

data/lib/powerbar.rb

@@ -44,6 +44,7 @@ class PowerBar
         :rate_sample_max_interval => 10,  # See PowerBar::Rate
         :rate_sample_window => 6,         # See PowerBar::Rate
         :force_mode => nil, # set to :tty or :notty to force either mode
+        :kilo => 1024, # Change this to 1000 when measuring network traffic or such.
         :tty => {      # <== Settings when stdout is a tty
           :finite => { # <== Settings for a finite progress bar (when total != :unknown)
             # The :output Proc is called to draw on the screen --------------------.
@@ -182,8 +183,8 @@ class PowerBar
     state.time_now = Time.now
 
     @rate ||= PowerBar::Rate.new(state.time_now, 
-                                         state.settings.rate_sample_window,
-                                         state.settings.rate_sample_max_interval)
+                                 state.settings.rate_sample_window,
+                                 state.settings.rate_sample_max_interval)
     @rate.append(state.time_now, state.done)
   end
 
@@ -219,15 +220,11 @@ class PowerBar
   # Returns nil if the bar-length would be == 0.
   def bar
     return nil if state.total.is_a? Symbol
-    blank   = render_template(:main, skip=[:bar])
-    twid    = state.scope_at[0] == :tty ? terminal_width() : scope.line_width
-    barlen  = [twid - blank.gsub(STRIP_ANSI, '').length, 0].max
-    done    = state.done
-    total   = state.total
-    barchar = scope.template.barchar
-    padchar = scope.template.padchar
-    fill = [0,[(done.to_f/total*barlen).to_i,barlen].min].max
-    thebar = barchar * fill + padchar * [barlen - fill,0].max
+    skel   = render_template(:main, skip=[:bar])
+    lwid   = state.scope_at[0] == :tty ? terminal_width() : scope.line_width
+    barlen = [lwid - skel.gsub(STRIP_ANSI, '').length, 0].max
+    fill   = [0,[(state.done.to_f/state.total*barlen).to_i,barlen].min].max
+    thebar = scope.template.barchar * fill + scope.template.padchar * [barlen - fill,0].max
     thebar.length == 0 ? nil : thebar
   end
 
@@ -328,16 +325,17 @@ class PowerBar
   end
 
   HQ_UNITS = %w(b k M G T).freeze
-  def humanize_quantity(number, format='%n%u', base=1024)
+  def humanize_quantity(number, format='%n%u')
     return nil if number.nil? 
     return nil if number.is_a? Float and (number.nan? or number.infinite?)
-    return number if number.to_i < base
+    kilo = settings.kilo
+    return number if number.to_i < kilo
 
     max_exp  = HQ_UNITS.size - 1
     number   = Float(number)
-    exponent = (Math.log(number) / Math.log(base)).to_i
+    exponent = (Math.log(number) / Math.log(kilo)).to_i
     exponent = max_exp if exponent > max_exp
-    number  /= base ** exponent
+    number  /= kilo ** exponent
 
     unit = HQ_UNITS[exponent]
     return format.gsub(/%n/, number.round(1).to_s).gsub(/%u/, unit)

data/lib/powerbar/version.rb

@@ -1,3 +1,3 @@
 class Powerbar
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: powerbar
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-07 00:00:00.000000000Z
+date: 2011-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &9714940 !ruby/object:Gem::Requirement
+  requirement: &18446200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *9714940
+  version_requirements: *18446200
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &9713660 !ruby/object:Gem::Requirement
+  requirement: &18432940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *9713660
+  version_requirements: *18432940
 description: The last progressbar-library you'll ever need
 email:
 - moe@busyloop.net