sus 0.37.0 → 0.37.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13490197ec8a1933e204be63306d7073dc91031f91014540d2fb32f28a5a9fe8
-  data.tar.gz: d95be355e8ee973b7c6873024dea1aca229ead1ca07ac32ee758c1c200cffa2c
+  metadata.gz: 356b7bfa38432ef766bae5c9ef40f7e0d08cacf9423544c1226ac86c92e78f16
+  data.tar.gz: 21ea8115de9084304ad615db7d33d7facafa7255e1d3bafd408c9885ce14044e
 SHA512:
-  metadata.gz: e7282096b713bbaf9b6e08839ccc8436c4660c4e2b913c08a9af6867b84ea518f0ba2366db46a67d30e81d20ce845a32dcfb4f13e1712fdc6aabe01e7f67b4af
-  data.tar.gz: be1584808b3db0e3ef6bfc1c9d06c928ad0ca292244dd8a53633cc619107ac74604240d5fb916329654ac68df5033456e1802db28f9af308528341b17bf899c4
+  metadata.gz: a3db361e81379abc117c1f977a979b66f6dcd1c42270fee895db1cb1d1bef0f6c64ed45fe51084de4d0e4671d6a83475cc7dc74523221340dbfeee5921bdbc8f
+  data.tar.gz: fe44089f8600b62d4255ecdaeb3b8e15060735a7ad8e5e9d78a8e5a5dfb05a63ae999b0681ccba55ce18048fa9cd5c94c8cbb221561b72328eee96b273d002f1

data/lib/sus/be.rb

@@ -46,7 +46,7 @@ module Sus
 			# @parameter other [Object] Another predicate to combine.
 			# @returns [Or] A new OR predicate.
 			def |(other)
-				Or.new(self, other)
+				Or.new([self, other])
 			end
 		end
 		
@@ -93,7 +93,7 @@ module Sus
 			# @parameter other [Object] Another predicate to combine.
 			# @returns [And] A new AND predicate.
 			def &(other)
-				And.new(self, other)
+				And.new([self, other])
 			end
 			
 			# Combine this predicate with another using OR logic.

data/lib/sus/config.rb

@@ -196,13 +196,16 @@ module Sus
 		
 		# Print feedback about the test suite.
 		# @parameter output [Output] The output handler.
-		# @parameter assertions [Assertions] The assertions instance.
-		def print_test_feedback(output, assertions)
-			duration = @clock.duration
-			rate = assertions.count / duration
-			
-			total = assertions.total
-			count = assertions.count
+		# @parameter assertions [Assertions | Nil] The assertions instance.
+		# @parameter duration [Float] The total duration of the test suite.
+		# @parameter count [Integer] The number of assertions.
+		# @parameter total [Integer] The number of tests.
+		def print_test_feedback(output, assertions = nil,
+			duration: @clock.duration,
+			count: assertions.count,
+			total: assertions.total
+		)
+			rate = count / duration
 			
 			if total < 10 or count < 10
 				output.puts "😭 You should write more tests and assertions!"
@@ -212,7 +215,7 @@ module Sus
 			end
 			
 			# Check whether there is at least, on average, one assertion (or more) per test:
-			assertions_per_test = assertions.count / assertions.total
+			assertions_per_test = count / total
 			if assertions_per_test < 1.0
 				output.puts "😩 Your tests don't have enough assertions (#{assertions_per_test.round(1)} < 1.0)!"
 			end
@@ -242,6 +245,8 @@ module Sus
 			end
 		end
 		
+		public :print_test_feedback
+		
 		# Print information about slow tests.
 		# @parameter output [Output] The output handler.
 		# @parameter assertions [Assertions] The assertions instance.

data/lib/sus/context.rb

@@ -24,28 +24,6 @@ module Sus
 			base.children = Hash.new
 		end
 		
-		unless respond_to?(:set_temporary_name)
-			# Set a temporary name for this context.
-			# @parameter name [String] The temporary name.
-			def set_temporary_name(name)
-				# No-op.
-			end
-			
-			# @returns [String] A string representation of this context.
-			def to_s
-				(self.description || self.name).to_s
-			end
-			
-			# @returns [String] An inspect representation of this context.
-			def inspect
-				if description = self.description
-					"\#<#{self.name || "Context"} #{self.description}>"
-				else
-					self.name
-				end
-			end
-		end
-		
 		# Add a child context or test to this context.
 		# @parameter child [Object] The child to add.
 		def add(child)

