makit 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 302737c6fffa07aa87668fc9a01ec04d49623b95d16642fd48b5c7318c2e41c3
-  data.tar.gz: '01280acfdf6509404427b7847280a7759070fc604996f55aa3161c3b1c4705f3'
+  metadata.gz: c27f269da0b90889675df5626377f39ea4041da3fd699c55b38cb11765b8f25c
+  data.tar.gz: 0c38c29372bc46db6fe59fc71791d2ade93a324cb79e7b104b2070ff8e69e326
 SHA512:
-  metadata.gz: 7c3d87b426715f7ff3adfb22674f9478b6249fe8bed2b5e76568bd790bee2cf3345381d7620dcd940cf4e3198905f2ed6b79a1dd0b400e7bde6710cfd10051b8
-  data.tar.gz: a8fa4bdb2442681e26fdbe3dc595db7e1f956f23c542a2b19f8581fb866d0db6b243acaf4b5bbf1275968a01eeaddfbaa47afaa79b61047b51f9a51706a0a0dd
+  metadata.gz: 457c42044259e99d39778189f620bc631b9326f4e85fd632420bb906fd714f9af5caf883492a007f19085fc8d517882ff26aabe2e7ba130eaa79296caed1608d
+  data.tar.gz: 6dc2f0740d5516062053aa379f039a48bfa02fc44ec2b0f53ab4d2ca16fa01346e56f25bb87cfb96c3eb7fc017b089e0356fce2eb137f7d18d9dc36504b12fce

data/lib/makit/humanize.rb

@@ -91,21 +91,38 @@ module Makit
       "#{hours}h #{minutes}m #{seconds}s"
     end
 
-    def self.get_humanized_duration(seconds)
-      minutes = (seconds / 60).to_i
-      seconds = (seconds % 60).to_i
+    def self.get_humanized_duration(seconds_value)
+      minutes = (seconds_value / 60).to_i
+      seconds = (seconds_value % 60).to_i
       hours = (minutes / 60).to_i
       minutes = minutes % 60
       days = (hours / 24).to_i
       hours = hours % 24
-      milliseconds = (seconds % 1 * 1000).to_i
+      milliseconds = (seconds_value % 1 * 1000).to_i
 
       parts = []
       parts << "#{days} days" if days > 0
       parts << "#{hours} hours" if hours > 0
-      parts << "#{minutes} minutes" if minutes > 0
-      parts << "#{seconds} seconds" if seconds > 0
+      if(minutes > 0)
+        if(minutes == 1)
+          parts << "1 minute"
+        else
+          parts << "#{minutes} minutes"
+        end
+      end
+      if(seconds > 0)
+        if(seconds == 1)
+          parts << "1 second"
+        else
+          parts << "#{seconds} seconds"
+        end
+      end
+      #parts << "#{seconds} seconds" if seconds > 0
       parts << "#{milliseconds} milliseconds" if milliseconds > 0 && seconds < 1
+
+      if(parts.length == 0)
+        parts << "0 seconds"
+      end
       parts.join(", ")
     end
   end

data/lib/makit/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Makit
-  VERSION = "0.0.37"
+  VERSION = "0.0.38"
 
   class Version
     # given an array of version strings, return the highest version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makit
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - Lou Parslow