sus 0.7.0 → 0.8.0

data/lib/sus/output/buffered.rb

@@ -27,34 +27,32 @@ module Sus
 	# Styled output output.
 	module Output
 		class Buffered
-			def initialize(output)
-				@output = output
-				@buffer = Array.new
+			def initialize
+				@output = Array.new
 			end
 			
 			attr :output
-			attr :buffer
 			
-			def append(output)
-				@buffer.each do |operation|
-					output.public_send(*operation)
-				end
+			def each(&block)
+				@output.each(&block)
+			end
+			
+			def append(buffer)
+				@output.concat(buffer.output)
 			end
 			
 			def string
 				io = StringIO.new
-				append(Text.new(io))
+				Text.new(io).append(@output)
 				return io.string
 			end
 			
 			def indent
-				@buffer << [:indent]
-				@output.indent
+				@output << [:indent]
 			end
 			
 			def outdent
-				@buffer << [:outdent]
-				@output.outdent
+				@output << [:outdent]
 			end
 			
 			def indented
@@ -65,13 +63,11 @@ module Sus
 			end
 			
 			def write(*arguments)
-				@output.write(*arguments)
-				@buffer << [:write, *arguments]
+				@output << [:write, *arguments]
 			end
 			
 			def puts(*arguments)
-				@output.puts(*arguments)
-				@buffer << [:puts, *arguments]
+				@output << [:puts, *arguments]
 			end
 		end
 	end

data/lib/sus/output/lines.rb

@@ -76,6 +76,7 @@ module Sus
 				offset = @current_count - index
 				
 				@output.write("\e[#{offset}F\e[K")
+				
 				soft_wrap do
 					line.print(@output)
 				end

data/lib/sus/output/null.rb

@@ -29,6 +29,9 @@ module Sus
 		class Null
 			def initialize
 			end
+			
+			def append(buffer)
+			end
 
 			def indent
 			end

data/lib/sus/output/progress.rb

@@ -0,0 +1,146 @@
+# frozen_string_literal: true
+
+# Copyright, 2017, 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.
+
+require_relative 'bar'
+require_relative 'status'
+require_relative 'lines'
+
+module Sus
+	module Output
+		class Progress
+			def self.now
+				::Process.clock_gettime(Process::CLOCK_MONOTONIC)
+			end
+			
+			def initialize(output, total = 0, minimum_output_duration: 1.0)
+				@output = output
+				@subject = subject
+				
+				@start_time = Progress.now
+				
+				if @output.interactive?
+					@bar = Bar.new
+					@lines = Lines.new(@output)
+					@lines[0] = @bar
+				end
+				
+				@current = 0
+				@total = total
+			end
+			
+			attr :subject
+			attr :current
+			attr :total
+			
+			def duration
+				Progress.now - @start_time
+			end
+			
+			def progress
+				@current.to_f / @total.to_f
+			end
+			
+			def remaining
+				@total - @current
+			end
+			
+			def average_duration
+				if @current > 0
+					duration / @current
+				end
+			end
+			
+			def estimated_remaining_time
+				if average_duration = self.average_duration
+					average_duration * remaining
+				end
+			end
+			
+			# Increase the amont of work done.
+			def increment(amount = 1)
+				@current += amount
+				
+				@bar&.update(@current, @total, self.to_s)
+				@lines&.redraw(0)
+				
+				return self
+			end
+			
+			# Increase the total size of the progress.
+			def expand(amount = 1)
+				@total += amount
+				
+				@bar&.update(@current, @total, self.to_s)
+				@lines&.redraw(0)
+				
+				return self
+			end
+			
+			def report(index, context, state)
+				@lines&.[]=(index+1, Status.new(state, context))
+				
+				return self
+			end
+			
+			def clear
+				@lines&.clear
+			end
+			
+			def to_s
+				if estimated_remaining_time = self.estimated_remaining_time
+					"#{@current}/#{@total} completed in #{formatted_duration(self.duration)}, #{formatted_duration(estimated_remaining_time)} remaining"
+				else
+					"#{@current}/#{@total} completed"
+				end
+			end
+			
+			private
+			
+			def formatted_duration(duration)
+				seconds = duration.floor
+				
+				if seconds < 60.0
+					return "#{seconds}s"
+				end
+				
+				minutes = (duration / 60.0).floor
+				seconds = (seconds - (minutes * 60)).round
+				
+				if minutes < 60.0
+					return "#{minutes}m#{seconds}s"
+				end
+				
+				hours = (minutes / 60.0).floor
+				minutes = (minutes - (hours * 60)).round
+				
+				if hours < 24.0
+					return "#{hours}h#{minutes}m"
+				end
+				
+				days = (hours / 24.0).floor
+				hours = (hours - (days * 24)).round
+				
+				return "#{days}d#{hours}h"
+			end
+		end
+	end
+end

data/lib/sus/output/text.rb

@@ -35,6 +35,12 @@ module Sus
 				@styles[:indent] = @indent
 			end
 			
+			def append(buffer)
+				buffer.each do |operation|
+					self.public_send(*operation)
+				end
+			end
+			
 			attr :io
 			
 			INDENTATION = "\t"

data/lib/sus/output.rb

@@ -4,6 +4,7 @@ require_relative 'output/text'
 require_relative 'output/xterm'
 
 require_relative 'output/null'
+require_relative 'output/progress'
 
 module Sus
 	module Output
@@ -35,7 +36,7 @@ module Sus
 		end
 		
 		def self.buffered
-			Buffered.new(Null.new)
+			Buffered.new
 		end
 	end
 end

data/lib/sus/raise_exception.rb

@@ -12,17 +12,12 @@ module Sus
 					
 					# 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
+				rescue @exception_class => exception
+					# Did it have the right message?
+					if @message
+						assertions.assert(@message === exception.message)
 					else
-						raise
+						assertions.assert(true, self)
 					end
 				end
 			end

data/lib/sus/receive.rb

@@ -0,0 +1,147 @@
+
+require_relative 'respond_to'
+
+module Sus
+	class Receive
+		CALL_ORIGINAL = Object.new
+
+		def initialize(base, method)
+			@base = base
+			@method = method
+			
+			@times = Once.new
+			@arguments = nil
+			@options = nil
+			@block = nil
+			@returning = CALL_ORIGINAL
+		end
+		
+		def print(output)
+			output.write("receive ", :variable, @method.to_s, :reset, " ")
+		end
+		
+		def with_arguments(*arguments)
+			@arguments = WithArguments.new(arguments)
+			return self
+		end
+
+		def with_options(*options)
+			@options = WithOptions.new(options)
+			return self
+		end
+
+		def with_block
+			@block = WithBlock.new
+			return self
+		end
+
+		def and_return(*returning)
+			if returning.size == 1
+				@returning = returning.first
+			else
+				@returning = returning
+			end
+			return self
+		end
+		
+		def validate(mock, assertions, arguments, options, block)
+			@arguments.call(assertions, arguments) if @arguments
+			@options.call(assertions, options) if @options
+			@block.call(assertions, block) if @block
+		end
+		
+		def call(assertions, subject)
+			assertions.nested(self) do |assertions|
+				mock = @base.mock(subject)
+			
+				called = 0
+
+				if call_original?
+					mock.before(@method) do |*arguments, **options, &block|
+						called += 1
+
+						validate(mock, assertions, arguments, options, block)
+					end
+				else
+					mock.replace(@method) do |*arguments, **options, &block|
+						called += 1
+
+						validate(mock, assertions, arguments, options, block)
+
+						next @returning
+					end
+				end
+
+				assertions.defer do
+					@times.call(assertions, called)
+				end
+			end
+		end
+		
+		def call_original?
+			@returning == CALL_ORIGINAL
+		end
+		
+		class WithArguments
+			def initialize(arguments)
+				@arguments = arguments
+			end
+			
+			def print(output)
+				output.write("with arguments ", :variable, @arguments.inspect)
+			end
+			
+			def call(assertions, subject)
+				assertions.nested(self) do |assertions|
+					Expect.new(assertions, subject).to(Be == @arguments)
+				end
+			end
+		end
+
+		class WithOptions
+			def initialize(options)
+				@options = options
+			end
+			
+			def print(output)
+				output.write("with options ", :variable, @options.inspect)
+			end
+			
+			def call(assertions, subject)
+				assertions.nested(self) do |assertions|
+					Expect.new(assertions, subject).to(Be.new(:include?, @options))
+				end
+			end
+		end
+		
+		class WithBlock
+			def print(output)
+				output.write("with block")
+			end
+
+			def call(assertions, subject)
+				assertions.nested(self) do |assertions|
+					Expect.new(assertions, subject).not.to(Be == nil)
+				end
+			end
+		end
+
+		class Once
+			def print(output)
+				output.write("once")
+			end
+
+			def call(assertions, subject)
+				assertions.nested(self) do |assertions|
+					Expect.new(assertions, subject).to(Be == 1)
+				end
+			end
+		end
+	end
+	
+	class Base
+		def receive(method)
+			Receive.new(self, method)
+		end
+	end
+end

data/lib/sus/respond_to.rb

@@ -0,0 +1,86 @@
+module Sus
+	class RespondTo
+		class WithParameters
+			# @parameter [Array(Symbol)] List of method parameters in the expected order, must include at least all required parameters but can also list optional parameters.
+			def initialize(parameters)
+				@parameters = parameters
+			end
+			
+			def call(assertions, subject)
+				parameters = @parameters.dup
+				
+				assertions.nested(self) do |assertions|
+					expected_name = parameters.shift
+					
+					subject.each do |type, name|
+						case type
+						when :req
+							assertions.assert(name == expected_name, "parameter #{expected_name} is required, but was #{name}")
+						when :opt
+							break if expected_name.nil?
+							assertions.assert(name == expected_name, "parameter #{expected_name} is specified, but was #{name}")
+						else
+							break
+						end
+					end
+				end
+			end
+		end
+		
+		class WithOptions
+			def initialize(options)
+				@options = options
+			end
+						
+			def print(output)
+				output.write("with options ", :variable, @options.inspect)
+			end
+			
+			def call(assertions, subject)
+				options = {}
+				@options.each{|name| options[name] = nil}
+				
+				subject.each do |type, name|
+					options[name] = type					
+				end
+				
+				assertions.nested(self) do |assertions|
+					options.each do |name, type|
+						assertions.assert(type != nil, "option #{name}: is required")
+					end
+				end
+			end
+		end
+		
+		def initialize(method)
+			@method = method
+			@parameters = nil
+			@options = nil
+		end
+		
+		def with_options(*options)
+			@options = WithOptions.new(options)
+			return self
+		end
+		
+		def print(output)
+			output.write("respond to ", :variable, @method.to_s)
+		end
+		
+		def call(assertions, subject)
+			assertions.nested(self) do |assertions|
+				assertions.assert(subject.respond_to?(@method), self)
+				
+				parameters = subject.method(@method).parameters
+				@parameters.call(assertions, parameters) if @parameters
+				@options.call(assertions, parameters) if @options
+			end
+		end
+	end
+	
+	class Base
+		def respond_to(method)
+			RespondTo.new(method)
+		end
+	end
+end

data/lib/sus/version.rb

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

data/lib/sus.rb

@@ -9,6 +9,9 @@ require_relative 'sus/expect'
 require_relative 'sus/be'
 require_relative 'sus/be_within'
 
+require_relative 'sus/mock'
+require_relative 'sus/receive'
+
 require_relative 'sus/raise_exception'
 require_relative 'sus/have_duration'
 

metadata

@@ -1,14 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
+  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
+  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
+  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
+  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
+  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
+  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
+  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
+  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
+  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
+  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
+  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
+  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
+  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
+  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
+  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
+  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
+  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
+  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
+  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
+  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
+  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
+  -----END CERTIFICATE-----
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -25,6 +54,7 @@ files:
 - lib/sus/base.rb
 - lib/sus/be.rb
 - lib/sus/be_within.rb
+- lib/sus/clock.rb
 - lib/sus/config.rb
 - lib/sus/context.rb
 - lib/sus/describe.rb
@@ -37,17 +67,20 @@ files:
 - lib/sus/it.rb
 - lib/sus/it_behaves_like.rb
 - lib/sus/let.rb
+- lib/sus/mock.rb
 - lib/sus/output.rb
 - lib/sus/output/bar.rb
 - lib/sus/output/buffered.rb
 - lib/sus/output/lines.rb
 - lib/sus/output/null.rb
+- lib/sus/output/progress.rb
 - lib/sus/output/status.rb
 - lib/sus/output/text.rb
 - lib/sus/output/xterm.rb
-- lib/sus/progress.rb
 - lib/sus/raise_exception.rb
+- lib/sus/receive.rb
 - lib/sus/registry.rb
+- lib/sus/respond_to.rb
 - lib/sus/shared.rb
 - lib/sus/version.rb
 - lib/sus/with.rb

metadata.gz.sig

@@ -0,0 +1,2 @@
+����M�Ȣ��3�'L��z} �6W���ED(�|L�������@����=�%�m鶖�������~�eZi�4+��V�H7�b}�ڤ�/�Tu��/�nd���T���%�IK�������;�=ٗ�2+���ν��7�p��aÕ�^kL����3�/Q"��c��0^YT�P��=nN0���=R'�E�Eⱻ	����	DY�u�a��-�)��ن2�BY��|궖'� ���\5G��`c�۬8�s���`�Fvo�T��
+S��2%�nl��H�CT��`�Nc;�9���n.[�^=�Vm��%�I�P.��rš�p!uG��oۮdDW��k�b]����+e�A�Y�FK[[�n%�y91;�����7�+���:���