sus 0.14.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aa2de6186ab05050d85b1125c7244bb6cf25b1250f9973bc067f72a405e9396
-  data.tar.gz: 0bed63c55b1d2571d981efcb44fd5c008eab6f78e47bb7bf2d53e061b356b59a
+  metadata.gz: f36ad4203b1471b0dfa6a95fd4407978f5bfab703c09d14d2ee481d519296b46
+  data.tar.gz: 539e6eb3ef50f12d6159c271a63130e696c3f48f914e1b74e7671a90cf90f726
 SHA512:
-  metadata.gz: fe13105ac13ba02104c02e512273964b0b784cae3663faec805cd6bb4d3ed2efeb4fe0720521817766ea3a438f81ebf5ffc5a8877c864d131c31fbedaed6ec17
-  data.tar.gz: 23abcec32de31cdb6243a43439bc2a41e38842a456feb191808734aa2387c701c75de25af39f15c35474c1c6e222ea78e797b305247a8cd6ed5b646824cf7ea4
+  metadata.gz: dddf727776b219c29970aea30f177903bd52f82497a552dd55ff4821be51b5722aade3e081b3eb0d878ab033385ef375aee222afbf500b07a109b2bc8438f85f
+  data.tar.gz: 9dd5df66341eaac3877777af106cd2262720991a3ec742b7859934790255440334b961bce01a3b28306e45b7c4db33d56f56cc5bdf052143f4109a4854f3ba8e

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
 			
@@ -139,6 +156,11 @@ module Sus
 			end
 		end
 		
+		def skip(reason)
+			@output.puts(:indent, :skipped, skip_prefix, reason)
+			@skipped << self
+		end
+		
 		def inform(message)
 			@output.puts(:indent, :inform, inform_prefix, message)
 		end
@@ -162,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))
@@ -201,7 +223,7 @@ module Sus
 				begin
 					result = yield(assertions)
 				rescue StandardError => error
-					assertions.fail(error)
+					assertions.error!(error)
 				end
 			end
 			
@@ -251,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
@@ -273,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)
@@ -303,5 +329,13 @@ module Sus
 		def inform_prefix
 			"ℹ "
 		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
@@ -72,5 +74,9 @@ module Sus
 		def be_nil
 			Be::NIL
 		end
+		
+		def be_equal(other)
+			Be.new(:equal?, other)
+		end
 	end
 end

data/lib/sus/be_truthy.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022, by Samuel Williams.
+
+module Sus
+	module BeTruthy
+		def self.print(output)
+			output.write("be truthy")
+		end
+		
+		def self.call(assertions, subject)
+			assertions.nested(self) do |assertions|
+				assertions.assert(subject, self)
+			end
+		end
+	end
+	
+	module BeFalsey
+		def self.print(output)
+			output.write("be falsey")
+		end
+		
+		def self.call(assertions, subject)
+			assertions.nested(self) do |assertions|
+				assertions.assert(!subject, self)
+			end
+		end
+	end
+	
+	class Base
+		def be_truthy
+			BeTruthy
+		end
+		
+		def be_falsey
+			BeFalsey
+		end
+	end
+end

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/file.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2022, by Samuel Williams.
+# Copyright, 2021-2023, by Samuel Williams.
+# Copyright, 2022, by Brad Schrag.
 
 require_relative 'context'
 
 # This has to be done at the top level. It allows us to define constants within the given class while still retaining top-level constant resolution.
-Sus::TOPLEVEL_CLASS_EVAL = ->(klass, path){klass.class_eval(::File.read(path), path)}
+Sus::TOPLEVEL_CLASS_EVAL = ->(__klass__, __path__){__klass__.class_eval(::File.read(__path__), __path__)}
 
 module Sus
 	module File
 		extend Context
-				
+		
 		def self.extended(base)
 			base.children = Hash.new
 		end

data/lib/sus/it.rb

@@ -39,10 +39,20 @@ module Sus
 				instance = self.new(assertions)
 				
 				instance.around do
-					instance.call
+					handle_skip(instance, assertions)
 				end
 			end
 		end
+		
+		def handle_skip(instance, assertions)
+			reason = catch(:skip) do
+				return instance.call
+			end
+			
+			assertions.skip(reason)
+			
+			return nil
+		end
 	end
 	
 	module Context
@@ -50,4 +60,10 @@ module Sus
 			add It.build(self, ...)
 		end
 	end
+	
+	class Base
+		def skip(reason)
+			throw :skip, reason
+		end
+	end
 end

data/lib/sus/it_behaves_like.rb

@@ -11,13 +11,19 @@ module Sus
 		
 		attr_accessor :shared
 		
-		def self.build(parent, shared, unique: false)
+		def self.build(parent, shared, arguments = nil, unique: false, &block)
 			base = Class.new(parent)
 			base.singleton_class.prepend(ItBehavesLike)
 			base.children = Hash.new
 			base.description = shared.name
 			base.identity = Identity.nested(parent.identity, base.description, unique: unique)
