tty-progressbar 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d266b064379d48a7f7efa620115e1de7d289d7d469f09ef3879cc1ccaceb71db
-  data.tar.gz: 14ec207136b4910387f398f443351632e12c60744d389c1747a90ddf90cae5cd
+  metadata.gz: 7ce16ff1076a290596a04263c1fb09cd3246d4ea02e70a050405ee64c1b402e7
+  data.tar.gz: 7cd54ae7c051e037bad54b6992779bbd3afaeab89a112f9e9d1dd5f1bbeb0a11
 SHA512:
-  metadata.gz: e872707b643d2b01f89fb056f31654f0d6aef50c9665936442c8c9f9cb8310f6bb8af447506d6ff3197284b4365595d475c799dc9d1c4dd20f0bc2d9fc395412
-  data.tar.gz: d695aa270398d79899aea3dcaa58964f6f24ea8888d84cecbb191982cb52717b82526eeb92561ee50af1ec00e1ddba8d0b378c6d5484c8ed70e2e6890f0e07f4
+  metadata.gz: 04c89a52f0c7467b420419edb5841e52f5ce667b666cb8637aebf6295448598d6fbdd73874823d3b73df7fb38d633a7b94931c34356295dd812bb86cc55aa882
+  data.tar.gz: c8f65a47aa2258da3baceb42a146b528779e4b659031c2dd5dab33aba55d42673abcb885197112608a01c6147c4476d5bbdeea9db577a69478bf2f5aaa58cc91

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## [v0.18.1] - 2021-01-25
+
+### Fixed
+* Fix :eta and :eta_time format tokens display when progress isn't started
+
 ## [v0.18.0] - 2021-01-20
 
 ### Added
@@ -232,6 +237,7 @@
 
 * Initial implementation and release
 
+[v0.18.1]: https://github.com/piotrmurach/tty-progressbar/compare/v0.18.0...v0.18.1
 [v0.18.0]: https://github.com/piotrmurach/tty-progressbar/compare/v0.17.0...v0.18.0
 [v0.17.0]: https://github.com/piotrmurach/tty-progressbar/compare/v0.16.0...v0.17.0
 [v0.16.0]: https://github.com/piotrmurach/tty-progressbar/compare/v0.15.1...v0.16.0

data/lib/tty/progressbar/formatter/estimated.rb

@@ -18,13 +18,15 @@ module TTY
       #
       # @api public
       def call(value)
-        if @progress.indeterminate?
+        if @progress.indeterminate? ||
+           (@progress.elapsed_time.zero? && @progress.ratio.zero?)
           return value.gsub(matcher, "--s")
         end
 
         elapsed = @progress.elapsed_time
-        estimated = (elapsed / @progress.ratio).to_f - elapsed
-        estimated = (estimated.infinite? || estimated < 0) ? 0.0 : estimated
+        estimated = @progress.ratio.zero? ? 0.0 : (elapsed / @progress.ratio).to_f
+        estimated -= elapsed
+        estimated = 0.0 if estimated < 0
         value.gsub(matcher, Converter.to_time(estimated))
       end
     end # EstimatedFormatter

data/lib/tty/progressbar/formatter/estimated_time.rb

@@ -15,13 +15,15 @@ module TTY
       #
       # @api public
       def call(value)
-        if @progress.indeterminate?
+        if @progress.indeterminate? ||
+           (@progress.elapsed_time.zero? && @progress.ratio.zero?)
           return value.gsub(matcher, "--:--:--")
         end
 
         elapsed = @progress.elapsed_time
-        estimated = (elapsed / @progress.ratio).to_f - elapsed
-        estimated = (estimated.infinite? || estimated < 0) ? 0.0 : estimated
+        estimated = @progress.ratio.zero? ? 0.0 : (elapsed / @progress.ratio).to_f
+        estimated -= elapsed
+        estimated = 0.0 if estimated < 0
 
         time_format = if estimated >= 86_400 # longer than a day
                         "%Y-%m-%d %H:%M:%S"

data/lib/tty/progressbar/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   class ProgressBar
-    VERSION = "0.18.0"
+    VERSION = "0.18.1"
   end # ProgressBar
 end # TTY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-progressbar
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strings-ansi