console 1.36.0 → 1.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749f01df7fec2a4868a2b4958b23ee328ddb2911b0fc2a635bdf298d901cae60
-  data.tar.gz: 32daa46920a77f0fa713685d0176dc24ed034fe39fe99cde3d1d789ecfb1c48b
+  metadata.gz: 00b1eca4193288f97e7b4e1a5dd1cd5e074447bf26f92e994eab48a3daf2728a
+  data.tar.gz: efa0889c58183210e91d37efbfc0ee5952020fd43f0524717a1cce09cc626139
 SHA512:
-  metadata.gz: 51796e3366c0778f6e811428ff9e8aeffb0a34fe99ce0528488fd9931c392596c1a654f34e49781f68afd1377898ef16ce6aeaaa3a35c82c201bf4579f423073
-  data.tar.gz: 82af50570a7e55a26562cda15f7ccf5622bcc956ef6b6a065f4a1e38ecf663911f84ccf6a47de1443bc85f1b1e79effeec1fcbdccc21480c0b18b53872efdc13
+  metadata.gz: 8c1bd30af3388dccfba16b043f54643a6daf23fbe859117897608e93cc6a451d89367d7518ca42710c2c6daa52a9b981215f4cc999b4c7a0fdfc15844861f2c2
+  data.tar.gz: 57e0f70484777fbfa5c8a03d8604ae4f915dad90f5154bd47553c303ab28d700f4671eb9293be4ca11a827243887a91f334a20058998ce636e5ab7fd75030987

data/lib/console/clock.rb

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

data/lib/console/event/spawn.rb

@@ -61,7 +61,7 @@ module Console
 			#
 			# @parameter status [Process::Status] The status of the command.
 			def status=(status)
-				@end_time = Time.now
+				@end_time = self.now
 				@status = status
 			end
 			
@@ -100,6 +100,12 @@ module Console
 				options[:severity] ||= :info
 				super
 			end
+			
+			private
+			
+			def now
+				Clock.now
+			end
 		end
 	end
 end

data/lib/console/logger.rb

@@ -60,7 +60,7 @@ module Console
 		def progress(subject, total, **options)
 			options[:severity] ||= :info
 			
-			Progress.new(subject, total, **options)
+			Progress.new(subject, total, logger: self, **options)
 		end
 	end
 end

data/lib/console/progress.rb

@@ -18,10 +18,12 @@ module Console
 		#
 		# @parameter subject [Object] The subject of the progress indicator.
 		# @parameter total [Integer] The total number of steps.
+		# @parameter logger [Console::Logger] The logger to use for output.
 		# @parameter minimum_output_duration [Numeric] The minimum duration between outputs.
 		# @parameter options [Hash] Additional options to customize the output.
-		def initialize(subject, total = 0, minimum_output_duration: 0.1, **options)
+		def initialize(subject, total = 0, logger: Console, minimum_output_duration: 0.1, **options)
 			@subject = subject
+			@logger = logger
 			@options = options
 			
 			@start_time = Clock.now
@@ -55,6 +57,8 @@ module Console
 		
 		# @returns [Rational] The ratio of steps completed to total steps.
 		def ratio
+			return Rational(0, 1) if @total.zero?
+			
 			Rational(@current.to_f, @total.to_f)
 		end
 		
@@ -99,7 +103,7 @@ module Console
 			@current += amount
 			
 			if output?
-				Console.call(@subject, self.to_s, event: self.to_hash, **@options)
+				@logger.call(@subject, self.to_s, event: self.to_hash, **@options)
 				@last_output_time = Clock.now
 			end
 			
@@ -113,7 +117,7 @@ module Console
 		def resize(total)
 			@total = total
 			
-			Console.call(@subject, self.to_s, event: self.to_hash, **@options)
+			@logger.call(@subject, self.to_s, event: self.to_hash, **@options)
 			@last_output_time = Clock.now
 			
 			return self
