async-rspec 1.12.2 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eb3614b4300ca02cbb6299fbeb1606f70a6d090536cde9b5e66ecb53b52833d
-  data.tar.gz: 46f5a934a79a1cd5d500a1f5377439e248960ba63f2c79d52f72ffc7117d3dec
+  metadata.gz: 97dcfa776e85aa05a958dccc0211b29022faf1fbe054a9c294070efd23785e97
+  data.tar.gz: 267e2a08e809376bba96b59f80face4062d8782bf67406678a10c458cda9320c
 SHA512:
-  metadata.gz: 7b18b90865cc67ab259e53905e87fc1c3038bcdb28fd4ed4db46f0adead7e082d07a9d8dfcc7e8774c828aa4d245331ae438b669293186d771345f2ac24cb682
-  data.tar.gz: 1b74916a02bb261d73978d7b06b9149d8b8d247a45b050ac026a17d3ef7137b168a2ab889def16c071c11ea56e3eaa9f50ff6afb592baab52d055c07565f7229
+  metadata.gz: 5c68ec95f28cef903eeb5c806d76e8c22260a7ba662179c96c96b9eaa8af268c6fc5f8b519d9fbde914ad7933b7495ed4a1e6a1424f479e46b5ff295d5862938
+  data.tar.gz: aa6aee44bb59f53f89a7a90f287728c946cd41508729b8274b92770c5fdafeab75d0fe5b72e90c359767eaa5f9a04ee05e7ea27ab5bd039791c308f7bf74b66a

data/.gitignore

@@ -10,3 +10,4 @@
 
 # rspec failure tracking
 .rspec_status
+.covered.db

data/async-rspec.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 	
 	spec.add_dependency "rspec", "~> 3.0"
+	spec.add_dependency "rspec-memory", "~> 1.0"
+	spec.add_dependency "rspec-files", "~> 1.0"
 	
 	# Since we test the shared contexts, we need some bits of async:
 	spec.add_development_dependency "async", "~> 1.8"

data/lib/async/rspec/leaks.rb

@@ -18,31 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'rspec/files'
+
 module Async
 	module RSpec
-		module Leaks
-			def current_ios(gc: GC.start)
-				all_ios = ObjectSpace.each_object(::IO).to_a.sort_by(&:object_id)
-				
-				# We are not interested in ios that have been closed already:
-				return all_ios.reject{|io| io.closed?}
-			end
-		end
-		
-		::RSpec.shared_context Leaks do
-			include Leaks
-			
-			let(:before_ios) {current_ios}
-			let(:after_ios) {current_ios}
-			
-			# We use around(:each) because it's the highest priority.
-			around(:each) do |example|
-				before_ios
-				
-				example.run.tap do
-					expect(after_ios).to be == before_ios
-				end
-			end
-		end
+		Leaks = ::RSpec::Files::Leaks
 	end
 end

data/lib/async/rspec/memory.rb

@@ -18,12 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'memory/limit_allocations'
+require 'rspec/memory'
 
 module Async
 	module RSpec
-		::RSpec.shared_context Memory do
-			include Memory
-		end
+		Memory = ::RSpec::Memory
 	end
 end

data/lib/async/rspec/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module RSpec
-		VERSION = "1.12.2"
+		VERSION = "1.13.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-rspec
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.13.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-28 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-memory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-files
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -99,8 +127,6 @@ files:
 - lib/async/rspec/buffer.rb
 - lib/async/rspec/leaks.rb
 - lib/async/rspec/memory.rb
-- lib/async/rspec/memory/limit_allocations.rb
-- lib/async/rspec/memory/trace.rb
 - lib/async/rspec/profile.rb
 - lib/async/rspec/reactor.rb
 - lib/async/rspec/ssl.rb

data/lib/async/rspec/memory/limit_allocations.rb

