popro 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc8a91c38e9a66e7b5de492fe92f5def2d044fc118a3dfc25ef826ccadc8692c
-  data.tar.gz: 00fc035091657744a3bc7110b91f1cfb49192d07afce1a0866e20745b038c368
+  metadata.gz: 8c3d8c8dba5a532d23b95582322983b844243a72679bff15acce69933c106ea2
+  data.tar.gz: ea5170d62aa990167c89d0fee9d7ee07d1cb1902f0a8e64f1920abbb523ed446
 SHA512:
-  metadata.gz: f0c02a15ce252052573de441631e8665f8c2fde13e27162287a01739df908283514f8fa0eb98056e179c2d6ac139aac89bb4a603abd45ae1d9333d960f2de5e4
-  data.tar.gz: 989554d6b7dcf42c8db7a0a1b240b440acf07fd1b965e861486361fe7627fe4c65d37ae8df951daeae37445d689239397613a34f1e6231d11e5addbccdaf586a
+  metadata.gz: 9023ad0fbf774e02fab5dc99df4720365a742c651469342bed04326fa88a34dd7e91d04830f50a4d28ac28a677e660a93715b6b51688b17668933cf0bdc3276e
+  data.tar.gz: b79e9a485d34aaab14bd7674a3adfad80305ba9c87b0ff8a7cd1981ec5dd6afeaef263efab503cef06065662c5d1ad296e7bec3c49c56e21117028fb691a5d7e

data/CHANGELOG

@@ -1,3 +1,4 @@
+0.2.4 add support for `Popro.(un)silence!` atomic silencing, better duration formatting
 0.2.3 add support for `Popro.silenced`
 0.2.2 add gonna and each_gonna, add Callback Indicator
 0.2.1 add support for estimation and re-use of default indicator with added concatted formatters

data/lib/popro.rb

@@ -35,6 +35,16 @@ module Popro
     @_is_silenced = prev_silenced
   end
 
+  def self.silence!
+    @_is_silenced = true
+    self
+  end
+
+  def self.unsilence!
+    @_is_silenced = false
+    self
+  end
+
   def self.silenced?
     @_is_silenced
   end

data/lib/popro/formatter.rb

@@ -63,6 +63,15 @@ module Popro
 
       private
 
+      UNITS = [
+        [60, '%02ds'],
+        [60, '%02dm'],
+        [24, '%02dh'],
+        [7, '%d days, '],
+        [52, '%d weeks, '],
+        [nil, '%d years, ']
+      ].freeze
+
       def elapsed
         current_time - @start_time
       end
@@ -80,9 +89,24 @@ module Popro
       end
 
       def format_duration(secs)
-        return '??d??h??m??s' if secs.nil?
+        return '?' if secs.nil?
+
+        return format('%.3fs', secs) if secs < 10
+
+        format_duration_long(secs)
+      end
+
+      def format_duration_long(secs)
+        UNITS.map do |(divisor, format_str)|
+          next if secs < 1
+
+          if divisor
+            amount = secs % divisor
+            secs /= divisor
+          end
 
-        format('%02dd%02dh%02dm%02ds', secs / 86_400, secs / 3600 % 24, secs / 60 % 60, secs % 60)
+          format(format_str, divisor ? amount : secs)
+        end.take_while(&:itself).reverse!.join
       end
 
       def current_time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: popro
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - MikeSmithEU
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-09-20 00:00:00.000000000 Z
 dependencies: []
 description: The Poor-Man's Progress Indicator
 email: