infobar 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f6a434af8a03ac85dcd80652a14e8cdb2e94662
-  data.tar.gz: 5453eeb5f4d781111d841679fa89298e647878ae
+  metadata.gz: 224e1a27bb2395439832350f0f9ae226d70d6dc7
+  data.tar.gz: 27de3a8fe8fa615dff727dfe647bf23224258093
 SHA512:
-  metadata.gz: e78b1cb39709d08fa1747603c935bea95c7a25357289b672e8a272a0efa51265be223b74bf86ecc34a999b65745976bf824996b87bb2037361e57e972f0f0e0f
-  data.tar.gz: a42a5d228efa7ac73d97be14758b04843b71ec487d6060ef1d68035848e9e6bbeae3218f22cad69c74f576fb3be1289fc4ee3c563e9e90301f981bd9d1a0f5d3
+  metadata.gz: '09038c7c40c1860f68d719eb7cc4e76e5fc701edce4aaeb8ba564e0da5dbf91e34a1b9dff18bf11750fe6314de5ed49f38ce27ab2038aac519ea1576919e675b'
+  data.tar.gz: 48af752e245e7d9930a972b813b233c6069e48f250a2a3f4e4386b398228beb904ad24cb6750ade8ed3e349d10743cec8750257ba6bbd35cfb38c2e2a5e84650

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - 2.3.3
+  - 2.4.1
+  - ruby-head
+  - jruby-head
+sudo: false
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/Gemfile

@@ -3,3 +3,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'byebug', platform: :mri

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

data/infobar.gemspec

@@ -1,18 +1,18 @@
 # -*- encoding: utf-8 -*-
-# stub: infobar 0.0.7 ruby lib
+# stub: infobar 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "infobar".freeze
-  s.version = "0.0.7"
+  s.version = "0.1.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-04-13"
+  s.date = "2017-04-24"
   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]
