powerbar 1.0.9 → 1.0.10

data/bin/powerbar-demo

@@ -76,8 +76,8 @@ def demo_4
   p.settings.tty.finite.template.main = \
         "${<msg>} ${<bar> }\e[0m${<rate>/s} \e[33;1m${<percent>%} " +
         "\e[36;1m${<elapsed>}\e[31;1m${ ETA: <eta>}"
-  p.settings.tty.finite.template.padchar = "\e[30;1m\u2589"
-  p.settings.tty.finite.template.barchar = "\e[34;1m\u2589"
+  p.settings.tty.finite.template.padchar = "\e[30;1m#{p.settings.tty.finite.template.padchar}"
+  p.settings.tty.finite.template.barchar = "\e[34;1m#{p.settings.tty.finite.template.barchar}"
   p.settings.tty.finite.template.exit = "\e[?25h\e[0m"  # clean up after us
   p.settings.tty.finite.template.close = "\e[?25h\e[0m\n" # clean up after us
   p.settings.tty.finite.output = Proc.new{ |s|
@@ -209,8 +209,8 @@ def demo_10
   step = 1000
   text = " " * 30 + "DEMO 10 - OMGWTFBBQ!"
   p = PowerBar.new
-  p.settings.tty.finite.template.padchar = "\e[30;1m\u2589"
-  p.settings.tty.finite.template.barchar = "\e[34;1m\u2589"
+  p.settings.tty.finite.template.padchar = "\e[30;1m#{p.settings.tty.finite.template.padchar}"
+  p.settings.tty.finite.template.barchar = "\e[34;1m#{p.settings.tty.finite.template.barchar}"
   p.settings.tty.finite.output = Proc.new{ |s| $stderr.print s }
   j = 0
   total = 300000000
@@ -221,10 +221,10 @@ def demo_10
   
   (0..total).step(step).each do |i|
     p.send(:state).scope = nil # omghax, don't try this at home!
-    wtf = sprintf('%-26s', text[j%text.length..j%text.length+25])
-          .gsub(/./) { |char| char.send(rand(2).zero? ? :downcase : :upcase) }
+    wtf_range = (j % text.length)..((j % text.length) + 25)
+    wtf = sprintf('%-26s', text[wtf_range])
+    wtf.gsub!(/./) { |char| rand(2).zero? ? char.downcase : char.upcase }
     p.show(
-      {
         :msg => wtf,
         :done => i,
         :total => total,
@@ -232,8 +232,8 @@ def demo_10
           :tty => {
             :finite => {
               :template => {
-                :barchar => "\e[36;1m" + spin[j%spin.length],
-                :padchar => "\e[0;34m" + spun[j%spun.length],
+                :barchar => "\e[36;1m#{spin[j%spin.length..j%spin.length]}",
+                :padchar => "\e[0;34m#{spun[j%spun.length..j%spun.length]}",
                 :main => "\e[#{rand(1)};3#{rand(7)}m${<msg>}\e[0m "+
                          "\e[0m${<bar> }\e[0m${<rate>/s} "+
                          "\e[33;1m${<percent>%} " +
@@ -243,8 +243,7 @@ def demo_10
               }
             }
           }
-        } # chrr..
-      }
+        }
     )
     j += 1
     sleep 0.1

data/lib/powerbar.rb

@@ -29,6 +29,7 @@ require 'hashie/mash'
 #
 class PowerBar
   STRIP_ANSI = Regexp.compile '\e\[(\d+)(;\d+)?(;\d+)?[m|K]', nil
+  RUBY18 = RUBY_VERSION[0..2] == "1.8"
 
   def initialize(opts={})
     @@exit_hooked = false
@@ -71,8 +72,8 @@ class PowerBar
               :wipe => "\e[0m\e[1000D\e[K", # printed when 'wipe' is called
               :close => "\e[?25h\n",   # printed when 'close' is called
               :exit => "\e[?25h",      # printed if the process exits unexpectedly
-              :barchar => "\u2588",    # fill-char for the progress-bar
-              :padchar => "\u2022"     # padding-char for the progress-bar
+              :barchar => RUBY18 ? '#' : "\u2588", # fill-char for the progress-bar
+              :padchar => RUBY18 ? '.' : "\u2022"  # padding-char for the progress-bar
             },
           },
           :infinite => { # <== Settings for an infinite progress "bar" (when total is :unknown)
@@ -86,8 +87,8 @@ class PowerBar
               :wipe => "\e[0m\e[1000D\e[K",
               :close => "\e[?25h\n",
               :exit => "\e[?25h",
-              :barchar => "\u2588",
-              :padchar => "\u2022"
+              :barchar => RUBY18 ? '#' : "\u2588",
+              :padchar => RUBY18 ? '.' : "\u2022"
             },
           }
         },
@@ -288,7 +289,7 @@ class PowerBar
   end
 
   def h_rate
-    humanize_quantity(rate.round(1))
+    humanize_quantity(round(rate, 1))
   end
 
   def total
@@ -316,6 +317,15 @@ class PowerBar
     @state
   end
 
+  def round(number, digit)
+    if number.zero? or number.nan?
+      number
+    else
+      factor = 10.0 ** digit
+      (number * factor).round / factor
+    end
+  end
+
   # Cap'n Hook
   def exit!
     return if state.closed
@@ -327,17 +337,17 @@ class PowerBar
     skip.each do |s|
       tpl = tpl.gsub(/\$\{([^<]*)<#{s}>([^}]*)\}/, '\1\2')
     end
-    tpl.gsub(/\${[^}]+}/) do |var|
+    tpl.gsub(/\$\{[^\}]+\}/) do |var|
       sub = nil
       r = var.gsub(/<[^>]+>/) do |t|
         t = t[1..-2]
         begin
-          sub = self.send(('h_'+t).to_sym)
+          sub = send "h_#{t}"
         rescue NoMethodError
           raise NameError, "Invalid token '#{t}' in template '#{tplid}'"
         end
-      end[2..-2]
-      sub.nil? ? '' : r
+      end
+      sub.nil? ? '' : r[2..-2]
     end
   end
 
@@ -355,7 +365,7 @@ class PowerBar
     number  /= kilo ** exponent
 
     unit = HQ_UNITS[exponent]
-    return format.gsub(/%n/, number.round(1).to_s).gsub(/%u/, unit)
+    return format.gsub(/%n/, round(number, 1).to_s).gsub(/%u/, unit)
   end
 
   def humanize_interval(s)

data/lib/powerbar/version.rb

@@ -1,3 +1,3 @@
 class Powerbar
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

data/powerbar.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/busyloop/powerbar"
   s.summary     = %q{The last progressbar-library you'll ever need}
   s.description = %q{The last progressbar-library you'll ever need}
-  s.required_ruby_version = ">= 1.9.2"
   s.license     = "MIT"
 
   s.add_dependency "ansi", "~> 1.4.0"

metadata

@@ -1,46 +1,64 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: powerbar
-version: !ruby/object:Gem::Version
-  version: 1.0.9
+version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 10
+  version: 1.0.10
 platform: ruby
-authors:
+authors: 
 - Moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ansi
-  requirement: &15380180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
   type: :runtime
-  prerelease: false
-  version_requirements: *15380180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: hashie
-  requirement: &15379620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *15379620
+  version_requirements: *id002
 description: The last progressbar-library you'll ever need
-email:
+email: 
 - moe@busyloop.net
-executables:
+executables: 
 - powerbar-demo
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -51,29 +69,38 @@ files:
 - lib/powerbar/version.rb
 - powerbar.gemspec
 homepage: https://github.com/busyloop/powerbar
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The last progressbar-library you'll ever need
 test_files: []
+
 has_rdoc: