sus 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68595280910704ed5eb41683985ffaff34df40eb30e72408da93667de742fb0c
-  data.tar.gz: fc0ac561eae164316247c381c0a20cb244c61c0af6b68891ea120fad2f7916c4
+  metadata.gz: 83bf82adb70fa074a1f303a612403523b64317dc0bc780432a46c1babe5e853b
+  data.tar.gz: bc6e9c2f98c527fb09ca5b2a0b6cb3c977f42d1cf4a287bd956fa33576b2d443
 SHA512:
-  metadata.gz: 1fa0de727817b73859de636f2414dcd08b6001cdd5d837cc9ca72caa3014bdfe08052a0d5c785c91127ee8632e21e64d1eb43817e00baeee2461e698975ab937
-  data.tar.gz: 2ce965a251d21411e22f8d5feb8ae5573805c18da2e8061ef47768e60600721ebd0d72cb2d8c9a6e1d6be6989dbddb32f12a8fd5a26d65e64c9cb3b47bc7d4ac
+  metadata.gz: 9865aac49407ff145daf5bc98ec83b3d3f63fb4ea06b483ff0713cfb25966443191f40c47990ea3bfd928248f9dcce70ebdbb522ad57ed46029e7b7304d9de59
+  data.tar.gz: fea67b00c8999565b4a6d3e08dad67a3e4132172d6ee40d2b3c93fd37b7135cb410d95fe5ba79a779cbc5d00ec99ec4aae44024bfba1e0de08860f408859e93d

data/bin/sus

@@ -28,6 +28,6 @@ config.after_tests(assertions)
 #
 # $ stackprof sus.stackprof --text --limit 10
 
-if assertions.failed.any?
+unless assertions.passed?
 	exit(1)
 end

data/bin/sus-parallel

@@ -65,6 +65,6 @@ results.close
 assertions = aggregation.value
 config.after_tests(assertions)
 
-if assertions.failed.any?
+unless assertions.passed?
 	exit(1)
 end

data/lib/sus/assertions.rb

@@ -35,6 +35,8 @@ module Sus
 			@passed = Array.new
 			@failed = Array.new
 			@deferred = Array.new
+			@skipped = Array.new
+			@errored = Array.new
 			
 			@count = 0
 		end
@@ -63,15 +65,18 @@ module Sus
 		# Nested assertions have been deferred.
 		attr :deferred
 		
+		attr :skipped
+		attr :errored
+		
 		# The total number of assertions performed:
 		attr :count
 		
 		def inspect
-			"\#<#{self.class} #{@passed.size} passed #{@failed.size} failed #{@deferred.size} deferred>"
+			"\#<#{self.class} #{@passed.size} passed #{@failed.size} failed #{@deferred.size} deferred #{@skipped.size} skipped #{@errored.size} errored>"
 		end
 		
 		def total
-			@passed.size + @failed.size
+			@passed.size + @failed.size + @deferred.size + @skipped.size + @errored.size
 		end
 		
 		def print(output, verbose: @verbose)
@@ -95,6 +100,14 @@ module Sus
 					output.write(:deferred, @deferred.size, " deferred", :reset, " ")
 				end
 				
+				if @skipped.any?
+					output.write(:skipped, @skipped.size, " skipped", :reset, " ")
+				end
+				
+				if @errored.any?
+					output.write(:errored, @errored.size, " errored", :reset, " ")
+				end
+				
 				output.write("out of ", self.total, " total (", @count, " assertions)")
 			end
 		end
@@ -104,16 +117,16 @@ module Sus
 		end
 		
 		def empty?
-			@passed.empty? and @failed.empty?
+			@passed.empty? and @failed.empty? and @deferred.empty? and @skipped.empty? and @errored.empty?
 		end
 		
 		def passed?
 			if @inverted
 				# Inverted assertions:
-				self.failed.any?
+				@failed.any? and @errored.empty?
 			else
 				# Normal assertions:
-				self.failed.empty?
+				@failed.empty? and @errored.empty?
 			end
 		end
 		
@@ -121,6 +134,10 @@ module Sus
 			!self.passed?
 		end
 		
+		def errored?
+			@errored.any?
+		end
+		
 		def assert(condition, message = nil)
 			@count += 1
 			
