diffstitch 1.0.3

data/lib/diffstitch/assets/styles.css

@@ -0,0 +1,218 @@
+/* ── Variables ──────────────────────────────────────────────────── */
+:root {
+  --gh-canvas:        #ffffff;
+  --gh-surface:       #f6f8fa;
+  --gh-border:        #d0d7de;
+  --gh-text:          #1f2328;
+  --gh-muted:         #57606a;
+  --gh-link:          #0969da;
+  --gh-nav-bg:        #24292f;
+  --gh-nav-border:    #30363d;
+  --gh-nav-text:      #f0f6fc;
+
+  --gh-add-bg:        #e6ffec;
+  --gh-add-num-bg:    #abf2bc;
+  --gh-add-num-text:  #033a16;
+  --gh-add-num-border:#56d364;
+
+  --gh-del-bg:        #ffebe9;
+  --gh-del-num-bg:    rgba(255,129,130,.4);
+  --gh-del-num-text:  #82071e;
+  --gh-del-num-border:rgba(255,129,130,.6);
+
+  --gh-hunk-bg:       #ddf4ff;
+  --gh-hunk-text:     #0550ae;
+  --gh-hunk-border:   rgba(84,174,255,.3);
+
+  --mono: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Consolas, "Liberation Mono", monospace;
+}
+
+/* ── Page shell ─────────────────────────────────────────────────── */
+
+body { background: var(--gh-canvas); color: var(--gh-text); }
+
+/* ── Top nav (GitHub dark bar) ──────────────────────────────────── */
+
+.topnav {
+  background: var(--gh-nav-bg);
+  border-bottom: 1px solid var(--gh-nav-border);
+}
+
+.topnav h1 { color: var(--gh-nav-text); }
+
+.branch-select {
+  background-color: #21262d !important;
+  color: var(--gh-nav-text) !important;
+  border-color: #30363d !important;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath fill='%238b949e' d='M1 1l5 5 5-5'/%3E%3C/svg%3E") !important;
+}
+
+.branch-select:focus {
+  border-color: #58a6ff !important;
+  box-shadow: 0 0 0 3px rgba(88,166,255,.25) !important;
+}
+
+/* ── Panel chrome ───────────────────────────────────────────────── */
+
+.panel-left { border-right: 1px solid var(--gh-border); }
+
+.panel-header {
+  padding: .375rem .875rem;
+  background: var(--gh-surface);
+  border-bottom: 1px solid var(--gh-border);
+  font-family: var(--mono);
+  font-size: 12px;
+  flex-shrink: 0;
+}
+
+.panel-header .fw-semibold { color: var(--gh-link); }
+
+.ds-badge {
+  display: inline-block;
+  padding: 1px 7px;
+  font-size: 11px;
+  font-family: var(--mono);
+  background: var(--gh-surface);
+  color: var(--gh-muted);
+  border: 1px solid var(--gh-border);
+  border-radius: 2em;
+}
+
+/* ── Empty state ────────────────────────────────────────────────── */
+
+.empty-state {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 200px;
+  font-family: var(--mono);
+  font-size: 13px;
+  font-style: italic;
+  color: var(--gh-muted);
+}
+
+/* ── Scrollbar ──────────────────────────────────────────────────── */
+
+.panel-content::-webkit-scrollbar { width: 8px; height: 8px; }
+.panel-content::-webkit-scrollbar-track { background: var(--gh-canvas); }
+.panel-content::-webkit-scrollbar-thumb { background: var(--gh-border); border-radius: 4px; }
+.panel-content::-webkit-scrollbar-thumb:hover { background: var(--gh-muted); }
+
+/* ── diff2html overrides ── GitHub colour palette ───────────────── */
+
+/* Strip diff2html's own borders/margins so our panel chrome takes over */
+.panel-content .d2h-wrapper { background: var(--gh-canvas); }
+
+.panel-content .d2h-file-wrapper {
+  border: none;
+  border-bottom: 1px solid var(--gh-border);
+  border-radius: 0;
+  margin: 0;
+  background: var(--gh-canvas);
+}
+
+/* Force single-column layout (we already split the two d2h sides ourselves) */
+.panel-content .d2h-files-diff   { display: block !important; }
+.panel-content .d2h-file-side-diff {
+  width: 100% !important;
+  display: block !important;
+  border: none !important;
+  float: none !important;
+}
+
+/* File header */
+.panel-content .d2h-file-header {
+  background: var(--gh-surface) !important;
+  border-bottom: 1px solid var(--gh-border) !important;
+  border-radius: 0 !important;
+  padding: 6px 14px !important;
+}
+
+.panel-content .d2h-file-name {
+  color: var(--gh-link) !important;
+  font-size: 12px;
+  font-family: var(--mono);
+}
+
+/* Added / removed tags (e.g. "+3 -1") */
+.panel-content .d2h-tag {
+  font-size: 11px !important;
+  border-radius: 2em !important;
+}
+.panel-content .d2h-added-tag {
+  background: var(--gh-add-bg) !important;
+  color: var(--gh-add-num-text) !important;
+  border: 1px solid var(--gh-add-num-border) !important;
+}
+.panel-content .d2h-deleted-tag {
+  background: var(--gh-del-bg) !important;
+  color: var(--gh-del-num-text) !important;
+  border: 1px solid rgba(255,129,130,.6) !important;
+}
+
+/* Code table */
+.panel-content .d2h-code-wrapper { border: none; }
+
+.panel-content table.d2h-diff-table {
+  width: 100%;
+  font-size: 12px;
+  font-family: var(--mono);
+  border-collapse: collapse;
+}
+
+/* Unchanged lines */
+.panel-content td.d2h-code-line,
+.panel-content td.d2h-code-side-line { background: var(--gh-canvas); }
+
+/* Deletions */
+.panel-content td.d2h-del { background: var(--gh-del-bg) !important; }
+.panel-content td.d2h-del .d2h-del { background: rgba(255,129,130,.4); border-radius: 2px; }
+
+/* Additions */
+.panel-content td.d2h-ins { background: var(--gh-add-bg) !important; }
+.panel-content td.d2h-ins .d2h-ins { background: rgba(171,242,188,.8); border-radius: 2px; }
+
+/* Line number gutter */
+.panel-content .d2h-code-linenumber,
+.panel-content td.d2h-code-side-linenumber {
+  position: sticky;
+  left: 0;
+  z-index: 2;
+  background: var(--gh-surface) !important;
+  border-right: 1px solid var(--gh-border) !important;
+  color: var(--gh-muted) !important;
+  min-width: 44px;
+  width: 44px;
+  padding: 0 10px !important;
+  text-align: right;
+  user-select: none;
+  font-family: var(--mono);
+  font-size: 12px;
+}
+
+.panel-content .d2h-code-linenumber.d2h-del,
+.panel-content td.d2h-code-side-linenumber.d2h-del {
+  background: var(--gh-del-num-bg) !important;
+  border-right-color: var(--gh-del-num-border) !important;
+  color: var(--gh-del-num-text) !important;
+  z-index: 2;
+}
+
+.panel-content .d2h-code-linenumber.d2h-ins,
+.panel-content td.d2h-code-side-linenumber.d2h-ins {
+  background: var(--gh-add-num-bg) !important;
+  border-right-color: var(--gh-add-num-border) !important;
+  color: var(--gh-add-num-text) !important;
+  z-index: 2;
+}
+
+/* Hunk / context header */
+.panel-content td.d2h-info,
+.panel-content .d2h-info {
+  background: var(--gh-hunk-bg) !important;
+  color: var(--gh-hunk-text) !important;
+  border-top: 1px solid var(--gh-hunk-border) !important;
+  border-bottom: 1px solid var(--gh-hunk-border) !important;
+  font-family: var(--mono);
+  font-size: 12px;
+}