-  s.files = [".gitignore".freeze, ".rspec".freeze, ".utilsrc".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "TODO.md".freeze, "VERSION".freeze, "infobar.gemspec".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, "spec/config/infobar.yml".freeze, "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]
+  s.files = [".gitignore".freeze, ".rspec".freeze, ".travis.yml".freeze, ".utilsrc".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "TODO.md".freeze, "VERSION".freeze, "infobar.gemspec".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, "spec/config/infobar.yml".freeze, "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]
   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)

data/lib/infobar.rb

@@ -51,6 +51,8 @@ class Infobar
 
   delegate :style=, to: :display
 
+  delegate :as_styles=, to: :display
+
   def call(
     total:,
     current:   0,
@@ -60,19 +62,18 @@ class Infobar
     style:     cc.infobar?&.style?&.to_h,
     frequency: cc.infobar?&.frequency?,
     update:    false,
-    finish:    nil
+    finish:    nil,
+    as_styles: nil
   )
     self.label = label
     counter.reset(total: total, current: current)
+    display.reset
     @message = convert_to_message(message)
     show.nil? or self.show = show
-    if update
-      update(message: @message, force: true)
-    else
-      display.reset
-    end
     frequency.nil? or display.frequency = frequency
     style.nil? or self.style = style
+    self.as_styles = as_styles
+    update and update(message: @message, force: true)
     self
   end
 
@@ -105,14 +106,14 @@ class Infobar
 
   def update(message: nil, force: true)
     @message = convert_to_message(message)
-    display.update(message: @message, progressed: counter.progressed, force: force)
+    display.update(message: @message, counter: counter, force: force)
     self
   end
 
-  def progress(by: 1, message: nil, finish: true, force: false)
-    counter.progress(by: by)
+  def progress(by: 1, as: nil, message: nil, finish: true, force: false)
+    counter.progress(by: by, as: as)
     @message = convert_to_message(message)
-    display.update(message: @message, force: force, progressed: counter.progressed)
+    display.update(message: @message, force: force, counter: counter)
     finish && counter.done? and finish(message: finish)
     self
   end
@@ -120,7 +121,7 @@ class Infobar
   def finish(message: nil)
     counter.finish
     @message = convert_to_message(message)
-    display.update(message: @message, force: true, progressed: counter.progressed)
+    display.update(message: @message, force: true, counter: counter)
     self
   end
 

data/lib/infobar/counter.rb

@@ -13,12 +13,16 @@ class Infobar::Counter
 
   attr_reader :total
 
+  attr_reader :as
+
   def reset(total: 0, current: 0)
     @current  = current
+    @as       = Hash.new(0).update(nil => current)
     @total    = total
     @start    = nil
     @finished = false
     @timer    = Infobar::Timer.new
+    self
   end
 
   delegate :rate, to: :@timer
@@ -40,12 +44,13 @@ class Infobar::Counter
     self
   end
 
-  def progress(by: 1)
+  def progress(by: 1, as: nil)
     if !finished? && by >= 1
       now = Time.now
       @start ||= now
       @timer.add(now, by)
       @current += by
+      @as[as] += 1
     end
     self
   end

data/lib/infobar/display.rb

@@ -24,7 +24,7 @@ class Infobar::Display
     self.input     = $stdin
     self.frequency = 0.05
     @show          = true
-    self.style = self.class.default_style
+    @style         = self.class.default_style.dup
   end
 
   def frequency=(duration)
@@ -62,34 +62,63 @@ class Infobar::Display
     end
   end
 
-  def style
-    self.class.default_style.each_key.each_with_object({}) do |attribute, h|
-      h[attribute] = instance_variable_get "@#{attribute}"
-    end
-  end
+  attr_reader :style
 
   def style=(new_style)
-    self.class.default_style.each_key do |attribute|
-      value = new_style[attribute]
-      value.nil? and next
-      instance_variable_set "@#{attribute}", value
-    end
-    self
+    @style.update(new_style)
+  end
+
+  def as_styles
+    defined? @as_styles or self.as_styles = {}
+    @as_styles
   end
 
-  def update(message:, progressed:, force: false, **options)
+  def as_styles=(styles)
+    @as_styles = styles.to_h.dup
+    @as_styles.default_proc = proc { style.subhash(/\Adone_/) }
+  end
+
+  def update(message:, counter:, force: false, **options)
     force and @frequency.reset
     @frequency.call do
       message = Infobar.convert_to_message(message)
       carriage_return
       self.style = options
-      cols = columns
-      todo = message.to_str.center cols, replace_character
-      done = todo.slice!(0, (progressed * cols))
-      done.gsub!(replace_character, @done_fill[0])
-      todo.gsub!(replace_character, @todo_fill[0])
-      output << color(@done_fg_color, on_color(@done_bg_color, done)) +
-        color(@todo_fg_color, on_color(@todo_bg_color, todo))
+      layout_bar(message, counter)
+    end
+  end
+
+  private\
+  def layout_bar(message, counter)
+    cols = columns
+    todo = message.to_str.center cols, replace_character
+
+    if counter.total > 0
+      max_done_length = counter.progressed * cols
+
+      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] }
+
+        as_progressed = count / counter.total.to_f
+        as_done = as_progressed * cols
+        total_done += as_done
+        if counter.done? && i == counter.as.size - 1 && total_done <= max_done_length
+          done = todo.dup
+          todo = ''
+        else
+          done = todo.slice!(0, as_done)
+        end
+        done.gsub!(replace_character, done_fill[0])
+        output << color(done_fg_color, on_color(done_bg_color, done))
+      end
+    end
+
+    if todo.present?
+      todo.gsub!(replace_character, @style[:todo_fill][0])
+      output << color(@style[:todo_fg_color], on_color(@style[:todo_bg_color], todo))
     end
   end
 

data/lib/infobar/message.rb

@@ -124,9 +124,13 @@ class Infobar::Message
 
   attr_reader :opts
 
-  delegate :directives, to: self
+  def directives
+    self.class.directives
+  end
 
-  delegate :directive_default_options, to: self
+  def directive_default_options
+    self.class.directive_default_options
+  end
 
   def opts_for(directive)
     @opts.fetch(directive, directive_default_options[directive])

data/lib/infobar/version.rb

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

data/spec/config/infobar.yml

@@ -1,5 +1,5 @@
 ---
-development:
+default: &default
   label: Progress
   message:
     format: ' %l %c/%t (%P%%) in %te with %r, ETA %e @%E %s '
@@ -18,3 +18,6 @@ development:
     todo_fg_color: 124
     todo_bg_color: 214
   show: <%= STDIN.tty? %>
+
+development: *default
+test: *default

data/spec/infobar/config_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Infobar config' do
   before do
     ComplexConfig::Provider.config_dir =
-      Pathname.new(__FILE__).dirname.dirname + 'config'
+      Pathname.new(__FILE__).join('../../config')
     extend ComplexConfig::Provider::Shortcuts
     ComplexConfig::Provider.reload
   end
@@ -20,6 +20,9 @@ describe 'Infobar config' do
   it 'configures default infobar' do
     Infobar(total: 23)
     expect(infobar.display.output).to receive(:<<).with(?\r)
+    expect(infobar.display.output).to receive(:<<).with(
+      "\e[38;5;22m\e[48;5;40m\e[0m\e[0m"
+    )
     expect(infobar.display.output).to receive(:<<).with(%r(Progress 0/23.*⣽))
     infobar.update
     expect(infobar).to be_show

data/spec/infobar/display_spec.rb

@@ -9,20 +9,24 @@ describe Infobar::Display do
     described_class.new
   end
 
+  let :counter do
+    Infobar::Counter.new.reset(total: 2, current: 1)
+  end
+
   before do
     display.output = output
     allow(display).to receive(:columns).and_return 40
   end
 
   it 'can be updated' do
-    display.update message: 'test', progressed: 0.5
+    display.update message: 'test', counter: counter
     expect(output.tap(&:rewind).read).to eq\
        "\r\e[38;5;22m\e[48;5;40m░░░░░░░░░░░░░░░░░░te\e[0m\e[0m\e[38;5;40m\e[48;5;22mst                  \e[0m\e[0m"
   end
 
   it 'update returns carriage first' do
     expect(display).to receive(:carriage_return).and_call_original
-    display.update message: 'test', progressed: 0.5
+    display.update message: 'test', counter: counter
     expect(output.tap(&:rewind).read).to start_with ?\r
   end
 
@@ -47,12 +51,37 @@ describe Infobar::Display do
       todo_bg_color: 8
     }
     display.style = test_style
-    display.update message: 'test', progressed: 0.5
+    display.update message: 'test', counter: counter
     expect(output.tap(&:rewind).read).to eq\
       "\r\e[38;5;1m\e[48;5;9mXXXXXXXXXXXXXXXXXXte\e[0m\e[0m\e[38;5;0m\e[48;5;8mstOOOOOOOOOOOOOOOOOO\e[0m\e[0m"
     expect(display.style).to eq(test_style)
   end
 
+  it 'styles are different as kinds differ' do
+    counter = Infobar::Counter.new.reset(total: 7, current: 5)
+    allow(counter).to receive(:as).and_return(
+      foo: 3,
+      bar: 2
+    )
+    allow(display).to receive(:as_styles).and_return(
+      {
+        foo: {
+          done_fill:     ?X,
+          done_fg_color: 1,
+          done_bg_color: 9,
+        },
+        bar: {
+          done_fill:     ?*,
+          done_fg_color: 0,
+          done_bg_color: 10,
+        }
+      }
+    )
+    display.update message: 'test', counter: counter
+    expect(output.tap(&:rewind).read).to eq\
+      "\r\e[38;5;1m\e[48;5;9mXXXXXXXXXXXXXXXXX\e[0m\e[0m\e[38;5;0m\e[48;5;10m*test******\e[0m\e[0m\e[38;5;40m\e[48;5;22m            \e[0m\e[0m"
+  end
+
   it 'can output newline' do
     expect(display.output).to receive(:<<).with($/)
     display.newline

data/spec/infobar_spec.rb

@@ -29,7 +29,7 @@ describe Infobar do
     expect(infobar.display).to receive(:update).
       with(
         message: anything,
-        progressed: anything,
+        counter: anything,
         force: true
       ).and_call_original
     infobar.update
@@ -72,6 +72,20 @@ describe Infobar do
     expect(infobar.counter.current).to eq 7
   end
 
+  it 'can progress as some kind' do
+    Infobar(total: 10)
+    expect(infobar.counter.current).to eq 0
+    expect(infobar.progress).to eq infobar
+    expect(infobar.progress(as: :foo)).to eq infobar
+    expect(infobar.progress(as: :bar)).to eq infobar
+    expect(infobar.progress(as: :foo)).to eq infobar
+    expect(infobar.counter.as).to eq(
+      nil  => 1,
+      foo:    2,
+      bar:    1
+    )
+  end
+
   it 'can be progressing with <<' do
     Infobar(total: 10)
     expect(infobar.counter.current).to eq 0
@@ -123,7 +137,7 @@ describe Infobar do
     expect(infobar.display).to receive(:update).with(
       message: message,
       force: true,
-      progressed: 0.0
+      counter: anything
     ).and_call_original
     infobar.finish message: message
     expect(infobar).to be_finished
@@ -144,6 +158,7 @@ describe Infobar do
     Infobar(total: 10, style: { done_fill: ?X })
     output = ''
     infobar.display.output = output
+    allow(Tins::Terminal).to receive(:columns).and_return 80
     infobar.progress(force: true)
     expect(output).to include 'X'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infobar
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -153,6 +153,7 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - ".utilsrc"
 - Gemfile
 - README.md