diffstitch 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 8e3518efc4620730e9fa8677f6cae92de2b51a3b45bd02bc683d4e3286877c89
+  data.tar.gz: fece68431738b24b263ac9138414549ee53ee0933afe289f7da8eae3d13590db
+SHA512:
+  metadata.gz: 807313f7773ea6f4613cc6858032e695ae69b14669d6b7d9f672b74b0467aa7e6b001c94367977c35b8874bc48691064af97748d12f55a7fd3f9bbdaf5c0c663
+  data.tar.gz: 5ed4e99fe73a8a0676330052fecfa959be5345636eeb822d23af9eb575ad4c58f06ecc5961262fed8c0080b365358d0b69c4968c2270cd22f9d71f5235aa23cf

data/CHANGELOG.md

@@ -0,0 +1,80 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [1.0.3] - 2026-05-22
+
+### Fixed
+- Release workflow: add `rake` to bundle and `bundler/gem_tasks` to Rakefile so `rubygems/release-gem` can run `rake release`
+
+## [1.0.2] - 2026-05-22
+
+### Changed
+- Release workflow now publishes to RubyGems.org via OIDC trusted publishing before creating the GitHub Release
+
+## [1.0.1] - 2026-05-22
+
+### Changed
+- `--open` now uses the [launchy](https://github.com/copiousfreetime/launchy) gem instead of a raw system command
+
+## [1.0.0] - 2026-05-20
+
+### Added
+- First stable release
+
+## [0.3.1] - 2026-05-20
+
+### Added
+- RuboCop and rubocop-rspec as development dependencies
+- `.rubocop.yml` with project-appropriate configuration
+- RuboCop lint step added to CI and default Rake task
+
+## [0.3.0] - 2026-05-20
+
+### Changed
+- Default output directory is now `.diffstitch/output/<base>_vs_<branches>`, derived
+  from the branch names being compared (e.g. `main_vs_feature-auth_fix-login`)
+- Slashes in branch names (e.g. `feature/auth`) are replaced with hyphens in the path
+
+## [0.2.1] - 2026-05-20
+
+### Fixed
+- Line numbers now stay frozen at the left edge during horizontal scroll
+
+## [0.2.0] - 2026-05-20
+
+### Changed
+- Restyled output HTML to mirror GitHub's diff color palette
+- Switched from Bootstrap dark mode to light mode with a custom dark top nav
+- Added CSS variables for the full color palette
+- Line number gutters, addition/deletion backgrounds, and hunk headers now match GitHub exactly
+
+## [0.1.0] - 2026-05-20
+
+### Added
+- `diffstitch` CLI command to generate a split-panel HTML diff report
+- Support for diffing multiple branches against a single base
+- Dark-themed side-by-side diff view powered by [diff2html](https://diff2html.xyz/)
+- Bootstrap 5 for layout and component styling (bundled as a gem asset)
+- Dropdown to switch between comparison branches without reloading
+- Synchronized vertical scrolling between the base and branch panels
+- `--output` flag to set a custom output directory (default: `./diffstitch_output`)
+- `--open` flag to launch the output in the system browser after generating
+- `--title` flag for a custom page title
+- `--version` / `--help` flags
+
+[Unreleased]: https://github.com/sroomberg/diffstitch/compare/v1.0.3...HEAD
+[1.0.3]: https://github.com/sroomberg/diffstitch/compare/v1.0.2...v1.0.3
+[1.0.2]: https://github.com/sroomberg/diffstitch/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/sroomberg/diffstitch/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/sroomberg/diffstitch/compare/v0.3.1...v1.0.0
+[0.3.1]: https://github.com/sroomberg/diffstitch/compare/v0.3.0...v0.3.1
+[0.3.0]: https://github.com/sroomberg/diffstitch/compare/v0.2.1...v0.3.0
+[0.2.1]: https://github.com/sroomberg/diffstitch/compare/v0.2.0...v0.2.1
+[0.2.0]: https://github.com/sroomberg/diffstitch/compare/v0.1.0...v0.2.0
+[0.1.0]: https://github.com/sroomberg/diffstitch/releases/tag/v0.1.0

data/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Steven Roomberg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/bin/diffstitch

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'diffstitch'
+
+Diffstitch::CLI.start

data/diffstitch.gemspec

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative 'lib/diffstitch/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'diffstitch'
+  spec.version       = Diffstitch::VERSION
+  spec.authors       = ['Steven Roomberg']
+  spec.email         = ['stevenroomberg@gmail.com']
+
+  spec.summary       = 'Compare multiple git branches against a base in a split HTML view'
+  spec.description   = 'A CLI tool that generates a side-by-side HTML report comparing ' \
+                       'multiple git branches against a common base branch.'
+  spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 2.7.0'
+
+  spec.homepage      = 'https://github.com/sroomberg/diffstitch'
+  spec.metadata      = {
+    'homepage_uri'    => spec.homepage,
+    'source_code_uri' => spec.homepage,
+    'changelog_uri'   => "#{spec.homepage}/blob/main/CHANGELOG.md"
+  }
+
+  spec.files         = Dir['lib/**/*', 'bin/*', '*.gemspec', 'Gemfile', 'CHANGELOG.md', 'LICENSE']
+  spec.bindir        = 'bin'
+  spec.executables   = ['diffstitch']
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'launchy', '~> 3.1'
+
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.13'
+  spec.add_development_dependency 'rubocop', '~> 1.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 3.0'
+end

data/lib/diffstitch/assets/app.js

@@ -0,0 +1,104 @@
+(function () {
+  'use strict';
+
+  const { base, title, branches } = DIFF_DATA;
+  const branchNames = Object.keys(branches);
+  const staging = document.getElementById('diff-staging');
+  const cache = {};
+
+  document.title = title;
+  document.getElementById('page-title').textContent = title;
+  document.getElementById('base-label').textContent = base;
+
+  const select = document.getElementById('branch-select');
+  branchNames.forEach(function (name) {
+    const opt = document.createElement('option');
+    opt.value = name;
+    opt.textContent = name;
+    select.appendChild(opt);
+  });
+
+  function renderBranchDiff(name) {
+    const diff = branches[name];
+
+    if (!diff || !diff.trim()) {
+      return {
+        left: mkMessage('No files changed vs ' + base),
+        right: mkMessage('Identical to ' + base),
+      };
+    }
+
+    const html = Diff2Html.html(diff, {
+      drawFileList: false,
+      matching: 'lines',
+      outputFormat: 'side-by-side',
+    });
+
+    staging.innerHTML = html;
+
+    const leftEl = document.createElement('div');
+    const rightEl = document.createElement('div');
+
+    staging.querySelectorAll('.d2h-file-wrapper').forEach(function (wrapper) {
+      const header = wrapper.querySelector('.d2h-file-header');
+      const sides = wrapper.querySelectorAll('.d2h-file-side-diff');
+      if (!sides || sides.length < 2) return;
+
+      [leftEl, rightEl].forEach(function (container, i) {
+        const w = document.createElement('div');
+        w.className = 'd2h-file-wrapper';
+        if (header) w.appendChild(header.cloneNode(true));
+        const fd = document.createElement('div');
+        fd.className = 'd2h-files-diff';
+        fd.appendChild(sides[i].cloneNode(true));
+        w.appendChild(fd);
+        container.appendChild(w);
+      });
+    });
+
+    staging.innerHTML = '';
+    return { left: leftEl, right: rightEl };
+  }
+
+  function mkMessage(msg) {
+    const div = document.createElement('div');
+    div.className = 'empty-state';
+    div.textContent = msg;
+    return div;
+  }
+
+  function showBranch(name) {
+    if (!cache[name]) cache[name] = renderBranchDiff(name);
+
+    const { left, right } = cache[name];
+    const lc = document.getElementById('left-content');
+    const rc = document.getElementById('right-content');
+
+    lc.innerHTML = '';
+    rc.innerHTML = '';
+    lc.appendChild(left.cloneNode(true));
+    rc.appendChild(right.cloneNode(true));
+
+    document.getElementById('branch-label').textContent = name;
+    lc.scrollTop = 0;
+    rc.scrollTop = 0;
+  }
+
+  var syncing = false;
+  var lc = document.getElementById('left-content');
+  var rc = document.getElementById('right-content');
+
+  function syncScroll(source, target) {
+    if (syncing) return;
+    syncing = true;
+    target.scrollTop = source.scrollTop;
+    syncing = false;
+  }
+
+  lc.addEventListener('scroll', function () { syncScroll(lc, rc); });
+  rc.addEventListener('scroll', function () { syncScroll(rc, lc); });
+
+  select.addEventListener('change', function () { showBranch(select.value); });
+
+  if (branchNames.length > 0) showBranch(branchNames[0]);
+}());