sus 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd31357ac07052a2e6c93a7dc674d2245a567644434eaf8e1983dedd7f594be7
-  data.tar.gz: c33ba038edd7f9c22896a6e3c4b8fe7f8880d4c0e8361c3d44cbd74bba35939f
+  metadata.gz: 2eedf780fb01d2963981a6364e0a7ddd9879fd4e99933124c8989f9ccbc10283
+  data.tar.gz: 6a477c4bf989ab5ff4a509711d85dc87bfd8298336dc0e211cd7a9183f6cea67
 SHA512:
-  metadata.gz: bfcd742a489b8ec128cd79ab6d631b1ba6bc45421563eeec51acb476648bc5bb821dc5fccbf0530032e5075879c8271a1be0981825e444d0893a407ca6ebb6fa
-  data.tar.gz: 6014eff61f90083dbf9210faf64d2c7fec25c67cc8e0afa1721f20d3d730f7d8feea22c36e0db308b5712fea9b5a75433bd01785c0bea5eeb20bdb9a3ac5d7e4
+  metadata.gz: 2d84a319444e5179896f4cc5181dec03b385c66c20157aa6394a3b69c7eb2773e45520e6bef890dab861ea769deb53841949ab3ef762d041e5d74505aaee5205
+  data.tar.gz: c33182e1c13956e7fb3d712bb3759bfb4fefd7fff0b5160cf5eb0ac3190cd2a8a519ab32ff82e762ae7ad4000d73b1120c2f7e8967f6b4ee41d82a2401e6b6db

data/bin/sus

@@ -2,6 +2,10 @@
 
 require_relative '../lib/sus'
 
+if File.exist?("config/test.rb")
+	load("config/test.rb")
+end
+
 def prepare(paths, registry)
 	if paths&.any?
 		paths.each do |path|
@@ -31,4 +35,6 @@ if assertions.failed.any?
 	assertions.failed.each do |failure|
 		failure.output.append(output)
 	end
+	
+	exit(1)
 end

data/bin/sus-parallel

@@ -3,6 +3,10 @@
 require_relative '../lib/sus'
 require_relative '../lib/sus/progress'
 
+if File.exist?("config/test.rb")
+	load("config/test.rb")
+end
+
 require 'etc'
 
 def prepare(paths, registry)
@@ -85,4 +89,6 @@ if assertions.failed.any?
 	assertions.failed.each do |failure|
 		failure.output.append(output)
 	end
+	
+	exit(1)
 end

data/lib/sus/describe.rb

@@ -7,13 +7,10 @@ module Sus
 		
 		attr_accessor :subject
 		
-		def self.extended(base)
-			base.children = Hash.new
-		end
-		
 		def self.build(parent, subject, unique: true, &block)
 			base = Class.new(parent)
-			base.extend(Describe)
+			base.singleton_class.prepend(Describe)
+			base.children = Hash.new
 			base.subject = subject
 			base.description = subject.to_s
 			base.identity = Identity.nested(parent.identity, base.description, unique: unique)

data/lib/sus/filter.rb

@@ -18,7 +18,7 @@ module Sus
 			def insert(identity, context)
 				key = identity.key
 				
-				if @contexts[key]
+				if existing_context = @contexts[key]
 					raise KeyError, "Assigning context to existing key: #{key.inspect}!"
 				else
 					@contexts[key] = context

data/lib/sus/identity.rb

@@ -56,7 +56,8 @@ module Sus
 			unless @key
 				key = Array.new
 				
-				append_unique_key(key)
+				# For a specific leaf node, the last part is not unique, i.e. it must be identified explicitly.
+				append_unique_key(key, @unique == true ? false : @unique)
 				
 				@key = key.join(':')
 			end
@@ -66,18 +67,18 @@ module Sus
 		
 		protected
 		
-		def append_unique_key(key)
+		def append_unique_key(key, unique = @unique)
 			if @parent
 				@parent.append_unique_key(key)
 			else
 				key << @path
 			end
 			
-			if @unique == true
+			if unique == true
 				# No key is needed because this identity is unique.
 			else
-				if @unique
-					key << @unique
+				if unique
+					key << unique
 				elsif @line
 					key << @line
 				end

data/lib/sus/it.rb

@@ -7,7 +7,7 @@ module Sus
 			base = Class.new(parent)
 			base.extend(It)
 			base.description = description
-			base.identity = Identity.nested(parent.identity, base.description, unique: false)
+			base.identity = Identity.nested(parent.identity, base.description)
 			
 			if block_given?
 				base.define_method(:call, &block)

data/lib/sus/it_behaves_like.rb

@@ -7,13 +7,10 @@ module Sus
 		
 		attr_accessor :shared
 		
-		def self.extended(base)
-			base.children = Hash.new
-		end
-		
 		def self.build(parent, shared, unique: false)
 			base = Class.new(parent)
-			base.extend(ItBehavesLike)
+			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)

data/lib/sus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sus
-	VERSION = "0.5.0"
+	VERSION = "0.6.0"
 end

data/lib/sus/with.rb

@@ -8,13 +8,10 @@ module Sus
 		attr_accessor :subject
 		attr_accessor :variables
 		
-		def self.extended(base)
-			base.children = Hash.new
-		end
-		
 		def self.build(parent, subject, variables, unique: true, &block)
 			base = Class.new(parent)
-			base.extend(With)
+			base.singleton_class.prepend(With)
+			base.children = Hash.new
 			base.subject = subject
 			base.description = subject
 			base.identity = Identity.nested(parent.identity, base.description, unique: unique)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2021-12-18 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A fast and scalable test runner.