sus 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c4e40f000e1811b16c1718c123e165cafbb2fe8b576954f6c8824ea61097985
-  data.tar.gz: 42a5387eae3f2588b13ed33b3e75a1df5193b6d636a3a730c4454e9b3ad81a16
+  metadata.gz: beb15dd70f3fd10ea7d5485648b632944450255950ecbbd0c02fbd10aa533933
+  data.tar.gz: 4cc4f588633c0dee5211f39dec34224f78f44a47c1720c74c4a3fc90df9c7671
 SHA512:
-  metadata.gz: 4af49c129c2acef1b1884e3bf3f7269f4340f47a264e6eab595eaf967d5f4dda14ce74a24adaf0bfc85bf362846c27c6e469218da5b32917bbd8c4d418477329
-  data.tar.gz: 20da00aa7d81f0e5444af2938f1bc346a1e5dd958b9ebea2826d26d637af64bfbbab5c21002b2e85afbffcc904c59c4a709c67f36562254e20e508860fa53a01
+  metadata.gz: '0292a0378064908cfff1ca760f09f2bb64f1131835ca7fafae02e1120726af7cd0575a240516392b817133dde4c444e18b0962ac5e381c761c5b98c325696ce9'
+  data.tar.gz: 54c3cd3c3116562271bc4c1f68172bc9fa43a3a8881bca00033d94ebd26b9a633b39897631a00a9dc90e0fef1b2c82affde754a74f644a95680080379b16d258

data/bin/sus

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+# require 'stackprof'
+# StackProf.start(mode: :wall, interval: 10)
+
 require_relative '../lib/sus/config'
 config = Sus::Config.load
 
@@ -20,6 +23,11 @@ config.before_tests(assertions)
 registry.call(assertions)
 config.after_tests(assertions)
 
+# StackProf.stop
+# StackProf.results('sus.stackprof')
+#
+# $ stackprof sus.stackprof --text --limit 10
+
 if assertions.failed.any?
 	exit(1)
 end

data/lib/sus/assertions.rb

@@ -24,7 +24,7 @@ module Sus
 			@verbose = verbose
 			
 			if measure
-				@clock = Clock.new
+				@clock = Clock.start!
 			else
 				@clock = nil
 			end
@@ -181,44 +181,23 @@ module Sus
 			
 			assertions = self.class.new(identity: identity, target: target, output: output, isolated: isolated, inverted: inverted, verbose: @verbose, **options)
 			
-			@clock&.start!
-
 			output.indented do
 				begin
 					result = yield(assertions)
 				rescue StandardError => error
 					assertions.fail(error)
-				ensure
-					@clock&.stop!
 				end
 			end
 			
-			self.add(assertions)
+			# Some assertions are deferred until the end of the test, e.g. expecting a method to be called. This scope is managed by the {add} method. If there are no deferred assertions, then we can add the child assertions right away. Otherwise, we append the child assertions to our own list of deferred assertions. When an assertions instance is marked as `isolated`, it will force all deferred assertions to be resolved. It's also at this time, we should conclude measuring the duration of the test.
+			assertions.resolve_into(self)
 			
 			return result
 		end
 		
+		# Add the child assertions which were nested to this instance.
 		def add(assertions)
-			# If the assertions should be an isolated group, make sure any deferred assertions are resolved:
-			if assertions.isolated and assertions.deferred?
-				assertions.resolve!
-			end
-			
-			if assertions.deferred?
-				self.defer do
-					output.puts(:indent, assertions.target)
-					assertions.resolve!
-					
-					self.add!(assertions)
-				end
-			else
-				self.add!(assertions)
-			end
-		end
-		
-		private
-		
-		def add!(assertions)
+			# All child assertions should be resolved by this point:
 			raise "Nested assertions must be fully resolved!" if assertions.deferred?
 			
 			if assertions.isolated or assertions.inverted
@@ -230,6 +209,29 @@ module Sus
 			end
 		end
 		
+		def resolve_into(parent)
+			# If the assertions should be an isolated group, make sure any deferred assertions are resolved:
+			if @isolated and self.deferred?
+				self.resolve!
+			end
+			
+			# Check if the child assertions are deferred, and if so, add them to our own list of deferred assertions:
+			if self.deferred?
+				parent.defer do
+					output.puts(:indent, @target)
+					self.resolve!
+					
+					@clock&.stop!
+					parent.add(self)
+				end
+			else
+				@clock&.stop!
+				parent.add(self)
+			end
+		end
+		
+		private
+		
 		def merge!(assertions)
 			@count += assertions.count
 			

data/lib/sus/be_within.rb

@@ -26,7 +26,9 @@ module Sus
 		end
 		
 		def of(value)
-			Bounded.new(Range.new(value - @tolerance, value + @tolerance))
+			tolerance = @tolerance.abs
+			
+			return Bounded.new(Range.new(value - tolerance, value + tolerance))
 		end
 		
 		def percent_of(value)

data/lib/sus/expect.rb

@@ -44,11 +44,11 @@ module Sus
 	end
 	
 	class Base
-		def expect(subject = nil, **options, &block)
+		def expect(subject = nil, &block)
 			if block_given?
-				Expect.new(@__assertions__, block, **options)
+				Expect.new(@__assertions__, block)
 			else
-				Expect.new(@__assertions__, subject, **options)
+				Expect.new(@__assertions__, subject)
 			end
 		end
 		

data/lib/sus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,8 +37,50 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-27 00:00:00.000000000 Z
-dependencies: []
+date: 2022-09-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bake-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: bake-test-external
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: covered
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.6
 description:
 email:
 executables: