infobar 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0be5272638347ca61146d7e2896a77d93f255718
-  data.tar.gz: dece81f98dd6f4ebcc75018f8e2671ea1ee8aad1
+  metadata.gz: 7a0c747745053b3efed4f91fa65814dd018778e9
+  data.tar.gz: 7e9789d2145df62b2ef89a41d0f02e62b1ef5cac
 SHA512:
-  metadata.gz: 30e7d15b2ebdc70f40736b486089edab521ce736edd8c6f430b7989c74c7ff0a1c2f89fd3dcf698a23523d75c3b908f9810914481b0dc986eb8c825480e16c3c
-  data.tar.gz: a3e2fd36c622f755a8e8210dae2cb73ca42a9630f4cbe7f7e12a6845d8ba08796c5b825b4846f90b2da4ad4351d6668d2e20d4a1670dc6f02d7504b0b207a352
+  metadata.gz: a611e03d678f785245d320b2289c3764d93914138ce445eb644fa56cbea05590d89c1e9e1f2cffa7b32d3e321a07fa2af4338aecc69d0d3fa37652d8241ad42d
+  data.tar.gz: dfd38f2927dd1c100c071a8a88495c17c54464273765989c4098bc9cb5772cd56be55d7445f9352272205ffafcdb5b53ef0fe03cdb2d0ea56588561d0fd3f9c2

data/Rakefile

@@ -17,7 +17,7 @@ GemHadar do
   title       "#{name.camelize}"
 
   required_ruby_version '>= 2.3'
-  dependency 'tins',           '~> 1.0', '>= 1.13.2'
+  dependency 'tins',           '~> 1.0', '>= 1.15.0'
   dependency 'term-ansicolor', '~> 1.4'
   dependency 'complex_config', '~> 0.10'
   dependency 'more_math'

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/infobar.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: infobar 0.2.0 ruby lib
+# stub: infobar 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "infobar".freeze
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2017-05-24"
+  s.date = "2017-06-29"
   s.description = "This gem displays progress of computations and additional information to the terminal.".freeze
   s.email = "flori@ping.de".freeze
   s.extra_rdoc_files = ["README.md".freeze, "lib/infobar.rb".freeze, "lib/infobar/counter.rb".freeze, "lib/infobar/display.rb".freeze, "lib/infobar/duration.rb".freeze, "lib/infobar/fancy_interface.rb".freeze, "lib/infobar/fifo.rb".freeze, "lib/infobar/frequency.rb".freeze, "lib/infobar/input_output.rb".freeze, "lib/infobar/message.rb".freeze, "lib/infobar/number.rb".freeze, "lib/infobar/rate.rb".freeze, "lib/infobar/spinner.rb".freeze, "lib/infobar/timer.rb".freeze, "lib/infobar/trend.rb".freeze, "lib/infobar/version.rb".freeze]
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>.freeze, [">= 0"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<tins>.freeze, [">= 1.13.2", "~> 1.0"])
+      s.add_runtime_dependency(%q<tins>.freeze, [">= 1.15.0", "~> 1.0"])
       s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.4"])
       s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.10"])
       s.add_runtime_dependency(%q<more_math>.freeze, [">= 0"])
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>.freeze, [">= 0"])
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_dependency(%q<rspec>.freeze, [">= 0"])
-      s.add_dependency(%q<tins>.freeze, [">= 1.13.2", "~> 1.0"])
+      s.add_dependency(%q<tins>.freeze, [">= 1.15.0", "~> 1.0"])
       s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.4"])
       s.add_dependency(%q<complex_config>.freeze, ["~> 0.10"])
       s.add_dependency(%q<more_math>.freeze, [">= 0"])
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>.freeze, [">= 0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, [">= 0"])
-    s.add_dependency(%q<tins>.freeze, [">= 1.13.2", "~> 1.0"])
+    s.add_dependency(%q<tins>.freeze, [">= 1.15.0", "~> 1.0"])
     s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.4"])
     s.add_dependency(%q<complex_config>.freeze, ["~> 0.10"])
     s.add_dependency(%q<more_math>.freeze, [">= 0"])

data/lib/infobar/message.rb

@@ -25,18 +25,18 @@ class Infobar::Message
   end
 
   # current counter value of items
-  register '%c' do
-    Infobar.counter.current
+  register('%c', format: '%d', separate: ?_) do |directive, opts|
+    Infobar::Number.new(Infobar.counter.current, **opts)
   end
 
   # total counter value of items
-  register '%t' do
-    Infobar.counter.total
+  register('%t', format: '%d', separate: ?_) do |directive, opts|
+    Infobar::Number.new(Infobar.counter.total, **opts)
   end
 
   # number of items to go
-  register '%T' do
-    Infobar.counter.to_go
+  register('%T', format: '%d', separate: ?_) do |directive, opts|
+    Infobar::Number.new(Infobar.counter.to_go, **opts)
   end
 
   # label of progress bar
@@ -65,17 +65,17 @@ class Infobar::Message
   end
 
   # time elapsed as a duration
-  register('%te', format: '%h:%m:%s') do |directive, opts|
+  register('%te', format: '%D') do |directive, opts|
     Infobar::Duration.new(Infobar.counter.time_elapsed, **opts)
   end
 
   # total time as a duration
-  register('%tt', format: '%h:%m:%s') do |directive, opts|
+  register('%tt', format: '%D') do |directive, opts|
     Infobar::Duration.new(Infobar.counter.total_time, **opts)
   end
 
   # ETA as a duration
-  register('%e', format: '%h:%m:%s') do |directive, opts|
+  register('%e', format: '%D') do |directive, opts|
     Infobar::Duration.new(Infobar.counter.time_remaining, **opts)
   end
 

data/lib/infobar/number.rb

@@ -1,7 +1,10 @@
 class Infobar::Number
-  def initialize(value, format: nil)
+  def initialize(value, format: nil, separate: nil)
     duration = Tins::Duration.new(value)
-    @string = format ? (format % value) : value.to_s
+    @string = format ? format % value : value.to_s
+    if Integer === value && separate
+      @string.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{separate}")
+    end
   end
 
   def to_s

data/lib/infobar/version.rb

@@ -1,6 +1,6 @@
 class Infobar
   # Infobar version
-  VERSION         = '0.2.0'
+  VERSION         = '0.3.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infobar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -75,7 +75,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -85,7 +85,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement