lumitrace 0.4.2 → 0.5.0

data/runv/sync_inline.rb

@@ -3,6 +3,7 @@
 index_path = File.expand_path("index.html", __dir__)
 record_path = File.expand_path("../lib/lumitrace/record_instrument.rb", __dir__)
 html_path = File.expand_path("../lib/lumitrace/generate_resulted_html.rb", __dir__)
+renderer_js_path = File.expand_path("../lib/lumitrace/generate_resulted_html_renderer.js", __dir__)
 version_path = File.expand_path("../lib/lumitrace/version.rb", __dir__)
 
 index = File.read(index_path)
@@ -15,6 +16,17 @@ record_code = File.read(record_path).rstrip
 html_code = File.read(html_path).lines.reject { |line|
   line.match?(/^\s*require_relative\s+["']record_instrument["']\s*$/)
 }.join.rstrip
+renderer_js = File.read(renderer_js_path).rstrip
+renderer_js_literal = renderer_js.gsub(/\\/, "\\\\\\\\").gsub(/'/, "\\\\'")
+
+renderer_method_src = <<~RUBY.rstrip
+  def self.html_renderer_js
+    @html_renderer_js ||= '#{renderer_js_literal}'
+  end
+RUBY
+html_code_after = html_code.sub(/def self\.html_renderer_js\s*\n.*?\n\s*end/m) { renderer_method_src }
+abort "failed to inline renderer JS into GenerateResultedHtml" if html_code_after == html_code
+html_code = html_code_after
 html_code = html_code.gsub("</script>", "\#{'</scr' + 'ipt>'}")
 
 generated = +"    # LUMITRACE_INLINE_BEGIN\n"
@@ -30,7 +42,7 @@ unless index.match?(pattern)
   abort "inline block markers not found in #{index_path}"
 end
 
-index.sub!(pattern, generated)
+index.sub!(pattern) { generated }
 index.gsub!(/lumitrace \d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?\./, "lumitrace #{version}.")
 File.write(index_path, index)
 puts "updated #{index_path}"

data/test/test_lumitrace.rb

@@ -64,6 +64,43 @@ class LumiTraceTest < Minitest::Test
     assert_operator out.scan(/Lumitrace::R\(\d+, \(/).length, :>=, 2
   end
 
+  def test_instrument_command_style_call_with_hash_and_block_compiles
+    skip "RubyVM::InstructionSequence unavailable" unless defined?(RubyVM::InstructionSequence)
+
+    src = <<~RUBY
+      def path(*args)
+        yield if block_given?
+      end
+
+      path = "x"
+      glob = "*.rb"
+
+      path path, "glob" => glob do
+        path
+      end
+    RUBY
+
+    out = Lumitrace::RecordInstrument.instrument_source(src, [], file_label: "sample.rb")
+    RubyVM::InstructionSequence.compile(out, "sample.rb")
+    assert_includes out, "path path"
+  end
+
+  def test_instrument_does_not_wrap_inside_defined
+    skip "RubyVM::InstructionSequence unavailable" unless defined?(RubyVM::InstructionSequence)
+
+    src = <<~RUBY
+      foo = 1
+      bar = 2
+      defined?(foo + bar)
+    RUBY
+
+    out = Lumitrace::RecordInstrument.instrument_source(src, [], file_label: "sample.rb")
+    RubyVM::InstructionSequence.compile(out, "sample.rb")
+
+    assert_includes out, "defined?(foo + bar)"
+    refute_match(/defined\?\([^)]*Lumitrace::R\(/, out)
+  end
+
   def test_render_all_generates_html
     Dir.mktmpdir do |dir|
       path = File.join(dir, "lumitrace_events.json")
@@ -243,6 +280,37 @@ class LumiTraceTest < Minitest::Test
     end
   end
 
+  def test_events_from_ids_includes_unhit_locations
+    with_record_instrument_state do
+      mod = Lumitrace::RecordInstrument
+      mod.instance_variable_set(:@events_by_id, [])
+      mod.instance_variable_set(:@loc_by_id, [])
+      mod.instance_variable_set(:@next_id, 0)
+      Lumitrace.install_collect_mode("history")
+      mod.max_samples_per_expr = 3
+
+      hit_id = mod.register_location(
+        "a.rb",
+        { start_line: 1, start_col: 0, end_line: 1, end_col: 1 },
+        kind: :expr
+      )
+      mod.register_location(
+        "a.rb",
+        { start_line: 2, start_col: 0, end_line: 2, end_col: 1 },
+        kind: :expr
+      )
+
+      Lumitrace::R(hit_id, 1)
+
+      events = mod.events_from_ids.sort_by { |e| e[:start_line] }
+      assert_equal 2, events.length
+      assert_equal 1, events[0][:total]
+      assert_equal 0, events[1][:total]
+      assert_equal [], events[1][:sampled_values]
+      assert_equal({}, events[1][:types])
+    end
+  end
+
   def test_text_comment_value_includes_type
     events = [
       {
@@ -346,6 +414,46 @@ class LumiTraceTest < Minitest::Test
     assert_equal "types: Integer(3) (3rd run)", comment
   end
 
+  def test_comment_value_ignores_unhit_event
+    comment = Lumitrace::GenerateResultedHtml.comment_value_with_total_for_line(
+      [
+        {
+          marker: true,
+          kind: "expr",
+          start_col: 0,
+          end_col: 1,
+          sampled_values: [],
+          types: {},
+          total: 0
+        }
+      ]
+    )
+    assert_nil comment
+  end
+
+  def test_render_text_marks_unhit_line_with_bang
+    text = Lumitrace::GenerateResultedHtml.render_text_from_normalized_events(
+      "foo = bar\n",
+      [
+        {
+          file: "a.rb",
+          start_line: 1,
+          start_col: 6,
+          end_line: 1,
+          end_col: 9,
+          kind: "expr",
+          sampled_values: [],
+          types: {},
+          total: 0
+        }
+      ],
+      filename: "a.rb",
+      with_header: false
+    )
+
+    assert_includes text, "!1| foo = bar"
+  end
+
   def test_normalize_events_keeps_sampled_value_objects
     events = [
       {
@@ -362,6 +470,35 @@ class LumiTraceTest < Minitest::Test
     assert_equal "<obj>", normalized.first[:sampled_values].first["preview"]
   end
 
+  def test_event_to_html_trace_payload_uses_last_value_when_sampled_values_missing
+    payload = Lumitrace::GenerateResultedHtml.event_to_html_trace_payload(
+      {
+        start_line: 1,
+        start_col: 0,
+        end_line: 1,
+        end_col: 3,
+        kind: "expr",
+        last_value: { type: "String", preview: "\"x\"" },
+        types: { "String" => 2 },
+        total: 2
+      }
+    )
+
+    assert_equal [{ type: "String", preview: "\"x\"" }], payload[:sampled_values]
+    assert_equal({ "String" => 2 }, payload[:types])
+    assert_equal 2, payload[:total]
+  end
+
+  def test_build_html_payload_includes_command_text
+    payload = Lumitrace::GenerateResultedHtml.build_html_payload(
+      mode_info: { mode: "last", text: "Mode: last (last value)", max_samples: nil },
+      files: [],
+      command_text: "ruby script.rb arg1"
+    )
+
+    assert_equal "ruby script.rb arg1", payload[:meta][:command]
+  end
+
   def test_env_range_parsing
     with_env("LUMITRACE_RANGE" => "a.rb:1-3,5-6;b.rb", "LUMITRACE_COLLECT_MODE" => "types") do
       env = Lumitrace.resolve_env_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumitrace
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Koichi Sasada
@@ -34,6 +34,7 @@ files:
 - lib/lumitrace/enable_git_diff.rb
 - lib/lumitrace/env.rb
 - lib/lumitrace/generate_resulted_html.rb
+- lib/lumitrace/generate_resulted_html_renderer.js
 - lib/lumitrace/git_diff.rb
 - lib/lumitrace/help_manifest.rb
 - lib/lumitrace/record_instrument.rb