data/lib/sus/fixtures/temporary_directory_context.rb

@@ -4,6 +4,7 @@
 # Copyright, 2025-2026, by Samuel Williams.
 
 require "tmpdir"
+require "fileutils"
 
 module Sus
 	module Fixtures
@@ -12,10 +13,17 @@ module Sus
 			# Set up a temporary directory before the test and clean it up after.
 			# @yields {|&block| ...} The test block to execute.
 			def around(&block)
-				Dir.mktmpdir do |root|
+				root = Dir.mktmpdir
+				
+				begin
 					@root = root
+					
 					super(&block)
+				ensure
 					@root = nil
+					
+					# Use forced removal so cleanup tolerates paths which were already removed by the test or an external process.
+					FileUtils.remove_entry(root, true)
 				end
 			end
 			
@@ -24,4 +32,3 @@ module Sus
 		end
 	end
 end
-

data/lib/sus/identity.rb

@@ -142,7 +142,7 @@ module Sus
 				end
 			else
 				# In theory this should be a bit faster:
-				each_caller_location do |location|
+				Thread.each_caller_location do |location|
 					if location.path == @path
 						return self.with_line(location.lineno)
 					end
@@ -154,16 +154,6 @@ module Sus
 		
 		protected
 		
-		if Thread.respond_to?(:each_caller_location)
-			def each_caller_location(&block)
-				Thread.each_caller_location(&block)
-			end
-		else
-			def each_caller_location(&block)
-				caller_locations(1).each(&block)
-			end
-		end
-		
 		def append_unique_key(key, unique = @unique)
 			if @parent
 				@parent.append_unique_key(key)

data/lib/sus/it.rb

@@ -107,17 +107,19 @@ module Sus
 		
 		# Skip the test unless the Ruby version meets the minimum requirement.
 		# @parameter version [String] The minimum Ruby version required.
-		def skip_unless_minimum_ruby_version(version)
-			unless RUBY_VERSION >= version
-				skip "Ruby #{version} is required, but running #{RUBY_VERSION}!"
+		# @parameter ruby_version [String] The Ruby version to check.
+		def skip_unless_minimum_ruby_version(version, ruby_version = RUBY_VERSION)
+			unless compare_ruby_version(ruby_version, version) >= 0
+				skip "Ruby #{version} is required, but running #{ruby_version}!"
 			end
 		end
 		
 		# Skip the test if the Ruby version exceeds the maximum supported version.
 		# @parameter version [String] The maximum Ruby version supported.
-		def skip_if_maximum_ruby_version(version)
-			if RUBY_VERSION >= version
-				skip "Ruby #{version} is not supported, but running #{RUBY_VERSION}!"
+		# @parameter ruby_version [String] The Ruby version to check.
+		def skip_if_maximum_ruby_version(version, ruby_version = RUBY_VERSION)
+			if compare_ruby_version(ruby_version, version) >= 0
+				skip "Ruby #{version} is not supported, but running #{ruby_version}!"
 			end
 		end
 		
@@ -128,5 +130,23 @@ module Sus
 				skip "Ruby platform #{match} is not supported!"
 			end
 		end
+		
+		private
+		
+		def compare_ruby_version(left, right)
+			left_segments = left.split(".").map(&:to_i)
+			right_segments = right.split(".").map(&:to_i)
+			length = [left_segments.size, right_segments.size].max
+			
+			length.times do |index|
+				left_segment = left_segments[index] || 0
+				right_segment = right_segments[index] || 0
+				
+				return -1 if left_segment < right_segment
+				return 1 if left_segment > right_segment
+			end
+			
+			return 0
+		end
 	end
 end

data/lib/sus/mock.rb

@@ -90,8 +90,8 @@ module Sus
 			
 			@interceptor.define_method(method) do |*arguments, **options, &block|
 				if execution_context == Thread.current
-					original = proc do |*arguments, **options|
-						super(*arguments, **options)
+					original = proc do |*arguments, **options, &block|
+						super(*arguments, **options, &block)
 					end
 					
 					hook.call(original, *arguments, **options, &block) 

