sus 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dccbd079d0154903705918ed6d572de0f4a4079d2f4d5fd352e8cef0a9694a05
-  data.tar.gz: 400eb2d789f2ff17209f289ad2f0e0d89486cd200e127e80f304fdb2e29c87f3
+  metadata.gz: 8383ea04a6993d4e2c871ea7657c52489ef552ef3b8b07982eed6c9afe30b6eb
+  data.tar.gz: 2e256747d0c6f2372afc6663242888da0ab8895600e956ce962531aa29e514cd
 SHA512:
-  metadata.gz: f7c3cb03088ccd432b27101ab654032c713bbecff85b18e6bdadf7315361a3be306778bbda012ee04e69f325f989ec093809b13d070f20b5ae8818e7deccdb7a
-  data.tar.gz: b8519c677f9d0731bc5c5a7bbb0dd71ee302b9d5a68b115e1ec6feeb4baf6d841e76a0487b71a9ad0f78ae9a35e30370a88d26a937d1cb0c7d0a617ad77e123b
+  metadata.gz: 93e210ec09d3512186fe2e82ed5fae116e72dda4ba64ec3b050387c3b0b233b3841050bded33bdf31b532cee71144205410a50fe54c270bbe101e3c6ddcfda91
+  data.tar.gz: 28d48801189055201108645be27db4eace9b41a3e9dca8749eff807d9d192ae9f5889c98d683115265b1d42859774e05c4b87a80f082e4c95904ba0677752f9c

data/lib/sus/be.rb

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

data/lib/sus/be_within.rb

@@ -0,0 +1,53 @@
+
+module Sus
+	class BeWithin
+		class Bounded
+			def initialize(range)
+				@range = range
+			end
+			
+			def print(output)
+				output.write("be within ", :variable, @range)
+			end
+			
+			def call(assertions, subject)
+				assertions.nested(self) do |assertions|
+					assertions.assert(@range.include?(subject), subject)
+				end
+			end
+		end
+		
+		def initialize(tolerance)
+			@tolerance = tolerance
+		end
+		
+		def of(value)
+			Bounded.new(Range.new(value - @tolerance, value + @tolerance))
+		end
+		
+		def percent_of(value)
+			of(value * Rational(@tolerance, 100))
+		end
+		
+		def print(output)
+			output.write("be within ", :variable, @tolerance)
+		end
+		
+		def call(assertions, subject)
+			assertions.nested(self) do |assertions|
+				assertions.assert(subject < @tolerance, self)
+			end
+		end
+	end
+	
+	class Base
+		def be_within(value)
+			case value
+			when Range
+				BeWithin::Bounded.new(value)
+			else
+				BeWithin.new(value)
+			end
+		end
+	end
+end

data/lib/sus/expect.rb

@@ -30,59 +30,11 @@ module Sus
 			
 			return self
 		end
-		
-		def to_throw(...)
-			predicate = ThrowException.new(...)
-			
-			@assertions.nested(self, inverted: @inverted) do |assertions|
-				predicate.call(assertions, @subject)
-			end
-			
-			return self
-		end
 	end
 	
 	class Base
-		def expect(subject)
-			Expect.new(@assertions, subject)
-		end
-	end
-	
-	class ThrowException
-		def initialize(exception_class, message = nil)
-			@exception_class = exception_class
-			@message = message
-		end
-		
-		def call(assertions, value)
-			assertions.nested(self) do |assertions|
-				begin
-					value.call
-					
-					# Didn't throw any exception, so the expectation failed:
-					assertions.assert(false, self)
-				rescue => exception
-					# Did we throw the right kind of exception?
-					if exception.is_a?(@exception_class)
-						# Did it have the right message?
-						if @message
-							assertions.assert(@message === exception.message)
-						else
-							assertions.assert(true, self)
-						end
-					else
-						raise
-					end
-				end
-			end
-		end
-		
-		def print(output)
-			output << "throw exception " << output.style(@exception_class, :variable)
-			
-			if @message
-				output << "with message " << output.style(@message, :variable)
-			end
+		def expect(subject = nil, &block)
+			Expect.new(@assertions, subject || block)
 		end
 	end
 end

data/lib/sus/have_duration.rb