@@ -1,115 +0,0 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2018, by Janko Marohnić.
-# 
-# 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 'trace'
-
-require 'rspec/expectations'
-
-module Async
-	module RSpec
-		module Memory
-			# expect{...}.to allocate < 10.megabytes
-			#
-			class LimitAllocations
-				include ::RSpec::Matchers::Composable
-				
-				def initialize(allocations = {}, count: nil, size: nil)
-					@count = count
-					@size = size
-					
-					@allocations = {}
-					@errors = []
-					
-					allocations.each do |klass, count|
-						self.of(klass, count: count)
-					end
-				end
-				
-				def supports_block_expectations?
-					true
-				end
-				
-				def of(klass, **limits)
-					@allocations[klass] = limits
-					
-					return self
-				end
-				
-				private def check(value, limit)
-					case limit
-					when Range
-						unless limit.include? value
-							yield "expected within #{limit}"
-						end
-					when Integer
-						unless value == limit
-							yield "expected exactly #{limit}"
-						end
-					end
-				end
-				
-				def matches?(given_proc)
-					return true unless trace = Trace.capture(@allocations.keys, &given_proc)
-					
-					if @count or @size
-						# If the spec specifies a total limit, we have a limit which we can enforce which takes all allocations into account:
-						total = trace.total
-						
-						check(total.count, @count) do |expected|
-							@errors << "allocated #{total.count} instances, #{total.size} bytes, #{expected} instances"
-						end if @count
-						
-						check(total.size, @size) do |expected|
-							@errors << "allocated #{total.count} instances, #{total.size} bytes, #{expected} bytes"
-						end if @size
-					else
-						# Otherwise unspecified allocations are considered an error:
-						trace.ignored.each do |klass, allocation|
-							@errors << "allocated #{allocation.count} #{klass} instances, #{allocation.size} bytes, but it was not specified"
-						end
-					end
-					
-					trace.allocated.each do |klass, allocation|
-						next unless acceptable = @allocations[klass]
-						
-						check(allocation.count, acceptable[:count]) do |expected|
-							@errors << "allocated #{allocation.count} #{klass} instances, #{allocation.size} bytes, #{expected} instances"
-						end
-						
-						check(allocation.size, acceptable[:size]) do |expected|
-							@errors << "allocated #{allocation.count} #{klass} instances, #{allocation.size} bytes, #{expected} bytes"
-						end
-					end
-					
-					return @errors.empty?
-				end
-				
-				def failure_message
-					"exceeded allocation limit: #{@errors.join(', ')}"
-				end
-			end
-			
-			def limit_allocations(*args)
-				LimitAllocations.new(*args)
-			end
-		end
-	end
-end

data/lib/async/rspec/memory/trace.rb

@@ -1,140 +0,0 @@
-# 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 'objspace'
-
-module Async
-	module RSpec
-		module Memory
-			Allocation = Struct.new(:count, :size) do
-				SLOT_SIZE = 40
-				
-				def << object
-					self.count += 1
-					
-					# We don't want to force specs to take the slot size into account.
-					self.size += ObjectSpace.memsize_of(object) - SLOT_SIZE
-				end
-				
-				def self.default_hash
-					Hash.new{|h,k| h[k] = Allocation.new(0, 0)}
-				end
-			end
-			
-			class Trace
-				def self.supported?
-					# There are issues on truffleruby-1.0.0rc9
-					return false if RUBY_ENGINE == "truffleruby"
-					
-					ObjectSpace.respond_to?(:trace_object_allocations)
-				end
-				
-				if supported?
-					def self.capture(*args, &block)
-						self.new(*args).tap do |trace|
-							trace.capture(&block)
-						end
-					end
-				else
-					def self.capture(*args, &block)
-						yield
-						
-						return nil
-					end
-				end
-				
-				def initialize(klasses)
-					@klasses = klasses
-					
-					@allocated = Allocation.default_hash
-					@retained = Allocation.default_hash
-					
-					@ignored = Allocation.default_hash
-					
-					@total = Allocation.new(0, 0)
-				end
-				
-				attr :allocated
-				attr :retained
-				
-				attr :ignored
-				
-				attr :total
-				
-				def current_objects(generation)
-					allocations = []
-					
-					ObjectSpace.each_object do |object|
-						if ObjectSpace.allocation_generation(object) == generation
-							allocations << object
-						end
-					end
-					
-					return allocations
-				end
-				
-				def find_base(object)
-					@klasses.find{|klass| object.is_a? klass}
-				end
-				
-				def capture(&block)
-					GC.start
-					
-					begin
-						GC.disable
-						
-						generation = GC.count
-						ObjectSpace.trace_object_allocations(&block)
-						
-						allocated = current_objects(generation)
-					ensure
-						GC.enable
-					end
-					
-					GC.start
-					retained = current_objects(generation)
-					
-					# All allocated objects, including those freed in the last GC:
-					allocated.each do |object|
-						if klass = find_base(object)
-							@allocated[klass] << object
-						else
-							# If the user specified classes, but we can't pin this allocation to a specific class, we issue a warning.
-							if @klasses.any?
-								warn "Ignoring allocation of #{object.class} at #{ObjectSpace.allocation_sourcefile(object)}:#{ObjectSpace.allocation_sourceline(object)}"
-							end
-							
-							@ignored[object.class] << object
-						end
-						
-						@total << object
-					end
-					
-					# Retained objects are still alive after a final GC:
-					retained.each do |object|
-						if klass = find_base(object)
-							@retained[klass] << object
-						end
-					end
-				end
-			end
-		end
-	end
-end