sus 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2eedf780fb01d2963981a6364e0a7ddd9879fd4e99933124c8989f9ccbc10283
-  data.tar.gz: 6a477c4bf989ab5ff4a509711d85dc87bfd8298336dc0e211cd7a9183f6cea67
+  metadata.gz: 062dd6b24c634d7d006e3334d37fc630b026e6d119f1a4841c7265184ee9ad4d
+  data.tar.gz: 13f84c1d50a68251389502e41b1e10b637a6fc3fe6b5761aff21a9154b885233
 SHA512:
-  metadata.gz: 2d84a319444e5179896f4cc5181dec03b385c66c20157aa6394a3b69c7eb2773e45520e6bef890dab861ea769deb53841949ab3ef762d041e5d74505aaee5205
-  data.tar.gz: c33182e1c13956e7fb3d712bb3759bfb4fefd7fff0b5160cf5eb0ac3190cd2a8a519ab32ff82e762ae7ad4000d73b1120c2f7e8967f6b4ee41d82a2401e6b6db
+  metadata.gz: c27b28f9e80a52244ca3fba25d48e9f87264bf1033898b0aa20d4cfb59565fe7d847c110159d34f2efc51a6082f30134606d6de2520806c8ff29bccba54250a4
+  data.tar.gz: fa80a6275e3a08853bf0366eb93b6fc3ae733481d14122669840aabc7081544e738e1bb4c86e777ec018851677b6c2b6b1ea5965f592e18232f34c583bf19abc

data/bin/sus

@@ -1,40 +1,18 @@
 #!/usr/bin/env ruby
 
-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|
-			registry.load(path)
-		end
-	else
-		Dir.glob("test/**/*.rb").each do |path|
-			registry.load(path)
-		end
-	end
-end
+require_relative '../lib/sus/config'
+config = Sus::Config.load
 
+require_relative '../lib/sus'
 filter = Sus::Filter.new
-output = Sus::Output.default
 assertions = Sus::Assertions.default(output: Sus::Output::Null.new)
 
-prepare(ARGV, filter)
+config.prepare(filter)
 
+config.before_tests(assertions)
 filter.call(assertions)
-
-assertions.print(output)
-output.puts
+config.after_tests(assertions)
 
 if assertions.failed.any?
-	output.puts
-	
-	assertions.failed.each do |failure|
-		failure.output.append(output)
-	end
-	
 	exit(1)
 end

data/bin/sus-parallel

@@ -1,39 +1,23 @@
 #!/usr/bin/env ruby
 
-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)
-	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
+require_relative '../lib/sus/config'
+config = Sus::Config.load
 
 Result = Struct.new(:job, :assertions)
 
-filter = Sus::Filter.new
-output = Sus::Output.default
-
+require_relative '../lib/sus'
+require_relative '../lib/sus/progress'
 jobs = Thread::Queue.new
 results = Thread::Queue.new
 guard = Thread::Mutex.new
-progress = Sus::Progress.new(output)
+progress = Sus::Progress.new(config.output)
+
+require 'etc'
 count = Etc.nprocessors
 
 loader = Thread.new do
-	prepare(ARGV, filter)
+	filter = Sus::Filter.new
+	config.prepare(filter)
 	
 	filter.each do |child|
 		guard.synchronize{progress.expand}
@@ -43,9 +27,10 @@ loader = Thread.new do
 	jobs.close
 end
 
+top = Sus::Assertions.new(output: Sus::Output::Null.new)
+config.before_tests(top)
+
 aggregation = Thread.new do
-	top = Sus::Assertions.new(output: Sus::Output::Null.new)
-	
 	while result = results.pop
 		guard.synchronize{progress.increment}
 		
@@ -79,16 +64,8 @@ workers.each(&:join)
 results.close
 
 assertions = aggregation.value
-
-assertions.print(output)
-output.puts
+config.after_tests(assertions)
 
 if assertions.failed.any?
-	output.puts
-	
-	assertions.failed.each do |failure|
-		failure.output.append(output)
-	end
-	
 	exit(1)
 end

data/lib/sus/config.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+# Copyright, 2022, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module Sus
+	class Config
+		PATH = "config/sus.rb"
+		
+		def self.path(root)
+			path = ::File.join(root, PATH)
+			
+			if ::File.exist?(path)
+				return path
+			end
+		end
+		
+		def self.load(root: Dir.pwd, argv: ARGV)
+			derived = Class.new(self)
+			
+			if path = self.path(root)
+				config = Module.new
+				config.module_eval(::File.read(path), path)
+				derived.prepend(config)
+			end
+			
+			return derived.new(root, argv)
+		end
+		
+		def initialize(root, paths)
+			@root = root
+			@paths = paths
+		end
+		
+		def output
+			@output ||= Sus::Output.default
+		end
+		
+		DEFAULT_TEST_PATTERN = "test/**/*.rb"
+		
+		def test_paths
+			return Dir.glob(DEFAULT_TEST_PATTERN, base: @root)
+		end
+		
+		def prepare(registry)
+			if @paths&.any?
+				@paths.each do |path|
+					registry.load(path)
+				end
+			else
+				test_paths.each do |path|
+					registry.load(path)
+				end
+			end
+		end
+		
+		def before_tests(assertions)
+		end
+		
+		def after_tests(assertions)
+			output = self.output
+			
+			assertions.print(output)
+			output.puts
+			
+			if assertions.failed.any?
+				output.puts
+				
+				assertions.failed.each do |failure|
+					failure.output.append(output)
+				end
+			end
+		end
+	end
+end

data/lib/sus/expect.rb

@@ -34,7 +34,11 @@ module Sus
 	
 	class Base
 		def expect(subject = nil, &block)
-			Expect.new(@assertions, subject || block)
+			if block_given?
+				Expect.new(@assertions, block)
+			else
+				Expect.new(@assertions, subject)
+			end
 		end
 	end
 end

data/lib/sus/output/text.rb

@@ -35,6 +35,8 @@ module Sus
 				@styles[:indent] = @indent
 			end
 			
+			attr :io
+			
 			INDENTATION = "\t"
 			
 			def indent

data/lib/sus/version.rb

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

data/lib/sus.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'sus/version'
+require_relative 'sus/config'
 require_relative 'sus/registry'
 require_relative 'sus/assertions'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-18 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -25,6 +25,7 @@ files:
 - lib/sus/base.rb
 - lib/sus/be.rb
 - lib/sus/be_within.rb
+- lib/sus/config.rb
 - lib/sus/context.rb
 - lib/sus/describe.rb
 - lib/sus/expect.rb
@@ -63,14 +64,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A fast and scalable test runner.