@@ -0,0 +1,41 @@
+
+module Sus
+	class HaveDuration
+		def initialize(predicate)
+			@predicate = predicate
+		end
+		
+		def print(output)
+			output.write("have duration ")
+			@predicate.print(output)
+		end
+		
+		def call(assertions, subject)
+			assertions.nested(self) do |assertions|
+				duration = measure(subject)
+				
+				@predicate.call(assertions, duration)
+			end
+		end
+		
+		private
+		
+		def measure(subject)
+			start_time = now
+			
+			subject.call
+			
+			return now - start_time
+		end
+		
+		def now
+			::Process.clock_gettime(Process::CLOCK_MONOTONIC)
+		end
+	end
+	
+	class Base
+		def have_duration(...)
+			HaveDuration.new(...)
+		end
+	end
+end

data/lib/sus/it.rb

@@ -26,7 +26,6 @@ module Sus
 		end
 		
 		def call(assertions)
-			sleep rand
 			assertions.nested(self, isolated: true) do |assertions|
 				instance = self.new(assertions)
 				

data/lib/sus/progress.rb

@@ -78,8 +78,8 @@ module Sus
 		def increment(amount = 1)
 			@current += amount
 			
-			@bar.update(@current, @total, self.to_s)
-			@lines.redraw(0)
+			@bar&.update(@current, @total, self.to_s)
+			@lines&.redraw(0)
 			
 			return self
 		end
@@ -88,20 +88,20 @@ module Sus
 		def expand(amount = 1)
 			@total += amount
 			
-			@bar.update(@current, @total, self.to_s)
-			@lines.redraw(0)
+			@bar&.update(@current, @total, self.to_s)
+			@lines&.redraw(0)
 			
 			return self
 		end
 		
 		def report(index, context, state)
-			@lines[index+1] = Output::Status.new(state, context)
+			@lines&.[]=(index+1, Output::Status.new(state, context))
 			
 			return self
 		end
 		
 		def clear
-			@lines.clear
+			@lines&.clear
 		end
 		
 		def to_s

data/lib/sus/raise_exception.rb

@@ -0,0 +1,49 @@
+module Sus
+	class RaiseException
+		def initialize(exception_class = nil, message: nil)
+			@exception_class = exception_class
+			@message = message
+		end
+		
+		def call(assertions, subject)
+			assertions.nested(self) do |assertions|
+				begin
+					subject.call
+					
+					# Didn't throw any exception, so the expectation failed:
+					assertions.assert(false, self)
+				rescue => exception
+					# Did we throw the right kind of exception?
+					if exception.is_a?(@exception_class)
+						# Did it have the right message?
+						if @message
+							assertions.assert(@message === exception.message)
+						else
+							assertions.assert(true, self)
+						end
+					else
+						raise
+					end
+				end
+			end
+		end
+		
+		def print(output)
+			output.write("raise exception")
+			
+			if @exception_class
+				output.write(" ", :variable, @exception_class, :reset)
+			end
+			
+			if @message
+				output.write(" with message ", :variable, @message, :reset)
+			end
+		end
+	end
+	
+	class Base
+		def raise_exception(...)
+			RaiseException.new(...)
+		end
+	end
+end

data/lib/sus/version.rb

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

data/lib/sus.rb

@@ -6,5 +6,9 @@ require_relative 'sus/assertions'
 
 require_relative 'sus/expect'
 require_relative 'sus/be'
+require_relative 'sus/be_within'
+
+require_relative 'sus/raise_exception'
+require_relative 'sus/have_duration'
 
 require_relative 'sus/filter'

metadata

@@ -1,33 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: samovar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+date: 2021-12-08 00:00:00.000000000 Z
+dependencies: []
 description:
 email:
 executables:
 - sus
+- sus-parallel
 extensions: []
 extra_rdoc_files: []
 files:
@@ -37,14 +24,12 @@ files:
 - lib/sus/assertions.rb
 - lib/sus/base.rb
 - lib/sus/be.rb
-- lib/sus/command/list.rb
-- lib/sus/command/run.rb
-- lib/sus/command/sequential.rb
-- lib/sus/command/top.rb
+- lib/sus/be_within.rb
 - lib/sus/context.rb
 - lib/sus/describe.rb
 - lib/sus/expect.rb
 - lib/sus/filter.rb
+- lib/sus/have_duration.rb
 - lib/sus/identity.rb
 - lib/sus/include_context.rb
 - lib/sus/it.rb
@@ -59,6 +44,7 @@ files:
 - lib/sus/output/text.rb
 - lib/sus/output/xterm.rb
 - lib/sus/progress.rb
+- lib/sus/raise_exception.rb
 - lib/sus/registry.rb
 - lib/sus/shared.rb
 - lib/sus/version.rb
@@ -83,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: A fast and scalable test runner.

data/lib/sus/command/list.rb

