Show compound units in elapsed time display.

Author: wtn

lib/console/clock.rb

@@ -16,21 +16,28 @@ def self.formatted_duration(duration)
 				return format("%.2fs", duration)
 			end
 
+			seconds = duration % 60
 			duration /= 60.0
 
 			if duration < 60.0
-				return "#{duration.floor}m"
+				return format("%dm%02ds", duration, seconds)
 			end
 
+			minutes = duration % 60
 			duration /= 60.0
 
 			if duration < 24.0
-				return "#{duration.floor}h"
+				return format("%dh%02dm", duration, minutes)
 			end
 
+			hours = duration % 24
 			duration /= 24.0
 
-			return "#{duration.floor}d"
+			if duration < 100.0
+				return format("%dd%02dh", duration, hours)
+			end
+			
+			return format("%dd", duration)
 		end
 
 		# @returns [Time] The current monotonic time.

test/console/clock.rb

@@ -19,27 +19,32 @@
 		end
 
 		it "can format minutes" do
-			expect(subject.formatted_duration(60)).to be == "1m"
-			expect(subject.formatted_duration(61)).to be == "1m"
-			expect(subject.formatted_duration(120)).to be == "2m"
-			expect(subject.formatted_duration(600)).to be == "10m"
-			expect(subject.formatted_duration(3599)).to be == "59m"
+			expect(subject.formatted_duration(60)).to be == "1m00s"
+			expect(subject.formatted_duration(61)).to be == "1m01s"
+			expect(subject.formatted_duration(120)).to be == "2m00s"
+			expect(subject.formatted_duration(600)).to be == "10m00s"
+			expect(subject.formatted_duration(3599)).to be == "59m59s"
 		end
 
 		it "can format hours" do
-			expect(subject.formatted_duration(3600)).to be == "1h"
-			expect(subject.formatted_duration(3601)).to be == "1h"
-			expect(subject.formatted_duration(7200)).to be == "2h"
-			expect(subject.formatted_duration(36000)).to be == "10h"
-			expect(subject.formatted_duration(86399)).to be == "23h"
+			expect(subject.formatted_duration(3600)).to be == "1h00m"
+			expect(subject.formatted_duration(3601)).to be == "1h00m"
+			expect(subject.formatted_duration(7200)).to be == "2h00m"
+			expect(subject.formatted_duration(36000)).to be == "10h00m"
+			expect(subject.formatted_duration(86399)).to be == "23h59m"
 		end
 
 		it "can format days" do
-			expect(subject.formatted_duration(86400)).to be == "1d"
-			expect(subject.formatted_duration(86401)).to be == "1d"
-			expect(subject.formatted_duration(172800)).to be == "2d"
-			expect(subject.formatted_duration(604799)).to be == "6d"
-			expect(subject.formatted_duration(864000)).to be == "10d"
+			expect(subject.formatted_duration(86400)).to be == "1d00h"
+			expect(subject.formatted_duration(86401)).to be == "1d00h"
+			expect(subject.formatted_duration(172800)).to be == "2d00h"
+			expect(subject.formatted_duration(604799)).to be == "6d23h"
+			expect(subject.formatted_duration(864000)).to be == "10d00h"
+		end
+		
+		it "can format many days" do
+			expect(subject.formatted_duration(8640000)).to be == "100d"
+			expect(subject.formatted_duration(86400000)).to be == "1000d"
 		end
 	end