@@ -125,7 +129,7 @@ module Console
 		# @parameter **options [Hash] Additional options to log.
 		# @parameter &block [Proc] An optional block used to generate the log message.
 		def mark(*arguments, **options, &block)
-			Console.call(@subject, *arguments, **options, **@options, &block)
+			@logger.call(@subject, *arguments, **options, **@options, &block)
 		end
 		
 		# @returns [String] A human-readable representation of the progress indicator.

data/lib/console/resolver.rb

@@ -103,8 +103,13 @@ module Console
 		#
 		# @parameter trace_point [TracePoint] The trace point that triggered the event.
 		def resolve(trace_point)
-			if block = @names.delete(trace_point.self.to_s)
-				block.call(trace_point.self)
+			resolve_class(trace_point.self)
+		end
+		
+		# @parameter klass [Class] The class that was resolved.
+		def resolve_class(klass)
+			if block = @names.delete(klass.to_s)
+				block.call(klass)
 			end
 			
 			if @names.empty?

data/lib/console/terminal/formatter/progress.rb

@@ -41,12 +41,10 @@ module Console
 				def format(event, stream, verbose: false, width: 80)
 					current = event[:current].to_f
 					total = event[:total].to_f
-					value = current / total
+					value = total.zero? ? 0.0 : current / total
 					
-					# Clamp value to 1.0 to avoid rendering issues:
-					if value > 1.0
-						value = 1.0
-					end
+					# Clamp value to avoid rendering issues:
+					value = value.clamp(0.0, 1.0)
 					
 					stream.puts "#{@terminal[:progress_bar]}#{self.bar(value, width-10)}#{@terminal.reset} #{sprintf('%6.2f', value * 100)}%"
 				end

data/lib/console/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2019-2026, by Samuel Williams.
 
 module Console
-	VERSION = "1.36.0"
+	VERSION = "1.38.0"
 end

data/readme.md

@@ -34,6 +34,14 @@ Please see the [project documentation](https://socketry.github.io/console/) for
 
 Please see the [project releases](https://socketry.github.io/console/releases/index) for all releases.
 
+### v1.38.0
+
+  - Fix `Console::Progress` to emit through the logger that created it and safely handle zero totals.
+
+### v1.37.0
+
+  - Show compound units in elapsed time display.
+
 ### v1.36.0
 
   - Add a `size_limit` to `Console::Format::Safe` (default 16KiB) which rebuilds oversized records field-by-field, keeping as many top-level fields as fit within the limit.
@@ -72,14 +80,6 @@ Please see the [project releases](https://socketry.github.io/console/releases/in
 
   - Serialized output now uses `IO#write` with a single string to reduce the chance of interleaved output.
 
-### v1.29.2
-
-  - Always return `nil` from `Console::Filter` logging methods.
-
-### v1.29.1
-
-  - Fix logging `exception:` keyword argument when the value was not an exception.
-
 ## Contributing
 
 We welcome contributions to this project.

data/releases.md

@@ -1,5 +1,13 @@
 # Releases
 
+## v1.38.0
+
+  - Fix `Console::Progress` to emit through the logger that created it and safely handle zero totals.
+
+## v1.37.0
+
+  - Show compound units in elapsed time display.
+
 ## v1.36.0
 
   - Add a `size_limit` to `Console::Format::Safe` (default 16KiB) which rebuilds oversized records field-by-field, keeping as many top-level fields as fit within the limit.

data.tar.gz.sig

@@ -1,2 +1,3 @@
-:}��CS4��
<\i�&��<ք��P��]�ן��:�C��3�l
����|Q���'���]G
-�[�����
+f��{(Rq��l�m*�%��_���[
�PP%�lu��%�}�B�d{����]�e騥p����K�#�K��P��/U�;aӚ��r����l
+��+�;�&�	�#E"H�rE�H-Sk��s�BF<�P���m��
+�iDҚ1/
C��

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 1.38.0
 platform: ruby
 authors:
 - Samuel Williams