data/lib/diffstitch/cli.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'optparse'
+require 'launchy'
+
+module Diffstitch
+  class CLI
+    OUTPUT_BASE = File.join('.diffstitch', 'output')
+
+    def self.start(argv = ARGV)
+      new.run(argv)
+    end
+
+    def run(argv)
+      options = parse_options!(argv)
+      validate_repo!
+      validate_args!(argv)
+
+      base     = argv[0]
+      branches = argv[1..]
+
+      verify_refs!(base, branches)
+
+      title      = options[:title] || "diffstitch: #{branches.join(' | ')} vs #{base}"
+      output_dir = options[:output] || derived_output(base, branches)
+      diffs      = collect_diffs(base, branches)
+
+      Generator.new(base: base, branches: branches, diffs: diffs, title: title).write(output_dir)
+
+      index = File.expand_path(File.join(output_dir, 'index.html'))
+      puts "Generated: #{index}"
+      open_in_browser(index) if options[:open]
+    end
+
+    private
+
+    def parse_options!(argv)
+      options = { output: nil, open: false }
+
+      OptionParser.new do |opts|
+        opts.banner = <<~BANNER
+          diffstitch — compare multiple git branches against a base in a split HTML view
+
+          Usage: diffstitch <base> <branch1> [branch2 ...] [options]
+        BANNER
+
+        opts.on('-o', '--output DIR', "Output directory (default: #{OUTPUT_BASE}/<base>_vs_<branches>)") do |v|
+          options[:output] = v
+        end
+        opts.on('--open', 'Open result in browser after generating') { options[:open] = true }
+        opts.on('--title TITLE', 'Custom page title') { |v| options[:title] = v }
+        opts.on_tail('-v', '--version', 'Show version') do
+          puts VERSION
+          exit
+        end
+        opts.on_tail('-h', '--help', 'Show this help') do
+          puts opts
+          exit
+        end
+      end.parse!(argv)
+
+      options
+    end
+
+    def validate_repo!
+      abort 'Error: not inside a git repository.' unless Git.in_repo?
+    end
+
+    def validate_args!(argv)
+      return if argv.length >= 2
+
+      abort "Error: provide a base branch and at least one comparison branch.\n" \
+            'Usage: diffstitch <base> <branch1> [branch2 ...]'
+    end
+
+    def verify_refs!(base, branches)
+      [base, *branches].each { |ref| Git.verify_ref!(ref) }
+    rescue Git::Error => e
+      abort "Error: #{e.message}"
+    end
+
+    def collect_diffs(base, branches)
+      branches.to_h { |branch| [branch, Git.diff(base, branch)] }
+    rescue Git::Error => e
+      abort "Error: #{e.message}"
+    end
+
+    def derived_output(base, branches)
+      sanitize = ->(b) { b.gsub(%r{[/\\]}, '-') }
+      name = "#{sanitize.call(base)}_vs_#{branches.map(&sanitize).join('_')}"
+      File.join(OUTPUT_BASE, name)
+    end
+
+    def open_in_browser(path)
+      Launchy.open(path)
+    end
+  end
+end

