rperf 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db5be965ca0511ea90e7482309f7dca4dc545a1c83a73f7b3fc08fc4029f9d34
-  data.tar.gz: 4ae2c1fe82a6d754a1ef0b4759ce2b1a2a22370788ce0197b1d269ba0a1e98e4
+  metadata.gz: 3240adc0c0b301a502b663cd9b044e02661c64e072e5a6582ac30d273b349d54
+  data.tar.gz: a49b1fab25b96e80f17f942acba4a07aef745a61e565587f791f99c878a0d84e
 SHA512:
-  metadata.gz: d99ff20c55b9d359b0dfced5f13cdfaa5f8d4fe1debb5375f2a2de2c7d2ed8a219d2bd4b89c05dbb6ee7fe257b5cf51fa74ad8a85b017db608d6f30d9a5eadf1
-  data.tar.gz: fefb4b168fc733da575e758933083fd169ee6513ac38624f7d89ba8e66b202b4166bf2cb6d8f6e513fe85fb5fec9e31c48231d036ba19439a4e24e09b077460d
+  metadata.gz: 1e5c770faca5dfe03cb87eb83d3021f12b0bbf23433eac923656910fe7275ebe20c08aec7046ab82975ccf2b7b1574bb062493712bee6e2adb5d772e9f60beb6
+  data.tar.gz: 776f023349f55073383d78c81736a578cb31f8d1973c49a57b3eef596a132edb1a03e89734fad69f53395c91578a431c27e4952fd6c272b3a069b04dc577c0e7

data/lib/rperf/meta.rb

@@ -6,7 +6,11 @@
 # first two top-level keys, so Meta.read can decompress only the head of the
 # file and stop as soon as both are extracted.
 
-require "json"
+# NOTE: json is NOT required here. rperf loads via `ruby -rrperf` at interpreter
+# boot, before the profiled app runs `bundler/setup`. Requiring json eagerly
+# would activate the default json gem and then clash with a bundle that pins a
+# different json (Gem::LoadError). json is used only at profile write/read time
+# (after the app has set up its bundle), so each user requires it lazily.
 require "time"
 require "zlib"
 
@@ -103,6 +107,7 @@ module Rperf
         v = ENV["RPERF_META_GIT"].to_s
         return nil if v.empty? || v == "null"
         begin
+          require "json"
           JSON.parse(v, symbolize_names: true)
         rescue JSON::ParserError
           nil
@@ -119,6 +124,7 @@ module Rperf
       v = ENV["RPERF_META_LABELS"]
       return nil unless v
       begin
+        require "json"
         labels = JSON.parse(v)
         labels.is_a?(Hash) ? labels : nil
       rescue JSON::ParserError
@@ -224,6 +230,7 @@ module Rperf
     # Returns { meta:, summary: }, nil (old format / malformed),
     # or :incomplete (need more input).
     def scan_prefix(buf)
+      require "json" # lazy: see the note at the top of this file
       n = buf.bytesize
       i = skip_ws(buf, 0, n)
       return :incomplete if i >= n

data/lib/rperf/table.rb

@@ -5,8 +5,11 @@
 # TSV: header row, data rows, then a trailing "# summary" line of
 # tab-separated key=value pairs.
 # JSON: an array of row objects; the last element is { "summary": { ... } }.
-
-require "json"
+#
+# json is required lazily in the format methods, not here: rperf loads at
+# interpreter boot via `-rrperf`, before the profiled app's bundler/setup, and
+# eagerly activating the default json gem would clash with a bundle that pins a
+# different json (see the note in meta.rb).
 
 module Rperf
   module Table
@@ -67,6 +70,7 @@ module Rperf
     end
 
     def report_json(data)
+      require "json"
       JSON.generate(report_rows(data) + [{ summary: report_summary(data) }])
     end
 
@@ -117,6 +121,7 @@ module Rperf
     end
 
     def diff_json(base, head)
+      require "json"
       JSON.generate(diff_rows(base, head) + [{ summary: diff_summary(base, head) }])
     end
 

data/lib/rperf/version.rb

@@ -1,3 +1,3 @@
 module Rperf
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rperf
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Koichi Sasada