@@ -140,7 +157,8 @@ module Sus
 		end
 		
 		def skip(reason)
-			@output.puts(:indent, :skip, skip_prefix, reason)
+			@output.puts(:indent, :skipped, skip_prefix, reason)
+			@skipped << self
 		end
 		
 		def inform(message)
@@ -166,15 +184,15 @@ module Sus
 			end
 		end
 		
-		def fail(error)
-			@failed << self
+		def error!(error)
+			@errored << self
 			
 			lines = error.message.split(/\r?\n/)
 			
-			@output.puts(:indent, *fail_prefix, "Unhandled exception ", :value, error.class, ":", :reset, " ", lines.shift)
+			@output.puts(:indent, *error_prefix, error.class, ": ", lines.shift)
 			
 			lines.each do |line|
-				@output.puts(:indent, "| ", line)
+				@output.puts(:indent, line)
 			end
 				
 			@output.write(Output::Backtrace.for(error, @identity))
@@ -205,7 +223,7 @@ module Sus
 				begin
 					result = yield(assertions)
 				rescue StandardError => error
-					assertions.fail(error)
+					assertions.error!(error)
 				end
 			end
 			
@@ -255,7 +273,9 @@ module Sus
 		def merge!(assertions)
 			@count += assertions.count
 			
-			if assertions.passed?
+			if assertions.errored?
+				@errored << assertions
+			elsif assertions.passed?
 				@passed << assertions
 
 				# if @verbose
@@ -277,6 +297,8 @@ module Sus
 			@passed.concat(assertions.passed)
 			@failed.concat(assertions.failed)
 			@deferred.concat(assertions.deferred)
+			@skipped.concat(assertions.skipped)
+			@errored.concat(assertions.errored)
 			
 			# if @verbose
 			# 	@output.write(:indent)
@@ -309,7 +331,11 @@ module Sus
 		end
 		
 		def skip_prefix
-			"⚠ "
+			"⏸ "
+		end
+		
+		def error_prefix
+			[:errored, "⚠ "]
 		end
 	end
 end

data/lib/sus/be.rb

@@ -16,7 +16,9 @@ module Sus
 		end
 		
 		def call(assertions, subject)
-			assertions.assert(subject.public_send(*@arguments), self)
+			assertions.nested(self) do |assertions|
+				assertions.assert(subject.public_send(*@arguments))
+			end
 		end
 		
 		class << self

data/lib/sus/config.rb

@@ -116,13 +116,13 @@ module Sus
 			
 			assertions.print(output)
 			output.puts
-
+			
 			print_finished_statistics(assertions)
-
+			
 			if !partial? and assertions.passed?
 				print_test_feedback(assertions)
 			end
-						
+			
 			print_slow_tests(assertions)
 			print_failed_assertions(assertions)
 		end
@@ -193,14 +193,22 @@ module Sus
 			end
 		end
 		
-		def print_failed_assertions(assertions)
-			if assertions.failed.any?
+		def print_assertions(title, assertions)
+			if assertions.any?
 				output.puts
+				output.puts title
 				
-				assertions.failed.each do |failure|
-					output.append(failure.output)
+				assertions.each do |assertion|
+					assertions.each do |failure|
+						output.append(failure.output)
+					end
 				end
 			end
 		end
+		
+		def print_failed_assertions(assertions)
+			print_assertions("🤔 Failed assertions:", assertions.failed)
+			print_assertions("🔥 Errored assertions:", assertions.errored)
+		end
 	end
 end

data/lib/sus/output.rb

@@ -39,8 +39,9 @@ module Sus
 			
 			output[:passed] = output.style(:green)
 			output[:failed] = output.style(:red)
-			output[:error] = output.style(:red)
-			output[:skip] = output.style(:blue)
+			output[:deferred] = output.style(:yellow)
+			output[:skipped] = output.style(:blue)
+			output[:errored] = output.style(:red)
 			# output[:inform] = output.style(nil, nil, :bold)
 			
 			return output

data/lib/sus/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2021-2022, by Samuel Williams.
 
 module Sus
-	VERSION = "0.15.0"
+	VERSION = "0.15.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-10-30 00:00:00.000000000 Z
+date: 2022-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake-test