sidekiq-heartbeat_monitor 1.0.3.0 → 1.0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63e40fd229b698071996b154e4e03e663be310f9
-  data.tar.gz: 1f6f80eb7e1a17096aa0fab8643f9a8d6dcbb7ee
+  metadata.gz: 94ac413bdcca367c06df67dbb4b8ed922814031b
+  data.tar.gz: 317491055dd7b4caaaeeb03485af086ea9999b42
 SHA512:
-  metadata.gz: 11a89bf560477d9f172c875233ddbe57624e5a2e12ac9c2fa7ac99e9ee2d8225421e75c18adcb5d91c9924407d2524b00f5abeba4744eac407cf8f218fefb06b
-  data.tar.gz: 1ab1b00e3d63905f01319a01128bbe36fc0396b496fe5ff16eee07e311a0bce43b171f71d570366cf8a2c93e64b5ad3ab2b84696195b5a95d0860e1c8eca3e5c
+  metadata.gz: 38887358fc7d9489421273c1fa9c66996d5127bf9c40dae0216f9b380b9e72903db1b98529970454bae2137c0a5009e492660da9282058a84349e8d03760c721
+  data.tar.gz: 5c4cab171ad4c1425e100afbecda3f3169ea4db109eb0b318ab0f1469df8205a614ab9337c15f80c80377f5dbad021331555a486293faa1d9bca68a434d0aba4

data/lib/sidekiq/heartbeat_monitor/util.rb

@@ -3,16 +3,29 @@ module Sidekiq
   module HeartbeatMonitor
     module Util
 
-      def format_time_str(sec_backed_up)
-        hours = (sec_backed_up - (sec_backed_up % 3600)) / 3600
-        minutes = (sec_backed_up - (sec_backed_up % 60)) / 60
-        seconds = sec_backed_up % 60
+      ##
+      # Nicely formats a seconds string.
+      # Example 1: 100.seconds => "1 min 40 sec"
+      # Example 2: 13.hours => "13 hr"
+      # 
+      # @param total_seconds [String]  Total number of seconds to format nicely.
+      # @return [String] A string representation of the time.
+      def format_time_str(total_seconds)
+        remaining_sec = total_seconds
 
-        nice_backed_up_str = "#{seconds} sec"
-        nice_backed_up_str = "#{minutes} min #{nice_backed_up_str}" if minutes > 0
+        hours = (remaining_sec - (remaining_sec % 3600)) / 3600
+        remaining_sec -= hours * 3600
+
+        minutes = (remaining_sec - (remaining_sec % 60)) / 60
+        remaining_sec -= minutes * 60
+
+        seconds = remaining_sec
+
+        nice_backed_up_str = "#{seconds} sec" if seconds > 0 || (minutes < 1 && hours < 1)
+        nice_backed_up_str = "#{minutes} min #{nice_backed_up_str}" if minutes > 0 || (seconds > 0 && hours > 0)
         nice_backed_up_str = "#{hours} hr #{nice_backed_up_str}" if hours > 0
 
-        nice_backed_up_str
+        nice_backed_up_str.strip
       end
 
     end

data/lib/sidekiq/heartbeat_monitor/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
     module HeartbeatMonitor
-        VERSION = '1.0.3.0'
+        VERSION = '1.0.3.1'
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-heartbeat_monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.3.0
+  version: 1.0.3.1
 platform: ruby
 authors:
 - Jay El-Kaake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-05 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq