is-term 0.8.0 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4ae56431794997d6094441cfb78c837bad34ff05debaa1316cb8cd7bb2b02d4
-  data.tar.gz: e0d5da7fa5ffe144e8d4a907563c484deba362a27f8c7e1ce9d05f85d84cde1d
+  metadata.gz: c37ae2be256250fa7dae77e58c31839bbfd9e80aec7bf62d00e6711f1d71d20c
+  data.tar.gz: b578b427433c8d856ecae60bbf1dc0cd6e34557566efc0de62267b48d708cc95
 SHA512:
-  metadata.gz: e2e418bc52946002d187d349d393bd39b73b95524a5d7ffebd3891bb2182d70e30bdd41c2058603062ca95a165c122732fca1891b5379fdbbef623d3a3023057
-  data.tar.gz: 5174cae5ca73ad0cf976ed29346ffce7926f00e323e5fa7014eb6a6cd912532863157290b66130a3ad484d9147293e990539c81f33a95fb413972071dd7866f2
+  metadata.gz: 141f30cefe750f957776bce3e48ac34b82e9b69322d117722c385b2ad1032e4a3268d057bab819a4b9142277793aa740460bb6439b4c6b01da27bbe620210def
+  data.tar.gz: 8f339644c5eba0f6cf265951c4f0898daf4cb7fd79be6341216bd53ebc23d357f9eabfe8ddd7d9fc563404337d1cbb0a5cdc387aaf4ae4bee0c150e40fb455e9

data/lib/is-term/formats.rb

@@ -39,17 +39,26 @@ module IS::Term::StatusTable::Formats
     end
 
     # @return [String]
-    def percent_bar value, width, complete: '=', incomplete: ' ', head: '>', done: '≡'
+    def skip value
+      ''
+    end
+
+    # @return [String]
+    def percent_bar value, width, complete: '=', incomplete: ' ', head: '>', done: '≡', widths: [ nil, nil, nil, nil ]
       return '' if value.nil?
+      cw = widths[0] || complete&.width   || 0
+      iw = widths[1] || incomplete&.width || 0
+      hw = widths[2] || head&.width       || 0
+      dw = widths[3] || done&.width       || 0
       if value >= 100
-        done * (width / done.width)
+        done * (width / dw)
       elsif value == 0
-        incomplete * (width / incomplete.width)
+        incomplete * (width / iw)
       else
         point = 100 / width
-        i = (100 - value) / (point * incomplete.width)
+        i = (100 - value) / (point * iw)
         #h = 1
-        c = width - i * incomplete.width - head.width
+        c = (width - i * iw - hw) / cw
         if c < 0
           i += c
           c = 0
@@ -62,10 +71,12 @@ module IS::Term::StatusTable::Formats
 
   end
 
-  SPECIAL_FORMATS = [ :duration ]
+  SPECIAL_FORMATS = [ :duration, :skip ]
 
   class << self
 
+    using IS::Term::StringHelpers
+
     # @group Formatter Access
 
     # @return [Proc]
@@ -90,7 +101,8 @@ module IS::Term::StatusTable::Formats
         complete: complete,
         incomplete: incomplete,
         head: head,
-        done: done
+        done: done,
+        widths: [ complete&.width, incomplete&.width, head&.width, done&.width ]
       }
       lambda { |value| self.percent_bar(value, width, **opts) }
     end

data/lib/is-term/info.rb

@@ -7,7 +7,7 @@ module IS::Term; end
 module IS::Term::Info
 
   NAME = 'is-term'
-  VERSION = '0.8.0'
+  VERSION = '0.8.4'
   AUTHOR = "Ivan Shikhalev"
   AUTHOR_URL = "https://github.com/shikhalev"
   EMAIL = "shikhalev@gmail.com"

data/lib/is-term/statustable.rb

@@ -202,6 +202,7 @@ class IS::Term::StatusTable
         end
         if definition[:width] && !skip_width
           value = value.ellipsis definition[:width]
+          value = value.align definition[:width], definition[:align]
         end
         return false if !skip_width && value.width > definition[:_width] && !@in_table_render
         result << value
@@ -246,6 +247,7 @@ class IS::Term::StatusTable
         end
         if definition[:width] && !skip_width
           value = value.ellipsis definition[:width]
+          value = value.align definition[:width], definition[:align]
         end
         return false if !skip_width && value.width > definition[:_width] && !@in_table_render
         result << value
@@ -354,6 +356,7 @@ class IS::Term::StatusTable
     end
     raise ArgumentError, "Invalid width value: #{ width.inspect }", caller_locations unless width.nil? || width.is_a?(Integer)
     raise ArgumentError, "Invalid align value: #{ align.inspect }", caller_locations unless align.nil? || IS::Term::StringHelpers::ALIGN_MODES.include?(align)
+    align = IS::Term::StringHelpers::DEFAULT_ALIGN_MODE if align.nil?
     summary_keys = Set[*(SUMMARY_NONE + SUMMARY_VALS)]
     if self.class.const_defined?(:Functions)
       summary_keys |= Set[*(Functions::TABLE_METHODS + Functions::AGGREGATE_METHODS)]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: is-term
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.4
 platform: ruby
 authors:
 - Ivan Shikhalev
@@ -93,6 +93,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 executables: []
 extensions: []
 extra_rdoc_files: []