@@ -1,36 +0,0 @@
-require 'etc'
-require 'samovar'
-
-module Sus
-	module Command
-		class List < Samovar::Command
-			self.description = "List all available tests."
-			
-			many :paths
-			
-			def prepare(registry)
-				if paths&.any?
-					paths.each do |path|
-						registry.load(path)
-					end
-				else
-					Dir.glob("test/**/*.rb").each do |path|
-						registry.load(path)
-					end
-				end
-			end
-			
-			def call
-				registry = Sus::Registry.new
-				output = Sus::Output.default
-				
-				prepare(registry)
-				
-				registry.each do |child|
-					child.print(output)
-					output.puts
-				end
-			end
-		end
-	end
-end

data/lib/sus/command/run.rb

@@ -1,104 +0,0 @@
-require 'etc'
-require 'samovar'
-
-module Sus
-	module Command
-		class Run < Samovar::Command
-			self.description = "Run one or more tests."
-			
-			options do
-				option '-c/--count <n>', "The number of threads to use for running tests.", type: Integer, default: Etc.nprocessors
-				option '-r/--require <path>', ""
-			end
-			
-			many :paths
-			
-			def prepare(registry)
-				if paths&.any?
-					paths.each do |path|
-						registry.load(path)
-					end
-				else
-					Dir.glob("test/**/*.rb").each do |path|
-						registry.load(path)
-					end
-				end
-			end
-			
-			Result = Struct.new(:job, :assertions)
-			
-			def call
-				registry = Sus::Registry.new
-				jobs = Thread::Queue.new
-				results = Thread::Queue.new
-
-				output = Sus::Output.default
-				guard = Thread::Mutex.new
-				progress = Sus::Progress.new(output)
-				count = @options[:count]
-
-				loader = Thread.new do
-					prepare(registry)
-					
-					registry.each do |child|
-						guard.synchronize{progress.expand}
-						jobs << child
-					end
-					
-					jobs.close
-				end
-
-				aggregation = Thread.new do
-					assertions = Sus::Assertions.new(output: output.buffered)
-					first = true
-					
-					while result = results.pop
-						guard.synchronize{progress.increment}
-						
-						if result.assertions.failed?
-							if first
-								first = false
-							else
-								assertions.output.puts
-							end
-							
-							result.assertions.output.append(assertions.output)
-						end
-						
-						assertions.add(result.assertions)
-						guard.synchronize{progress.report(count, assertions, :busy)}
-					end
-					
-					guard.synchronize{progress.clear}
-					
-					assertions.output.puts unless first
-					assertions.output.append(output)
-					
-					assertions.print(output)
-					output.puts
-				end
-
-				workers = count.times.map do |index|
-					Thread.new do
-						while job = jobs.pop
-							guard.synchronize{progress.report(index, job, :busy)}
-							
-							assertions = Sus::Assertions.new(output: output.buffered)
-							job.call(assertions)
-							results << Result.new(job, assertions)
-							
-							guard.synchronize{progress.report(index, "idle", :free)}
-						end
-					end
-				end
-
-				loader.join
-
-				workers.each(&:join)
-				results.close
-
-				aggregation.join
-			end
-		end
-	end
-end

data/lib/sus/command/sequential.rb

@@ -1,35 +0,0 @@
-require 'etc'
-require 'samovar'
-
-module Sus
-	module Command
-		class Sequential < Samovar::Command
-			self.description = "Run one or more tests."
-			
-			many :paths
-			
-			def prepare(registry)
-				if paths&.any?
-					paths.each do |path|
-						registry.load(path)
-					end
-				else
-					Dir.glob("test/**/*.rb").each do |path|
-						registry.load(path)
-					end
-				end
-			end
-			
-			Result = Struct.new(:job, :assertions)
-			
-			def call
-				registry = Sus::Registry.new
-				output = Sus::Output.default
-
-				prepare(registry)
-
-				registry.call
-			end
-		end
-	end
-end

data/lib/sus/command/top.rb

@@ -1,26 +0,0 @@
-require 'samovar'
-require_relative 'run'
-require_relative 'sequential'
-require_relative 'list'
-
-module Sus
-	module Command
-		class Top < Samovar::Command
-			self.description = "Test your code."
-			
-			nested :command, {
-				'run' => Run,
-				'sequential' => Sequential,
-				'list' => List,
-			}, default: 'run'
-			
-			def call
-				if command = self.command
-					command.call
-				else
-					self.print_usage
-				end
-			end
-		end
-	end
-end