data/lib/diffstitch/generator.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'json'
+require 'erb'
+
+module Diffstitch
+  class Generator
+    ASSETS_DIR = File.expand_path('assets', __dir__)
+
+    def initialize(base:, branches:, diffs:, title:)
+      @base     = base
+      @branches = branches
+      @diffs    = diffs
+      @title    = title
+    end
+
+    def write(output_dir)
+      FileUtils.mkdir_p(output_dir)
+      write_data_js(output_dir)
+      %w[bootstrap.min.css styles.css app.js].each { |f| FileUtils.cp(asset(f), output_dir) }
+      write_html(output_dir)
+    end
+
+    private
+
+    def asset(name)
+      File.join(ASSETS_DIR, name)
+    end
+
+    def write_data_js(dir)
+      payload = JSON.generate({ base: @base, title: @title, branches: @diffs })
+      File.write(File.join(dir, 'data.js'), "const DIFF_DATA = #{payload};\n")
+    end
+
+    def write_html(dir)
+      title    = @title
+      template = ERB.new(File.read(asset('index.html.erb')), trim_mode: '-')
+      File.write(File.join(dir, 'index.html'), template.result(binding))
+    end
+  end
+end

data/lib/diffstitch/git.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'open3'
+
+module Diffstitch
+  module Git
+    class Error < StandardError; end
+
+    def self.in_repo?
+      _, _, status = Open3.capture3('git', 'rev-parse', '--git-dir')
+      status.success?
+    end
+
+    def self.verify_ref!(ref)
+      _, err, status = Open3.capture3('git', 'rev-parse', '--verify', "#{ref}^{commit}")
+      raise Error, "'#{ref}' is not a valid branch or commit.\n#{err.strip}" unless status.success?
+    end
+
+    def self.diff(base, branch)
+      out, err, status = Open3.capture3('git', 'diff', "#{base}..#{branch}", '--no-color')
+      raise Error, "git diff #{base}..#{branch} failed:\n#{err.strip}" unless status.success?
+
+      out
+    end
+  end
+end

data/lib/diffstitch/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Diffstitch
+  VERSION = '1.0.3'
+end

data/lib/diffstitch.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative 'diffstitch/version'
+require_relative 'diffstitch/git'
+require_relative 'diffstitch/generator'
+require_relative 'diffstitch/cli'
+
+module Diffstitch
+end

metadata

@@ -0,0 +1,132 @@
+--- !ruby/object:Gem::Specification
+name: diffstitch
+version: !ruby/object:Gem::Version
+  version: 1.0.3
+platform: ruby
+authors:
+- Steven Roomberg
+autorequire:
+bindir: bin
+cert_chain: []
+date: 2026-05-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: A CLI tool that generates a side-by-side HTML report comparing multiple
+  git branches against a common base branch.
+email:
+- stevenroomberg@gmail.com
+executables:
+- diffstitch
+extensions: []
+extra_rdoc_files: []
+files:
+- CHANGELOG.md
+- Gemfile
+- LICENSE
+- bin/diffstitch
+- diffstitch.gemspec
+- lib/diffstitch.rb
+- lib/diffstitch/assets/app.js
+- lib/diffstitch/assets/bootstrap.min.css
+- lib/diffstitch/assets/index.html.erb
+- lib/diffstitch/assets/styles.css
+- lib/diffstitch/cli.rb
+- lib/diffstitch/generator.rb
+- lib/diffstitch/git.rb
+- lib/diffstitch/version.rb
+homepage: https://github.com/sroomberg/diffstitch
+licenses:
+- MIT
+metadata:
+  homepage_uri: https://github.com/sroomberg/diffstitch
+  source_code_uri: https://github.com/sroomberg/diffstitch
+  changelog_uri: https://github.com/sroomberg/diffstitch/blob/main/CHANGELOG.md
+post_install_message:
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 2.7.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.5.22
+signing_key:
+specification_version: 4
+summary: Compare multiple git branches against a base in a split HTML view
+test_files: []