-			base.class_exec(&shared.block)
+
+			# User provided block is evaluated first, so that it can provide default behaviour for the shared context:
+			if block_given?
+				base.class_exec(*arguments, &block)
+			end
+
+			base.class_exec(*arguments, &shared.block)
 			return base
 		end
 		
@@ -28,8 +34,8 @@ module Sus
 	end
 	
 	module Context
-		def it_behaves_like(shared, **options)
-			add ItBehavesLike.build(self, shared, **options)
+		def it_behaves_like(shared, *arguments, **options, &block)
+			add ItBehavesLike.build(self, shared, arguments, **options, &block)
 		end
 	end
 end

data/lib/sus/output/status.rb

@@ -14,7 +14,6 @@ module Sus
 			def initialize(state = :free, context = nil)
 				@state = state
 				@context = context
-				@index = 0
 			end
 			
 			INDICATORS = {
@@ -36,8 +35,6 @@ module Sus
 			end
 			
 			def print(output)
-				message = @message
-				
 				output.write(
 					@state, self.indicator, " "
 				)

data/lib/sus/output/text.rb

@@ -19,6 +19,8 @@ module Sus
 				@styles[:indent] = @indent
 			end
 			
+			attr :styles
+			
 			def buffered
 				Buffered.new(self)
 			end

data/lib/sus/output.rb

@@ -39,7 +39,9 @@ module Sus
 			
 			output[:passed] = output.style(:green)
 			output[:failed] = output.style(:red)
-			output[:error] = output.style(:red)
+			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/receive.rb

@@ -47,14 +47,17 @@ module Sus
 		
 		def once
 			@times = Times.new(Be.new(:==, 1))
+			return self
 		end
 		
 		def twice
 			@times = Times.new(Be.new(:==, 2))
+			return self
 		end
 		
 		def with_call_count(predicate)
 			@times = Times.new(predicate)
+			return self
 		end
 		
 		def and_return(*returning)

data/lib/sus/registry.rb

@@ -2,6 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2021-2022, by Samuel Williams.
+# Copyright, 2022, by Brad Schrag.
 
 require_relative 'base'
 
@@ -19,6 +20,8 @@ require_relative 'let'
 
 module Sus
 	class Registry
+		DIRECTORY_GLOB = "**/*.rb"
+		
 		# Create a top level scope with self as the instance:
 		def initialize(base = Sus.base(self))
 			@base = base
@@ -31,9 +34,21 @@ module Sus
 		end
 		
 		def load(path)
+			if ::File.directory?(path)
+				load_directory(path)
+			else
+				load_file(path)
+			end
+		end
+		
+		private def load_file(path)
 			@base.file(path)
 		end
 		
+		private def load_directory(path)
+			::Dir.glob(::File.join(path, DIRECTORY_GLOB), &self.method(:load_file))
+		end
+		
 		def call(assertions = Assertions.default)
 			@base.call(assertions)
 			

data/lib/sus/version.rb

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

data/lib/sus/with.rb

@@ -21,6 +21,8 @@ module Sus
 			base.identity = Identity.nested(parent.identity, base.description, unique: unique)
 			base.variables = variables
 			
+			base.define_method(:description, ->{subject})
+			
 			variables.each do |key, value|
 				base.define_method(key, ->{value})
 			end

data/lib/sus.rb

@@ -10,6 +10,7 @@ require_relative 'sus/assertions'
 
 require_relative 'sus/expect'
 require_relative 'sus/be'
+require_relative 'sus/be_truthy'
 require_relative 'sus/be_within'
 
 require_relative 'sus/mock'

data/license.md

@@ -1,6 +1,7 @@
 # MIT License
 
-Copyright, 2021-2022, by Samuel Williams.  
+Copyright, 2021-2023, by Samuel Williams.  
+Copyright, 2022, by Brad Schrag.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -43,27 +43,3 @@ Check `test` directory for examples.
 3.  Commit your changes (`git commit -am 'Add some feature'`).
 4.  Push to the branch (`git push origin my-new-feature`).
 5.  Create new Pull Request.
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2021, by [Samuel G. D. Williams](https://www.codeotaku.com).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Samuel Williams
+- Brad Schrag
 autorequire:
 bindir: bin
 cert_chain:
@@ -37,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake-test
@@ -73,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.6
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.6
+        version: '0.18'
 description:
 email:
 executables:
@@ -95,6 +96,7 @@ files:
 - lib/sus/assertions.rb
 - lib/sus/base.rb
 - lib/sus/be.rb
+- lib/sus/be_truthy.rb
 - lib/sus/be_within.rb
 - lib/sus/clock.rb
 - lib/sus/config.rb
@@ -153,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: A fast and scalable test runner.