sus 0.17.1 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 102f27942c58c7a3da4728700344ade9803cb4efb4e9d3b2860c7b442ea73d62
-  data.tar.gz: bbda385d1fbbe48ff8f2f38b990659f8577e5a28726ca0296c976f4ec60289dc
+  metadata.gz: 77921dd1b6bbde6e2a47db7f4a2f0c421c3f517eb04b7d4273538a5891f51ad2
+  data.tar.gz: 204c68cd216e6ddb74e469bbdc01ce042f4d4d0d9fab9b3b897d2ebbcce7fec6
 SHA512:
-  metadata.gz: f67674f93488d7d0f1eb2cfa98d098ac78047b4fc0d1a216c7781b65757a4a0b48c74fa5c7f2e5a18f6f58e07a0564bdeb7ba9b5ef1f4412bd3d51ed7196657e
-  data.tar.gz: bd31d9984aed574ddb68c9a4b3e7527fc6e9c05d26a0ea8dcea892ab25313d431da0b7f3e2e281c63998ed2a170e8de852143d5dd361ac9d1be61e0e0139e911
+  metadata.gz: a9e50aa174880249cd96f519242d59396315475972432b60dd41e6b2c35d5025a7dfb7824fc538a1bee5199c2d93686c0673e4d72de7126f512a1c237041c8ad
+  data.tar.gz: 8580ec8e113b18c6e61f14c3f31804d76663cfa6288e965fb44d4a06238283461b856d593abb83bee4d270d32da865c609fc253a840d6f58d3ac49a8a7d9cc66

data/bin/sus-host

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby
+
+require 'json'
+
+require_relative '../lib/sus/config'
+config = Sus::Config.load
+
+require_relative '../lib/sus'
+
+verbose = false
+guard = Thread::Mutex.new
+
+require 'etc'
+count = Etc.nprocessors
+
+$stdout.sync = true
+
+input = $stdin.dup
+$stdin.reopen(File::NULL)
+output = $stdout.dup
+$stdout.reopen($stderr)
+
+while line = input.gets
+	message = JSON.parse(line)
+	
+	if tests = message['run']
+		jobs = Thread::Queue.new
+		results = Thread::Queue.new
+		
+		top = Sus::Assertions.new(measure: true)
+		config.before_tests(top)
+		
+		aggregate = Thread.new do
+			while result = results.pop
+				top.add(result)
+			end
+		end
+		
+		loader = Thread.new do
+			registry = config.load_registry(tests)
+			
+			registry.each do |child|
+				jobs << child
+			end
+			
+			jobs.close
+		end
+		
+		workers = count.times.map do |index|
+			Thread.new do
+				while job = jobs.pop
+					guard.synchronize do
+						output.puts JSON.generate({started: job.identity})
+					end
+					
+					assertions = Sus::Assertions.new(measure: true)
+					job.call(assertions)
+					
+					results.push(assertions)
+					
+					guard.synchronize do
+						if assertions.passed?
+							output.puts JSON.generate({passed: job.identity, message: assertions.output.string, duration: assertions.clock.ms})
+						else
+							output.puts JSON.generate({failed: job.identity, message: assertions.output.string, duration: assertions.clock.ms})
+						end
+					end
+				end
+			end
+		end
+		
+		loader.join
+		workers.each(&:join)
+		results.close
+		
+		aggregate.join
+		config.after_tests(top)
+		
+		workers.each(&:join)
+		
+		if config.respond_to?(:covered)
+			if covered = config.covered and covered.record?
+				covered.policy.each do |coverage|
+					output.puts JSON.generate({coverage: coverage.path, counts: coverage.counts})
+				end
+			end
+		end
+		
+		output.puts JSON.generate({finished: true, message: top.output.string, duration: top.clock.ms})
+	else
+		$stderr.puts "Unknown message: #{message}"
+	end
+end

data/bin/sus-tree

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'json'
+
+require_relative '../lib/sus/config'
+config = Sus::Config.load
+
+require_relative '../lib/sus'
+
+verbose = false
+registry = config.registry
+puts Sus::Tree.new(registry.base).to_json

data/lib/sus/assertions.rb

@@ -138,20 +138,32 @@ module Sus
 			@errored.any?
 		end
 		
+		class Assert
+			def initialize(location, message)
+				@location = location
+				@message = message
+			end
+			
+			attr :location
+			attr :message
+		end
+		
 		def assert(condition, message = nil)
 			@count += 1
+			backtrace = Output::Backtrace.first(@identity)
 			
 			if condition
-				@passed << self
+				@passed << Assert.new(message, backtrace)
 				
 				if !@orientation || @verbose
-					@output.puts(:indent, *pass_prefix, message || "assertion", Output::Backtrace.first(@identity))
+					@output.puts(:indent, *pass_prefix, message || "assertion", backtrace)
 				end
 			else
-				@failed << self
+				
+				@failed << Assert.new(message, backtrace)
 				
 				if @orientation || @verbose
-					@output.puts(:indent, *fail_prefix, message || "assertion", Output::Backtrace.first(@identity))
+					@output.puts(:indent, *fail_prefix, message || "assertion", backtrace)
 				end
 			end
 		end

data/lib/sus/base.rb

@@ -39,10 +39,11 @@ module Sus
 		end
 	end
 	
-	def self.base(description = nil)
+	def self.base(description = nil, root: nil)
 		base = Class.new(Base)
 		
 		base.extend(Context)
+		base.identity = Identity.new(root) if root
 		base.description = description
 				
 		return base

data/lib/sus/clock.rb

@@ -33,6 +33,10 @@ module Sus
 			duration
 		end
 		
+		def ms
+			duration * 1000.0
+		end
+		
 		def to_s
 			duration = self.duration
 			
@@ -45,6 +49,10 @@ module Sus
 			end
 		end
 		
+		def reset!(duration = 0.0)
+			@duration = duration
+		end
+		
 		def start!
 			@start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 		end

data/lib/sus/config.rb

@@ -82,12 +82,12 @@ module Sus
 			@registry ||= self.load_registry
 		end
 		
-		def load_registry
-			registry = Sus::Registry.new
+		def load_registry(paths = @paths)
+			registry = Sus::Registry.new(root: @root)
 			
-			if @paths&.any?
+			if paths&.any?
 				registry = Sus::Filter.new(registry)
-				@paths.each do |path|
+				paths.each do |path|
 					registry.load(path)
 				end
 			else
@@ -99,42 +99,41 @@ module Sus
 			return registry
 		end
 		
-		def before_tests(assertions)
+		def before_tests(assertions, output: self.output)
+			@clock.reset!
 			@clock.start!
 		end
 		
-		def after_tests(assertions)
+		def after_tests(assertions, output: self.output)
 			@clock.stop!
 			
-			self.print_summary(assertions)
+			self.print_summary(output, assertions)
 		end
 		
 		protected
 		
-		def print_summary(assertions)
-			output = self.output
-			
+		def print_summary(output, assertions)
 			assertions.print(output)
 			output.puts
 			
-			print_finished_statistics(assertions)
+			print_finished_statistics(output, assertions)
 			
 			if !partial? and assertions.passed?
-				print_test_feedback(assertions)
+				print_test_feedback(output, assertions)
 			end
 			
-			print_slow_tests(assertions)
-			print_failed_assertions(assertions)
+			print_slow_tests(output, assertions)
+			print_failed_assertions(output, assertions)
 		end
 		
-		def print_finished_statistics(assertions)
+		def print_finished_statistics(output, assertions)
 			duration = @clock.duration
 			rate = assertions.count / duration
 			
 			output.puts "🏁 Finished in ", @clock, "; #{rate.round(3)} assertions per second."
 		end
 		
-		def print_test_feedback(assertions)
+		def print_test_feedback(output, assertions)
 			duration = @clock.duration
 			rate = assertions.count / duration
 			
@@ -179,7 +178,7 @@ module Sus
 			end
 		end
 		
-		def print_slow_tests(assertions, threshold = 0.1)
+		def print_slow_tests(output, assertions, threshold = 0.1)
 			slowest_tests = assertions.passed.select{|test| test.clock > threshold}.sort_by(&:clock).reverse!
 			
 			if slowest_tests.empty?
@@ -193,7 +192,7 @@ module Sus
 			end
 		end
 		
-		def print_assertions(title, assertions)
+		def print_assertions(output, title, assertions)
 			if assertions.any?
 				output.puts
 				output.puts title
@@ -206,9 +205,9 @@ module Sus
 			end
 		end
 		
-		def print_failed_assertions(assertions)
-			print_assertions("🤔 Failed assertions:", assertions.failed)
-			print_assertions("🔥 Errored assertions:", assertions.errored)
+		def print_failed_assertions(output, assertions)
+			print_assertions(output, "🤔 Failed assertions:", assertions.failed)
+			print_assertions(output, "🔥 Errored assertions:", assertions.errored)
 		end
 	end
 end

data/lib/sus/expect.rb

@@ -10,9 +10,10 @@ module Sus
 			@subject = subject
 			@inverted = inverted
 		end
-
+		
 		attr :subject
 		attr :inverted
+		attr :assertions
 		
 		def not
 			self.dup.tap do |expect|

data/lib/sus/file.rb

@@ -44,10 +44,18 @@ module Sus
 			@error = error
 		end
 		
+		attr :identity
+		
 		def leaf?
 			true
 		end
 		
+		EMPTY = Array.new.freeze
+		
+		def children
+			EMPTY
+		end
+		
 		def print(output)
 			output.write("file ", :path, @identity)
 		end
@@ -64,7 +72,7 @@ module Sus
 	module Context
 		def file(path)
 			add File.build(self, path)
-		rescue StandardError, SyntaxError => error
+		rescue StandardError, LoadError, SyntaxError => error
 			add FileLoadError.build(self, path, error)
 		end
 	end

data/lib/sus/output/buffered.rb

@@ -30,14 +30,12 @@ module Sus
 				self.class.new(self)
 			end
 			
-			attr :output
-			
 			def each(&block)
 				@chunks.each(&block)
 			end
 			
 			def append(buffer)
-				@chunks.concat(buffer.output)
+				@chunks.concat(buffer.chunks)
 				@tee&.append(buffer)
 			end
 			

data/lib/sus/registry.rb

@@ -23,16 +23,21 @@ module Sus
 		DIRECTORY_GLOB = "**/*.rb"
 		
 		# Create a top level scope with self as the instance:
-		def initialize(base = Sus.base(self))
-			@base = base
+		def initialize(**options)
+			@base = Sus.base(self, **options)
+			@loaded = {}
 		end
-		
+
 		attr :base
 		
 		def print(output)
 			output.write("Test Registry")
 		end
 		
+		def to_s
+			@base.identity.to_s
+		end
+		
 		def load(path)
 			if ::File.directory?(path)
 				load_directory(path)
@@ -42,7 +47,7 @@ module Sus
 		end
 		
 		private def load_file(path)
-			@base.file(path)
+			@loaded[path] ||= @base.file(path)
 		end
 		
 		private def load_directory(path)

data/lib/sus/tree.rb

@@ -0,0 +1,27 @@
+module Sus
+	class Tree
+		def initialize(context)
+			@context = context
+		end
+		
+		def traverse(current = @context, &block)
+			node = {}
+			
+			node[:self] = yield(current)
+			
+			if children = current.children # and children.any?
+				node[:children] = children.values.map do |context|
+					self.traverse(context, &block)
+				end
+			end
+			
+			return node
+		end
+		
+		def to_json(options = nil)
+			traverse do |context|
+				[context.identity, context.description, context.leaf?]
+			end.to_json(options)
+		end
+	end
+end

data/lib/sus/version.rb

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

data/lib/sus.rb

@@ -7,6 +7,7 @@ require_relative 'sus/version'
 require_relative 'sus/config'
 require_relative 'sus/registry'
 require_relative 'sus/assertions'
+require_relative 'sus/tree'
 
 require_relative 'sus/expect'
 require_relative 'sus/be'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.18.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-02-18 00:00:00.000000000 Z
+date: 2023-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake-test
@@ -87,11 +87,15 @@ email:
 executables:
 - sus
 - sus-parallel
+- sus-tree
+- sus-host
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/sus
+- bin/sus-host
 - bin/sus-parallel
+- bin/sus-tree
 - lib/sus.rb
 - lib/sus/assertions.rb
 - lib/sus/base.rb
@@ -131,6 +135,7 @@ files:
 - lib/sus/registry.rb
 - lib/sus/respond_to.rb
 - lib/sus/shared.rb
+- lib/sus/tree.rb
 - lib/sus/version.rb
 - lib/sus/with.rb
 - license.md