infobar 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f300b8193102474e354a5c4bae92fcda23208a601ee6429a41604621d375d1af
-  data.tar.gz: 1e4e904949892f6c21f9659c2286cdf18391aeaa14a355f8f871243d8790a7e2
+  metadata.gz: 80b49251df4d88a23dad1fc63b3098cbc4cbfa1e621fd52fbb59f3425d277a38
+  data.tar.gz: c997c2b5c5a10ce7bd9a4c15fe9d964ce897fe0497ab5bd262b8b29aa283c403
 SHA512:
-  metadata.gz: e749e37614ac18e6150a6c705e46e6caf511b338b98fdadcf35c2bb15cd2b521230aad49a9050bb54b96dbdde4595e0fff337412b7b9864f030869dbc925b6bd
-  data.tar.gz: b01b7257e98ab896a2f21c08da44004e9e4eb23a3aeb723105ab690a6fd5a144e38848d79e8922bf7a3f2bfd71933ea5a00dbdba3b14a0d42751f274943bbc45
+  metadata.gz: ecfaedb518237aa4d19c5ae349cfae5f8424ee6630c0674366acaaa900655249d4eb9bf817cd5699eaa6a4ea543ed8a6f497d98f8b6aee78a38b5f8f4ba653bf
+  data.tar.gz: d487777c25896417f4cbc0a0414d379b9cfb0fd5b4b8234870645a926bae2db7ae9ca33edaabea0f49c6d9c719ca233384f4831e028911f3fd32df405c6dbd1c

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
   - ruby-head
   - jruby-head
 sudo: false

data/README.md

@@ -21,6 +21,9 @@ Display progress of computations and additional information to the terminal.
 
 ## Changes
 
+* 2019-01-31 Release 0.6.0
+ - Allow progressing with - as false.
+
 * 2018-11-01 Release 0.5.1
   - Allow busy bar message to be overwritten.
 

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/infobar.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: infobar 0.5.1 ruby lib
+# stub: infobar 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "infobar".freeze
-  s.version = "0.5.1"
+  s.version = "0.6.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 = "2018-11-01"
+  s.date = "2019-01-31"
   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]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://flori.github.com/infobar".freeze
   s.rdoc_options = ["--title".freeze, "Infobar".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.3".freeze)
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "3.0.1".freeze
   s.summary = "Gem to display information about computations.".freeze
   s.test_files = ["spec/infobar/config_spec.rb".freeze, "spec/infobar/counter_spec.rb".freeze, "spec/infobar/display_spec.rb".freeze, "spec/infobar/duration_spec.rb".freeze, "spec/infobar/fifo_spec.rb".freeze, "spec/infobar/frequency_spec.rb".freeze, "spec/infobar/input_output_spec.rb".freeze, "spec/infobar/message_spec.rb".freeze, "spec/infobar/number_spec.rb".freeze, "spec/infobar/rate_spec.rb".freeze, "spec/infobar/spinner_spec.rb".freeze, "spec/infobar/timer_spec.rb".freeze, "spec/infobar/trend_spec.rb".freeze, "spec/infobar_spec.rb".freeze, "spec/spec_helper.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.15.0", "~> 1.0"])
+      s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.0", ">= 1.15.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.15.0", "~> 1.0"])
+      s.add_dependency(%q<tins>.freeze, ["~> 1.0", ">= 1.15.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.15.0", "~> 1.0"])
+    s.add_dependency(%q<tins>.freeze, ["~> 1.0", ">= 1.15.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.rb

@@ -63,10 +63,10 @@ class Infobar
     label:     cc.infobar?&.label || 'Infobar',
     message:   cc.infobar?&.message?&.to_h,
     show:      cc.infobar?&.show?,
-    style:     cc.infobar?&.style?&.to_h,
+    style:     cc.infobar?&.style?&.to_h&.symbolize_keys_recursive,
+    as_styles: cc.infobar?&.as_styles?&.to_h&.symbolize_keys_recursive,
     frequency: cc.infobar?&.frequency?,
     update:    false,
-    as_styles: nil,
     input:     $stdin,
     output:    $stdout
   )

data/lib/infobar/counter.rb

@@ -50,7 +50,7 @@ class Infobar::Counter
       @start ||= now
       @timer.add(now, by)
       @current += by
-      @as[as] += 1
+      @as[as] += by
     end
     self
   end

data/lib/infobar/display.rb

@@ -74,7 +74,7 @@ class Infobar::Display
   end
 
   def as_styles=(styles)
-    @as_styles = styles.to_h.dup
+    @as_styles = styles.to_h.symbolize_keys_recursive
     @as_styles.default_proc = proc { style.subhash(/\Adone_/) }
   end
 
@@ -98,9 +98,10 @@ class Infobar::Display
 
       total_done = 0
       counter.as.each_with_index do |(name, count), i|
-        done_fill     = as_styles[name].fetch(:done_fill) { @style[:done_fill] }
-        done_fg_color = as_styles[name].fetch(:done_fg_color) { @style[:done_fg_color] }
-        done_bg_color = as_styles[name].fetch(:done_bg_color) { @style[:done_bg_color] }
+        style_name = name.to_s.to_sym
+        done_fill     = as_styles[style_name].fetch(:done_fill) { @style[:done_fill] }
+        done_fg_color = as_styles[style_name].fetch(:done_fg_color) { @style[:done_fg_color] }
+        done_bg_color = as_styles[style_name].fetch(:done_bg_color) { @style[:done_bg_color] }
 
         as_progressed = count / counter.total.to_f
         as_done = as_progressed * cols

data/lib/infobar/fancy_interface.rb

@@ -4,11 +4,19 @@ module Infobar::FancyInterface
   end
 
   def +@
-    progress by: 1
+    progress by: 1, as: true
+  end
+
+  def -@
+    progress by: 1, as: false
   end
 
   def +(by)
-    progress by: by
+    progress by: by, as: true
+  end
+
+  def -(by)
+    progress by: by, as: false
   end
 
   def coerce(other)

data/lib/infobar/version.rb

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

data/spec/infobar_spec.rb

@@ -54,6 +54,15 @@ describe Infobar do
     expect(infobar.counter.current).to eq 1
   end
 
+  it 'can be progressing with unary - as false' do
+    Infobar(total: 10)
+    expect(infobar.counter.current).to eq 0
+    expect(infobar.counter.as[false]).to eq 0
+    expect(-infobar).to eq infobar
+    expect(infobar.counter.current).to eq 1
+    expect(infobar.counter.as[false]).to eq 1
+  end
+
   it 'can be progressing by n' do
     Infobar(total: 10)
     expect(infobar.counter.current).to eq 0
@@ -72,6 +81,21 @@ describe Infobar do
     expect(infobar.counter.current).to eq 7
   end
 
+  it 'can be progressing by n with binary - as false' do
+    infobar = Infobar(total: 10)
+    expect(infobar.counter.current).to eq 0
+    expect(infobar.counter.as[false]).to eq 0
+    expect(infobar - 3).to eq infobar
+    expect(infobar.counter.current).to eq 3
+    expect(infobar.counter.as[false]).to eq 3
+    expect(2 - infobar).to eq infobar
+    expect(infobar.counter.current).to eq 5
+    expect(infobar.counter.as[false]).to eq 5
+    expect(infobar -= 2).to eq infobar # only for variables
+    expect(infobar.counter.current).to eq 7
+    expect(infobar.counter.as[false]).to eq 7
+  end
+
   it 'can progress as some kind' do
     Infobar(total: 10)
     expect(infobar.counter.current).to eq 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infobar
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -215,8 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Gem to display information about computations.