memory 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d560993f9f0c1142d7330fd7f17893d84c46a9d1a265150d5aa6bbc891175479
-  data.tar.gz: bef207c3e7221996f9ac5a1caf9c025fa8da025ea47b8ac222933cc5c08f1947
+  metadata.gz: 007d5f4bf3d0a25dc887eefc4c7467f44a021e0658a4ac6acfe186da4c72c435
+  data.tar.gz: dcc7e341db91dccf9f3928d3eb7901606e31fc3df9bb7701c1ad3c1253e7d2c6
 SHA512:
-  metadata.gz: 374e9de16464bcdc38453215dc0627d24651bb620f265453d37819e0faf6caef90be86f9ce772f70277a3aba4b4ec990d5587848c8964d17dd385359814081dc
-  data.tar.gz: 4e86fe73db538a6ce6e6b21d8a1bf57f32da62d1c5b7077c6aff8ca1593706ee787c2102bc9a141cce9b4d177415e015f7570e076218ee29b374f32b18a919ad
+  metadata.gz: 0f5831fce8f53208b08a5c2fab8f0d4286077fbe69a9d1fe227888695be775259743f098fb8ef1a2dce9843e478ddcc7f66e37142567f79df9bbfe20f694ffbc
+  data.tar.gz: fac10ba0b56492a1d870217d31c92fb20e35c9cdb65dfb44d5b7bec41d673b0ccb2631f4d913575fa40474c5eaddece64e821c63cbd2f86819fb9f6b5b305a3c

data/bake/memory/profiler.rb

@@ -18,7 +18,7 @@ def check(paths:)
 	cache = Memory::Cache.new
 	wrapper = Memory::Wrapper.new(cache)
 	
-	measure = Console.logger.measure(report, total_size)
+	progress = Console.logger.progress(report, total_size)
 	
 	paths.each do |path|
 		Console.logger.info(report, "Loading #{path}, #{Memory.formatted_bytes File.size(path)}")
@@ -29,7 +29,7 @@ def check(paths:)
 			
 			report.concat(unpacker)
 			
-			measure.increment(io.size)
+			progress.increment(io.size)
 		end
 		
 		Console.logger.info(report, "Loaded allocations, #{report.total_allocated}")

data/lib/memory/aggregate.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2023, by Samuel Williams.
 
 module Memory
 	UNITS = {
@@ -43,7 +43,7 @@ module Memory
 				"(#{Memory.formatted_bytes memory} in #{count} allocations)"
 			end
 			
-			def as_json
+			def as_json(options = nil)
 				{
 					memory: memory,
 					count: count
@@ -89,11 +89,11 @@ module Memory
 			io.puts nil
 		end
 		
-		def as_json
+		def as_json(options = nil)
 			{
 				title: @title,
-				total: @total.as_json,
-				totals: @totals.map{|k, v| [k, v.as_json]}
+				total: @total.as_json(options),
+				totals: @totals.map{|k, v| [k, v.as_json(options)]}
 			}
 		end
 	end
@@ -130,7 +130,7 @@ module Memory
 			end
 		end
 		
-		def as_json
+		def as_json(options = nil)
 			{
 				title: @title,
 				aggregates: @aggregates.map{|k, v| [k, v.as_json]}

data/lib/memory/report.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2023, by Samuel Williams.
 
 require_relative 'aggregate'
 
@@ -58,11 +58,11 @@ module Memory
 			end
 		end
 		
-		def as_json
+		def as_json(options = nil)
 			{
-				total_allocated: @total_allocated.as_json,
-				total_retained: @total_retained.as_json,
-				aggregates: @aggregates.map(&:as_json)
+				total_allocated: @total_allocated.as_json(options),
+				total_retained: @total_retained.as_json(options),
+				aggregates: @aggregates.map{|aggregate| aggregate.as_json(options)}
 			}
 		end
 		

data/lib/memory/sampler.rb

@@ -11,7 +11,7 @@
 # Copyright, 2018, by Jonas Peschla.
 # Copyright, 2018, by Espartaco Palma.
 # Copyright, 2020, by Jean Boussier.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 require 'objspace'
 require 'msgpack'
@@ -67,6 +67,10 @@ module Memory
 			@allocated = Array.new
 		end
 		
+		def inspect
+			"#<#{self.class} #{@allocated.size} allocations>"
+		end
+		
 		attr :filter
 		
 		attr :cache

data/lib/memory/version.rb

@@ -4,8 +4,8 @@
 # Copyright, 2013-2019, by Sam Saffron.
 # Copyright, 2015-2016, by Dave Gynn.
 # Copyright, 2018, by Jonas Peschla.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 module Memory
-	VERSION = "0.4.0"
+	VERSION = "0.4.2"
 end

data/license.md

@@ -24,7 +24,7 @@ Copyright, 2019-2020, by Jean Boussier.
 Copyright, 2019, by Ashwin Maroli.  
 Copyright, 2019, by Olle Jonsson.  
 Copyright, 2019, by Danny Ben Shitrit.  
-Copyright, 2020-2022, by Samuel Williams.  
+Copyright, 2020-2024, by Samuel Williams.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -49,41 +49,40 @@ report.print
 ``` ruby
 memory_sampler = nil
 config.before(:all) do |example_group|
-	name = example_group.class.description.gsub(/[^\w]+/, "-")
+	name = example_group.class.description.gsub(/[^\w]+/, '-')
 	path = "#{name}.mprof"
-	
+
 	skip if File.exist?(path)
-	
+
 	memory_sampler = Memory::Sampler.new
 	memory_sampler.start
 end
 
 config.after(:all) do |example_group|
-	name = example_group.class.description.gsub(/[^\w]+/, "-")
+	name = example_group.class.description.gsub(/[^\w]+/, '-')
 	path = "#{name}.mprof"
-	
+
 	if memory_sampler
 		memory_sampler.stop
-		
+
 		File.open(path, "w", encoding: Encoding::BINARY) do |io|
 			memory_sampler.dump(io)
 		end
-		
+
 		memory_sampler = nil
 	end
 end
 
 config.after(:suite) do
 	memory_sampler = Memory::Sampler.new
-	
-	Dir.glob("*.mprof") do |path|
-		memory_sampler.load(File.read(
-			path,
-			encoding: Encoding::BINARY,
-		))
+
+	Dir.glob('*.mprof') do |path|
+		$stderr.puts "Loading #{path}..."
+		memory_sampler.load(File.read(path, encoding: Encoding::BINARY))
 	end
-	
-	memory_sampler.results.print
+
+	$stderr.puts "Memory usage:"
+	memory_sampler.report.print
 end
 ```
 
@@ -121,3 +120,11 @@ We welcome contributions to this project.
 3.  Commit your changes (`git commit -am 'Add some feature'`).
 4.  Push to the branch (`git push origin my-new-feature`).
 5.  Create new Pull Request.
+
+### Developer Certificate of Origin
+
+This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
+
+### Contributor Covenant
+
+This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: memory
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Sam Saffron
 - Dave Gynn
+- Samuel Williams
 - Nick LaMuro
 - Jonas Peschla
-- Samuel Williams
 - Ashwin Maroli
 - Søren Skovsbøll
 - Richard Schneeman
@@ -61,7 +61,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake
@@ -105,62 +105,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bake-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: covered
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 executables: []
@@ -190,14 +134,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Memory profiling routines for Ruby 2.3+