lumitrace 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 638e44a364f468bd57003d05c60492dc697f31faba607292dfa5768b8ede47d2
-  data.tar.gz: a930badbf11444cd914765dde643a13347414511e1401aad4bf2da55e3e8159b
+  metadata.gz: 8ffc13efecd8f5143486eff6929c93bf73aaa3934bf24fa57e906a2f90498e2c
+  data.tar.gz: df8ce2960f59409dc832d21f9d1df7a2b33cc431fde00c76633f1149a5da3ab3
 SHA512:
-  metadata.gz: 3997b1814e8861e98e5b8dbd2489eab974f8d1671424a190bc2b82e37c65a6a3253eeb47074c507a1984ef5a3db19cb0aa84520e7f54a757d133f510d260c5c5
-  data.tar.gz: 935834bd5c818a528307f1359815faead6f793ffa5deaf78b039a7fb9dd5b570dd0b07ce1b1bf00edf0c4e51a39edfcb2f4fbddae5c85a6a54e7ff3ae036b699
+  metadata.gz: 2030ec337dc9a941f1c9878b1faa74e15e605a715e1d2049675115573c7c1357d821ded3a200b348521a9593faf6f719ff93766f5ffe1c623d9a9c6dcaa663b1
+  data.tar.gz: 68564fe5bde3b1d00edd5390211c922b72f3565069446affed3dfdf042fc86491949f8170e175df8cdd99c55b1c05f030adab69fe140ce05cfd003f3f3a51719

data/README.md

@@ -20,29 +20,41 @@ Lumitrace hooks `RubyVM::InstructionSequence.translate` (when available) to rewr
 
 ### CLI
 
-Run a script and emit HTML (default output: `lumitrace_recorded.html`):
+Run a script and emit text output (default):
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb
+lumitrace path/to/entry.rb
+```
+
+Run another command via exec:
+
+```bash
+lumitrace exec rake test
+```
+
+Emit HTML output:
+
+```bash
+lumitrace -h path/to/entry.rb
 ```
 
 Limit the number of recorded values per expression (defaults to 3):
 
 ```bash
-LUMITRACE_VALUES_MAX=5 ruby exe/lumitrace path/to/entry.rb
+LUMITRACE_VALUES_MAX=5 lumitrace path/to/entry.rb
 ```
 
 Write JSON output explicitly:
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --json
-ruby exe/lumitrace path/to/entry.rb --json out/lumitrace_recorded.json
+lumitrace -j path/to/entry.rb
+lumitrace --json=out/lumitrace_recorded.json path/to/entry.rb
 ```
 
 Restrict to specific line ranges:
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --range path/to/entry.rb:10-20,30-35
+lumitrace --range path/to/entry.rb:10-20,30-35 path/to/entry.rb
 ```
 
 ### Library
@@ -68,18 +80,27 @@ require "lumitrace/enable"
 
 ## Output
 
-- HTML: `lumitrace_recorded.html` by default, override with `LUMITRACE_HTML_OUT`.
-- JSON: written only when `--json` (CLI) or `LUMITRACE_JSON_OUT` (library) is provided. Default filename is `lumitrace_recorded.json`.
+- Text: printed by default; use `--text=PATH` to write to a file.
+- HTML: `lumitrace_recorded.html` by default, or `--html=PATH`.
+- JSON: written only when `--json` (CLI) or `LUMITRACE_JSON` (library/CLI) is provided. Default filename is `lumitrace_recorded.json`.
+- Fork/exec: merged by default. Child processes write fragments under `LUMITRACE_RESULTS_DIR`.
 
 ## Environment Variables
 
 - `LUMITRACE_VALUES_MAX`: default max values per expression (default 3 if unset).
 - `LUMITRACE_ROOT`: root directory used to decide which files are instrumented.
-- `LUMITRACE_HTML_OUT`: override HTML output path.
-- `LUMITRACE_JSON_OUT`: if set, writes JSON to this path at exit.
+- `LUMITRACE_TEXT`: control text output. `1` forces text on, `0`/`false` disables. Any other value is treated as the text output path.
+- `LUMITRACE_HTML`: enable HTML output; `1` uses the default path, otherwise treats the value as the HTML output path. `0`/`false` disables.
+- `LUMITRACE_JSON`: enable JSON output; `1` uses the default path, otherwise treats the value as the JSON output path. `0`/`false` disables.
+- `LUMITRACE_ENABLE`: when `1`/`true`, `require "lumitrace"` will call `Lumitrace.enable!`. When set to a non-boolean string, it is parsed as CLI-style arguments and passed to `enable!`.
+- `LUMITRACE_VERBOSE`: when `1`/`true`, prints verbose logs to stderr.
+- `LUMITRACE_RANGE`: semicolon-separated range specs (e.g. `a.rb:1-3,5-6;b.rb`).
+- `LUMITRACE_RESULTS_DIR`: internal use. Shared results directory for fork/exec merge (default: `Dir.tmpdir/lumitrace_results/<user>_<parent_pid>`).
+- `LUMITRACE_RESULTS_PARENT_PID`: internal use. Parent PID for fork/exec merge (auto-set).
 - `LUMITRACE_GIT_DIFF=working|staged|base:REV|range:SPEC`: diff source for `enable_git_diff`.
 - `LUMITRACE_GIT_DIFF_CONTEXT=N`: expand diff hunks by +/-N lines (default 3).
 - `LUMITRACE_GIT_CMD`: git executable override (default `git`).
+- `LUMITRACE_GIT_DIFF_UNTRACKED`: include untracked files in git diff ranges (`1` default). Set to `0` to exclude.
 
 ## Notes And Limitations
 
@@ -98,5 +119,5 @@ bundle install
 Run the CLI locally:
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb
+lumitrace path/to/entry.rb
 ```

