console 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5928a2a5d4c07c44e8ad937edbab2b8fa326ff13553ffb4bf89c0854184f1bd8
-  data.tar.gz: e0495d1933a3a0991b23193aae3988fb679389f02514d57c9a15ce7ccbf73497
+  metadata.gz: 149a9d0738e731ea3ef3159cd25a449f663070406dfa232538a5996fb93c9ce9
+  data.tar.gz: 212772395d4aef7dc7a510d6630e11dfabeb4c8cf2c70f5d272c279a3d2a32ef
 SHA512:
-  metadata.gz: e69af353f0397d3620654d9108b2cb7fffe4d601e4a4f9feea7cdf09a7cd40aa3f310faded79abfc8de5735c257b59713bb9d5a91d5320a1dca15d0df4a92804
-  data.tar.gz: c46ec0e33e56260345710facc882d89edb4782179ccdb7ec97ed70c3d83087465b4758ceecdaa7f8ac4e2508dc18f46968974bee19a694c62c5314157a8402fe
+  metadata.gz: d02021cfb6dbf99651d5f1b8653394dd59f2c830b0a62b8c394b70b275030cd2c066a786a9cb1281df55029f9a69455c00a73a1763785cba3a5ccf8769766654
+  data.tar.gz: be05f291ccae55c3a6cce6ed2e5e79fa968682d856bcc502693408c69cc85b563017e8505a0459f6cb0d628bbdc57b58efd28146b460e09b45695652e6263145

data/lib/console/logger.rb

@@ -74,14 +74,14 @@ module Console
 			Progress.new(self, subject, total, **options)
 		end
 		
-		def measure(subject, name = "block", **options, &block)
-			measure = Measure.new(self, subject)
+		def measure(subject, name = "block", **tags, &block)
+			measure = Measure.new(self, subject, **tags)
 			
 			if block_given?
-				measure.duration(name, **options, &block)
+				return measure.duration(name, &block)
+			else
+				return measure
 			end
-			
-			return measure
 		end
 		
 		def failure(subject, exception, *arguments, &block)

data/lib/console/measure.rb

@@ -23,24 +23,27 @@ require_relative 'clock'
 
 module Console
 	class Measure
-		def initialize(output, subject)
+		def initialize(output, subject, **tags)
 			@output = output
 			@subject = subject
+			@tags = tags
 		end
 		
+		attr :tags
+		
 		# Measure the execution of a block of code.
-		def duration(name, **tags, &block)
+		def duration(name, &block)
 			@output.info(@subject) {Event::Enter.new(name)}
 			
 			start_time = Clock.now
 			
-			yield
+			result = yield(self)
 			
 			duration = Clock.now - start_time
 			
-			@output.info(@subject) {Event::Exit.new(name, duration, **tags)}
+			@output.info(@subject) {Event::Exit.new(name, duration, **@tags)}
 			
-			return duration
+			return result
 		end
 	end
 end

data/lib/console/progress.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require_relative 'event/progress'
+require_relative 'clock'
 
 module Console
 	class Progress
@@ -93,7 +94,7 @@ module Console
 		
 		def to_s
 			if estimated_remaining_time = self.estimated_remaining_time
-				"#{@current}/#{@total} completed in #{formatted_duration(self.duration)}, #{formatted_duration(estimated_remaining_time)} remaining."
+				"#{@current}/#{@total} completed in #{Clock.formatted_duration(self.duration)}, #{Clock.formatted_duration(estimated_remaining_time)} remaining."
 			else
 				"#{@current}/#{@total} completed, waiting for estimate..."
 			end
@@ -116,27 +117,5 @@ module Console
 				return true
 			end
 		end
-		
-		def formatted_duration(duration)
-			if duration < 60.0
-				return "#{duration.round(2)}s"
-			end
-			
-			duration /= 60.0
-			
-			if duration < 60.0
-				return "#{duration.round}m"
-			end
-			
-			duration /= 60.0
-			
-			if duration < 60.0
-				return "#{duration.round(1)}h"
-			end
-			
-			duration /= 24.0
-			
-			return "#{duration.round(1)}d"
-		end
 	end
 end

data/lib/console/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Console
-	VERSION = "1.11.0"
+	VERSION = "1.11.1"
 end

metadata

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