data/lib/sus/receive.rb

@@ -239,8 +239,7 @@ module Sus
 			# @parameter subject [Proc, nil] The block to check.
 			def call(assertions, subject)
 				assertions.nested(self) do |assertions|
-					
-					Expect.new(assertions, subject).not.to(Be == nil)
+					Expect.new(assertions, subject).to(@predicate)
 				end
 			end
 		end

data/lib/sus/respond_to.rb

@@ -21,9 +21,9 @@ module Sus
 				parameters = @parameters.dup
 				
 				assertions.nested(self) do |assertions|
-					expected_name = parameters.shift
-					
 					subject.each do |type, name|
+						expected_name = parameters.shift
+						
 						case type
 						when :req
 							assertions.assert(name == expected_name, "parameter #{expected_name} is required, but was #{name}")

data/lib/sus/version.rb

@@ -5,5 +5,5 @@
 
 # @namespace
 module Sus
-	VERSION = "0.37.0"
+	VERSION = "0.37.2"
 end

data/readme.md

@@ -33,6 +33,14 @@ Please see the [project documentation](https://socketry.github.io/sus/) for more
 
 Please see the [project releases](https://socketry.github.io/sus/releases/index) for all releases.
 
+### v0.37.2
+
+  - Make `Sus::Fixtures::TemporaryDirectoryContext` ignore temporary directory cleanup failures.
+
+### v0.37.1
+
+  - Fixed `Sus::Mock#wrap` to forward blocks to the original method, and fixed `receive(...).with_block(...)` to use the supplied predicate.
+
 ### v0.37.0
 
   - Long values in verbose (and failure) output are now truncated to a configurable length (default 100 characters), preventing huge objects from flooding the output. Set the `SUS_OUTPUT_VARIABLE_TRUNCATION_LIMIT` environment variable to change the limit, or `0` to disable truncation.

data/releases.md

@@ -1,5 +1,13 @@
 # Releases
 
+## v0.37.2
+
+  - Make `Sus::Fixtures::TemporaryDirectoryContext` ignore temporary directory cleanup failures.
+
+## v0.37.1
+
+  - Fixed `Sus::Mock#wrap` to forward blocks to the original method, and fixed `receive(...).with_block(...)` to use the supplied predicate.
+
 ## v0.37.0
 
   - Long values in verbose (and failure) output are now truncated to a configurable length (default 100 characters), preventing huge objects from flooding the output. Set the `SUS_OUTPUT_VARIABLE_TRUNCATION_LIMIT` environment variable to change the limit, or `0` to disable truncation.

data.tar.gz.sig

@@ -1,4 +1,2 @@
-#�l~���ͬ�[�WE�P�,9��q���5���-� ��I�sՁ��Hk\n���֍H1fS Ldz���70�=��^�]Ӏ��£���1g2-~.p/U\�O�V��̺հ���>�����3�/�d ��J��P�֮B�ѐ{���p{�E�r��V�j��r(��0	@���@�ڂ!���ֈ��jumО�=VU��R�L�yuf2Q����c�*$5�	������"��<���M&A
�{ev�
-TS%�)iiLN���ɶ��bD�G3���O�:�+B����e�#�"�z��'���,*-;�|L�v6x��w3I��	!Ҝ��^t���k�*���p�c�?l@o�) �_
-
-2�:�R�=C9=��y�$�i[��j��L�b^r���s���<
+F�a���@2R�)Y�R���g쮉Z�^�&,j(t��]��zN���upd��!`���,_��]�ܸ����O�,����n�r��	��Dc�����cg�L�[�Ve��"%(駗���P,\����@�����Po�Z)��&��dM��W���
+7�׃`Ơ����ۨ�cl���lӵZ�H�vV:��He�l���sM"C�imO�������X�������r;��N����<�����"�`�3��˵��y����eԭlH���o�������ۭzq���,�S�,��6��&U�~tH9�>bլ�ə��m��:��p���� N2h�9��x�	�R��YX1�]��J�`��!y�<�;t�T3�>
�׋�!����U

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.37.2
 platform: ruby
 authors:
 - Samuel Williams