subunit 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 807d54d4b08e3eedaacc7d9a9970d5cc8ee5c5e18bf75282a49c8ccf9ebcf7f6
-  data.tar.gz: a5e43fca0a05710ce581a25cceb13da735ad7b9e36102bf162a966ac4fcb9dae
+  metadata.gz: 55e24efd3496c6090f8b887857fbefd3dc2a76f4a61fb4a8c3a6f19490bfa153
+  data.tar.gz: fd0af0f6e4fd910898141aa6c7bc13049cd2cd728ba4a9e19a5ab5a8cf9bf558
 SHA512:
-  metadata.gz: a43cd22965a80bbeda08484b5939c4cea4a96e89940f37b14867f15f4a4370b672593c559d8eb57ba3667da1cf8ca11cbfa110f82cce335cf3c786f0631bb1ca
-  data.tar.gz: 3b66e9c0bab9872d7738a896df2fbf7fd7492cc45ed0ac76b9cf12f633788fcd87a6fcc541d0b011bec5122a5aed6c3ff10b694168076ba9ac1dcb7d3d395cc9
+  metadata.gz: 9c2ff98f077a42af3dffc3788961f99bd98fb6643c5987f472e640094a485c138a8a4065a0832c98f27fd4b578d3e0972f1c5ae44a019014471e5cb2ef8e5bc1
+  data.tar.gz: 9ea37778dd9fe8cf32278572a70d4d188ee9b59a460e5e8139bc2e2ff28a13a8055d71d79a7205738c2504fdf595e76ab29c5825f7b749db392a30dedd8a784b

data/lib/subunit.rb

@@ -63,20 +63,32 @@ class Subunit
   #           .strfunit("%x") #=> 11m 1s
   #
   # %x e.g. 11m 1s
+  # %xi e.g. 11m
   # %X e.g. 11 minutes 1 second
+  # %Xi e.g. 11 minutes
   # %c e.g. 00:11:01
   # %s e.g. 11m # returns the 1st most significant value while 
   #               ignoring the remainder
   #
   def strfunit(s)    
     
-    s.sub!('%x') do |x|
-      to_h.map {|label, val| val.to_s + label[0]}.join(' ')
+    # The i switch postfixed to the x or X switch will format the output 
+    # without seconds unless there are no minutes.
+    
+    s.sub!(/%xi?/) do |x|
+      
+      a = to_h.to_a
+      a2 = (a.length > 1 and x[-1][/i$/]) ? a[0..-2] : a
+      a2.map {|label, val| val.to_s + label[0]}.join(' ')
+      
     end
     
-    s.sub!('%X') do |x|
+    s.sub!(/%Xi?/) do |x|
+
+      a = to_h.to_a
+      a2 = (a.length > 1 and x[-1][/i$/]) ? a[0..-2] : a      
       
-      to_h.map do |label, val| 
+      a2.map do |label, val| 
         
         next if val == 0
         label2 = val > 1 ? label.to_s : label.to_s.sub(/s$/,'')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subunit
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   HowcHg4GymtLLITCF/QtA5tta5SmHAca1POGncsO9QiramFQ9S3Q4O4wcjboVJOp
   SSxk4InmYoY9Cl2GVQ+d9owo
   -----END CERTIFICATE-----
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@jamesrobertson.eu