data/docs/spec.md

@@ -33,7 +33,7 @@ Lumitrace instruments Ruby source code at load time (via `RubyVM::InstructionSeq
 - `require "lumitrace/enable"` (calls `Lumitrace.enable!`)
 - `require "lumitrace/enable_git_diff"` (diff-scoped `Lumitrace.enable!`)
 - `LUMITRACE_ENABLE=1` + `require "lumitrace"` (auto-`enable!`)
-- `LUMITRACE_ENABLE="--text --html --json ..."` + `require "lumitrace"` (CLI-style options parsed and passed to `enable!`)
+- `LUMITRACE_ENABLE="-t -h -j ..."` + `require "lumitrace"` (CLI-style options parsed and passed to `enable!`)
 
 ### `Lumitrace.enable!(max_values: nil, ranges_by_file: nil, root: nil, text: nil, html: nil, json: nil, verbose: nil, at_exit: true)`
 
@@ -60,6 +60,9 @@ Lumitrace instruments Ruby source code at load time (via `RubyVM::InstructionSeq
   - `LUMITRACE_GIT_DIFF_UNTRACKED`: include untracked files in git diff ranges (`1` default). Set to `0` to exclude.
   - `LUMITRACE_VERBOSE`: when `1`/`true`, prints verbose logs to stderr.
   - `LUMITRACE_ENABLE`: when `1`/`true`, `require "lumitrace"` will call `Lumitrace.enable!`. When set to a non-boolean string, it is parsed as CLI-style arguments and passed to `enable!`.
+  - `LUMITRACE_RANGE`: semicolon-separated range specs, e.g. `a.rb:1-3,5-6;b.rb`.
+  - `LUMITRACE_RESULTS_DIR`: internal use. Shared results directory for fork/exec merge (default: `Dir.tmpdir/lumitrace_results/<user>_<parent_pid>`).
+  - `LUMITRACE_RESULTS_PARENT_PID`: internal use. Parent PID for fork/exec merge (auto-set).
 
 ### `Lumitrace.disable!`
 
@@ -85,6 +88,7 @@ Lumitrace instruments Ruby source code at load time (via `RubyVM::InstructionSeq
   - `LUMITRACE_GIT_DIFF=working|staged|base:REV|range:SPEC` selects diff source.
   - `LUMITRACE_GIT_DIFF_CONTEXT=N` expands hunks by +/-N lines (default 3; negative treated as 0).
   - `LUMITRACE_GIT_CMD` overrides the git executable (default: `git`).
+  - `LUMITRACE_RANGE` can be used to pass explicit ranges via env.
 
 ## Instrumentation
 
@@ -142,6 +146,14 @@ Lumitrace instruments Ruby source code at load time (via `RubyVM::InstructionSeq
 - Values are stored via `inspect` for non-primitive types.
 - String values are truncated to 1000 bytes for storage.
 
+## Fork/Exec Merge
+
+- Fork/exec results are merged by default.
+- The parent process writes final text/HTML/JSON.
+- Child processes write JSON fragments under `LUMITRACE_RESULTS_DIR` and do not write final outputs.
+- When `Process._fork` is available, Lumitrace hooks it to reset child events immediately after fork.
+- `exec` inherits `LUMITRACE_RESULTS_DIR` and `LUMITRACE_RESULTS_PARENT_PID` via the environment. `Lumitrace.enable!` also appends `-rlumitrace` to `RUBYOPT` to ensure the exec'd process loads Lumitrace.
+
 ### Output JSON
 
 `lumitrace_recorded.json` contains an array of entries:
@@ -160,25 +172,27 @@ Lumitrace instruments Ruby source code at load time (via `RubyVM::InstructionSeq
 
 ## CLI
 
-### `exe/lumitrace`
+### `lumitrace`
 
 ```
-lumitrace FILE [--text [PATH]] [--html [PATH]] [--json [PATH]] [--max N] [--range SPEC] [--git-diff [MODE]] [--git-diff-context N] [--git-cmd PATH] [--git-diff-no-untracked]
+lumitrace [options] script.rb [ruby_opt]
+lumitrace [options] exec CMD [args...]
 ```
 
 - Text is rendered by default (from in-memory events; no JSON file is required).
-- `--text` writes text output to stdout (default). When a PATH is provided, writes text output to that file.
-- `--html` enables HTML output; optionally specify the output path.
-- JSON is written only when `--json` is provided.
-- `--json` writes JSON output (default: `lumitrace_recorded.json`).
+- `-t` enables text output to stdout. `--text=PATH` writes to a file.
+- `-h` enables HTML output (default path). `--html=PATH` writes to a file.
+- `-j` enables JSON output (default path). `--json=PATH` writes to a file.
+- `-g` enables git diff with `working` mode. `--git-diff=MODE` selects `staged|base:REV|range:SPEC`.
 - `--max` sets max values per expression.
 - `--range` restricts instrumentation per file (`FILE` or `FILE:1-5,10-12`). Can be repeated.
-- `--git-diff` restricts instrumentation to diff hunks (`working` default; `staged|base:REV|range:SPEC`).
+- `--git-diff=MODE` restricts instrumentation to diff hunks (`staged|base:REV|range:SPEC`).
 - `--git-diff-context` expands hunks by +/-N lines.
 - `--git-cmd` overrides the git executable.
 - `--git-diff-no-untracked` excludes untracked files (untracked files are included by default).
 - `--verbose` prints verbose logs to stderr.
 - `LUMITRACE_VALUES_MAX` sets the default max values per expression.
+- The CLI launches a child process (Ruby or `exec` target) with `RUBYOPT=-rlumitrace` and `LUMITRACE_*` env vars.
 
 ### Text Output (CLI)
 

data/docs/tutorial.ja.md

@@ -10,7 +10,7 @@
 同梱の sample を最小のコマンドで実行します（テキストは stdout に出ます）:
 
 ```bash
-ruby exe/lumitrace sample/sample.rb
+lumitrace sample/sample.rb
 ```
 
 プログラム本体の stdout はそのまま出力され、続けて Lumitrace のテキストが表示されます。
@@ -98,7 +98,7 @@ n0=2, n1=5, n2=11
 同梱の sample を実行して、テキストと HTML を保存します:
 
 ```bash
-ruby exe/lumitrace sample/sample.rb \
+lumitrace sample/sample.rb \
   --text sample/lumitrace_results_01.txt \
   --html sample/lumitrace_results_01.html
 ```
@@ -115,7 +115,7 @@ HTML 出力を見る:
 範囲を指定して、別の出力として保存します:
 
 ```bash
-ruby exe/lumitrace sample/sample.rb \
+lumitrace sample/sample.rb \
   --text sample/lumitrace_results_02.txt \
   --html sample/lumitrace_results_02.html \
   --range sample/sample.rb:4-18,28-32
@@ -156,68 +156,87 @@ HTML 出力を見る:
 環境変数で HTML を有効化:
 
 ```bash
-LUMITRACE_HTML=1 ruby exe/lumitrace path/to/entry.rb
-LUMITRACE_HTML=/tmp/out.html ruby exe/lumitrace path/to/entry.rb
+LUMITRACE_HTML=1 lumitrace path/to/entry.rb
+LUMITRACE_HTML=/tmp/out.html lumitrace path/to/entry.rb
 ```
 
 ### 記録する値の数を減らす
 
 ```bash
-LUMITRACE_VALUES_MAX=5 ruby exe/lumitrace path/to/entry.rb
+LUMITRACE_VALUES_MAX=5 lumitrace path/to/entry.rb
 ```
 
 ### 行範囲を限定する
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --range path/to/entry.rb:10-20,30-35
+lumitrace --range path/to/entry.rb:10-20,30-35 path/to/entry.rb
 ```
 
 ### 差分だけ計測（CLI）
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --git-diff
-ruby exe/lumitrace path/to/entry.rb --git-diff staged
-ruby exe/lumitrace path/to/entry.rb --git-diff base:HEAD~1
-ruby exe/lumitrace path/to/entry.rb --git-diff-context 5
-ruby exe/lumitrace path/to/entry.rb --git-cmd /usr/local/bin/git
+lumitrace -g path/to/entry.rb
+lumitrace --git-diff=staged path/to/entry.rb
+lumitrace --git-diff=base:HEAD~1 path/to/entry.rb
+lumitrace --git-diff-context 5 path/to/entry.rb
+lumitrace --git-cmd /usr/local/bin/git path/to/entry.rb
 ```
 
 未追跡ファイルを除外:
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --git-diff --git-diff-no-untracked
+lumitrace -g --git-diff-no-untracked path/to/entry.rb
 ```
 
 ### 詳細ログ
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --verbose
+lumitrace --verbose path/to/entry.rb
 ```
 
 ### JSON も出力する
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --json
+lumitrace -j path/to/entry.rb
 ```
 
-`lumitrace_recorded.json` が HTML と同じ場所に生成されます。
+`lumitrace_recorded.json` が生成されます（HTML は `--html` を指定したときだけ出力されます）。
 
 ### stdout にテキスト出力
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --text
+lumitrace -t path/to/entry.rb
 ```
 
 ### テキストをファイルに出力
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --text /tmp/lumi.txt
+lumitrace --text=/tmp/lumi.txt path/to/entry.rb
 ```
 
 ### テキストと HTML を両方出力
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --text --html
+lumitrace -t -h path/to/entry.rb
+```
+
+### exec で実行
+
+```bash
+lumitrace --html=sample/lumitrace_rake.html exec rake
+```
+
+HTML 出力:
+- [lumitrace_rake.html](https://ko1.github.io/lumitrace/sample/lumitrace_rake.html)
+
+### Fork/exec のマージ
+
+fork/exec の結果はデフォルトでマージされます。親プロセスが最終出力を行い、子プロセスは `LUMITRACE_RESULTS_DIR` に断片 JSON を保存します。
+
+環境変数で range を渡す場合（`;` 区切り）:
+
+```bash
+LUMITRACE_RANGE="a.rb:1-3,5-6;b.rb" ruby your_script.rb
 ```
 
 ## 2. ライブラリとして使う
@@ -280,10 +299,12 @@ require "lumitrace"
 `LUMITRACE_ENABLE` に CLI 互換のオプションを渡すこともできます:
 
 ```ruby
-ENV["LUMITRACE_ENABLE"] = "--text --html /tmp/lumi.html --json"
+ENV["LUMITRACE_ENABLE"] = "-t --html=/tmp/lumi.html -j"
 require "lumitrace"
 ```
 
+exec 先でも読み込まれるように、Lumitrace は `RUBYOPT=-rlumitrace` を設定します。
+
 ### 出力先を変更する
 
 ```bash

data/docs/tutorial.md

@@ -10,7 +10,7 @@ This is a short, practical guide to using Lumitrace.
 Run the bundled sample with the simplest command (text output goes to stdout by default):
 
 ```bash
-ruby exe/lumitrace sample/sample.rb
+lumitrace sample/sample.rb
 ```
 
 The program’s own stdout is still printed, and Lumitrace text output follows it.
@@ -98,7 +98,7 @@ n0=2, n1=5, n2=11
 Run the bundled sample and write both text and HTML outputs:
 
 ```bash
-ruby exe/lumitrace sample/sample.rb \
+lumitrace sample/sample.rb \
   --text sample/lumitrace_results_01.txt \
   --html sample/lumitrace_results_01.html
 ```
@@ -115,7 +115,7 @@ View the HTML output:
 Run with ranges and save separate outputs:
 
 ```bash
-ruby exe/lumitrace sample/sample.rb \
+lumitrace sample/sample.rb \
   --text sample/lumitrace_results_02.txt \
   --html sample/lumitrace_results_02.html \
   --range sample/sample.rb:4-18,28-32
@@ -156,68 +156,87 @@ View the HTML output:
 Enable HTML output via env:
 
 ```bash
-LUMITRACE_HTML=1 ruby exe/lumitrace path/to/entry.rb
-LUMITRACE_HTML=/tmp/out.html ruby exe/lumitrace path/to/entry.rb
+LUMITRACE_HTML=1 lumitrace path/to/entry.rb
+LUMITRACE_HTML=/tmp/out.html lumitrace path/to/entry.rb
 ```
 
 ### Limit recorded values
 
 ```bash
-LUMITRACE_VALUES_MAX=5 ruby exe/lumitrace path/to/entry.rb
+LUMITRACE_VALUES_MAX=5 lumitrace path/to/entry.rb
 ```
 
 ### Limit to specific lines
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --range path/to/entry.rb:10-20,30-35
+lumitrace --range path/to/entry.rb:10-20,30-35 path/to/entry.rb
 ```
 
 ### Diff-based ranges
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --git-diff
-ruby exe/lumitrace path/to/entry.rb --git-diff staged
-ruby exe/lumitrace path/to/entry.rb --git-diff base:HEAD~1
-ruby exe/lumitrace path/to/entry.rb --git-diff-context 5
-ruby exe/lumitrace path/to/entry.rb --git-cmd /usr/local/bin/git
+lumitrace -g path/to/entry.rb
+lumitrace --git-diff=staged path/to/entry.rb
+lumitrace --git-diff=base:HEAD~1 path/to/entry.rb
+lumitrace --git-diff-context 5 path/to/entry.rb
+lumitrace --git-cmd /usr/local/bin/git path/to/entry.rb
 ```
 
 Exclude untracked files:
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --git-diff --git-diff-no-untracked
+lumitrace -g --git-diff-no-untracked path/to/entry.rb
 ```
 
 ### Verbose logs
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --verbose
+lumitrace --verbose path/to/entry.rb
 ```
 
 ### Write JSON too
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --json
+lumitrace -j path/to/entry.rb
 ```
 
-This creates `lumitrace_recorded.json` alongside the HTML.
+This creates `lumitrace_recorded.json`. HTML is written only when `--html` is also specified.
 
 ### Text output to stdout
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --text
+lumitrace -t path/to/entry.rb
 ```
 
 ### Text output to a file
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --text /tmp/lumi.txt
+lumitrace --text=/tmp/lumi.txt path/to/entry.rb
 ```
 
 ### Text plus HTML
 
 ```bash
-ruby exe/lumitrace path/to/entry.rb --text --html
+lumitrace -t -h path/to/entry.rb
+```
+
+### Running with exec
+
+```bash
+lumitrace --html=sample/lumitrace_rake.html exec rake
+```
+
+HTML output:
+- [lumitrace_rake.html](https://ko1.github.io/lumitrace/sample/lumitrace_rake.html)
+
+### Fork/exec merge
+
+Fork/exec results are merged by default. The parent process writes final output; child processes only write fragments under `LUMITRACE_RESULTS_DIR`.
+
+You can pass ranges via env (semicolon-separated):
+
+```bash
+LUMITRACE_RANGE="a.rb:1-3,5-6;b.rb" ruby your_script.rb
 ```
 
 ## 2. Library Mode
@@ -280,10 +299,12 @@ require "lumitrace"
 You can also pass CLI-style options via `LUMITRACE_ENABLE`:
 
 ```ruby
-ENV["LUMITRACE_ENABLE"] = "--text --html /tmp/lumi.html --json"
+ENV["LUMITRACE_ENABLE"] = "-t --html=/tmp/lumi.html -j"
 require "lumitrace"
 ```
 
+Lumitrace also sets `RUBYOPT=-rlumitrace` to ensure exec'd Ruby processes load it, so fork/exec output can be merged.
+
 ### Change output paths
 
 ```bash

data/exe/lumitrace

@@ -1,36 +1,72 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+require "rbconfig"
 require_relative "../lib/lumitrace"
 
 opts, args, parser = Lumitrace.parse_cli_options(
   ARGV,
-  banner: "usage: lumitrace FILE [options]",
-  allow_help: true
+  banner: "usage: lumitrace [options] script.rb [ruby_opt] | lumitrace [options] exec CMD [args...]",
+  allow_help: true,
+  order: :preserve
 )
 if opts[:help]
   puts parser
   exit 0
 end
-path = args.shift or abort(parser.to_s)
 
-opts[:root] = File.expand_path(opts[:root]) if opts[:root] && !opts[:root].strip.empty?
-opts[:ranges_by_file] = Lumitrace.resolve_ranges_by_file(
-  opts[:range_specs],
-  git_diff_mode: opts[:git_diff_mode],
-  git_diff_context: opts[:git_diff_context],
-  git_cmd: opts[:git_cmd],
-  git_diff_no_untracked: opts[:git_diff_no_untracked]
-)
+if args.empty?
+  warn parser.to_s
+  exit 1
+end
 
-Lumitrace.enable!(
-  max_values: opts[:max_values],
-  ranges_by_file: opts[:ranges_by_file],
-  root: opts[:root],
-  text: opts[:text],
-  html: opts[:html],
-  json: opts[:json],
-  verbose: opts[:verbose],
-  at_exit: true
-)
-load File.expand_path(path)
+if opts[:git_diff_mode] == "exec" && args.first != "exec"
+  args.unshift("exec")
+  opts[:git_diff_mode] = "working"
+end
+
+env = {}
+env["LUMITRACE_ENABLE"] = "1"
+env["LUMITRACE_TEXT"] = opts[:text] == true ? "1" : opts[:text] == false ? "0" : opts[:text].to_s if !opts[:text].nil?
+env["LUMITRACE_HTML"] = opts[:html] == true ? "1" : opts[:html] == false ? "0" : opts[:html].to_s if !opts[:html].nil?
+env["LUMITRACE_JSON"] = opts[:json] == true ? "1" : opts[:json] == false ? "0" : opts[:json].to_s if !opts[:json].nil?
+env["LUMITRACE_VALUES_MAX"] = opts[:max_values].to_s if opts[:max_values]
+env["LUMITRACE_ROOT"] = opts[:root] if opts[:root]
+env["LUMITRACE_VERBOSE"] = opts[:verbose] ? "1" : "0" if !opts[:verbose].nil?
+if opts[:range_specs].any?
+  env["LUMITRACE_RANGE"] = opts[:range_specs].join(";")
+end
+if opts[:git_diff_mode]
+  env["LUMITRACE_GIT_DIFF"] = opts[:git_diff_mode]
+end
+if opts[:git_diff_context]
+  env["LUMITRACE_GIT_DIFF_CONTEXT"] = opts[:git_diff_context].to_s
+end
+if opts[:git_cmd]
+  env["LUMITRACE_GIT_CMD"] = opts[:git_cmd]
+end
+if opts[:git_diff_no_untracked]
+  env["LUMITRACE_GIT_DIFF_UNTRACKED"] = "0"
+end
+
+lib_dir = File.expand_path("../lib", __dir__)
+ruby_lib = ENV["RUBYLIB"].to_s
+env["RUBYLIB"] = ([lib_dir] + ruby_lib.split(":")).uniq.join(":")
+
+rubyopt = ENV["RUBYOPT"].to_s
+unless rubyopt.split.any? { |t| t == "-rlumitrace" || t == "-rlumitrace/enable" }
+  rubyopt = rubyopt.strip.empty? ? "-rlumitrace" : "#{rubyopt} -rlumitrace"
+end
+env["RUBYOPT"] = rubyopt
+
+if args[0] == "exec"
+  cmd = args[1..]
+  if cmd.nil? || cmd.empty?
+    warn "lumitrace exec: missing command"
+    exit 1
+  end
+  exec(env, *cmd)
+else
+  script = args.shift
+  exec(env, RbConfig.ruby, script, *args)
+end

data/lib/lumitrace/env.rb

@@ -13,6 +13,11 @@ module Lumitrace
     json_env = parse_env_flag(ENV["LUMITRACE_JSON"])
     raw_text = ENV["LUMITRACE_TEXT"]
     text_env = parse_env_flag(raw_text)
+    range_env = ENV["LUMITRACE_RANGE"]
+    git_diff_env = ENV["LUMITRACE_GIT_DIFF"]
+    git_diff_context_env = ENV["LUMITRACE_GIT_DIFF_CONTEXT"]
+    git_cmd_env = ENV["LUMITRACE_GIT_CMD"]
+    git_diff_untracked_env = parse_env_flag(ENV["LUMITRACE_GIT_DIFF_UNTRACKED"])
     max_env = ENV["LUMITRACE_VALUES_MAX"]
     root_env = ENV["LUMITRACE_ROOT"]
 
@@ -28,6 +33,13 @@ module Lumitrace
     end
 
     verbose = parse_env_flag(ENV["LUMITRACE_VERBOSE"]) == true
+    range_specs = if range_env.nil? || range_env.strip.empty?
+      []
+    else
+      range_env.split(";").map(&:strip).reject(&:empty?)
+    end
+    git_diff_context = git_diff_context_env ? git_diff_context_env.to_i : nil
+    git_diff_untracked = git_diff_untracked_env.nil? ? nil : (git_diff_untracked_env != false)
 
     {
       text: text,
@@ -35,6 +47,11 @@ module Lumitrace
       html: html,
       html_out: html_out,
       json: json,
+      range_specs: range_specs,
+      git_diff_mode: git_diff_env,
+      git_diff_context: git_diff_context,
+      git_cmd: git_cmd_env,
+      git_diff_untracked: git_diff_untracked,
       max_values: max_env,
       root: root_env,
       verbose: verbose

data/lib/lumitrace/generate_resulted_html.rb

@@ -620,7 +620,7 @@ module GenerateResultedHtml
       render_text_from_events(src, events, filename: path, ranges: ranges, with_header: true, header_label: rel)
     end.compact
 
-    header = "=== Lumitrace Results (text) ===\n\n"
+    header = "\n=== Lumitrace Results (text) ===\n\n"
     header + sections.join("\n")
   end