diff-lcs 1.6.2 → 2.0.0

data/LICENCE.md

@@ -1,14 +1,17 @@
 # Licence
 
-This software is available under three licenses: the GNU GPL version 2 (or at
-your option, a later version), the Perl Artistic license, or the MIT license.
-Note that my preference for licensing is the MIT license, but Algorithm::Diff
-was dually originally licensed with the Perl Artistic and the GNU GPL ("the same
-terms as Perl itself") and given that the Ruby implementation originally hewed
-pretty closely to the Perl version, I must maintain the additional licensing
-terms.
-
-- Copyright 2004–2025 Austin Ziegler and contributors.
+- SPDX-License-Identifier: [MIT][mit] OR [GPL-2.0-or-later][gpl2-or-later] OR
+  [Artistic-1.0-Perl][artistic-perl]
+
+This software is available under three disjunctive licences: the GNU GPL version
+2 (or at your option, a later version), the Perl Artistic license, or the MIT
+license. Note that my preference for licensing is the MIT license, but
+Algorithm::Diff was dually originally licensed with the Perl Artistic and the
+GNU GPL ("the same terms as Perl itself") and given that the Ruby implementation
+originally hewed pretty closely to the Perl version, I must maintain the
+additional licensing terms.
+
+- Copyright 2004-2026 Austin Ziegler and contributors.
 - Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by
   Mario I. Wolczko.
 
@@ -33,8 +36,33 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ## Perl Artistic License
 
-See the file docs/artistic.txt in the main distribution.
+See [licences/artistic.txt](licences/artistic.txt) in the main distribution.
 
 ## GNU GPL version 2
 
-See the file docs/COPYING.txt in the main distribution.
+See the file [licences/COPYING.txt](licences/COPYING.txt) in the main
+distribution.
+
+## Developer Certificate of Origin
+
+All contributors **must** certify they are willing and able to provide their
+contributions under the terms of _all_ of this project's licences with the
+certification of the [Developer Certificate of Origin (Version 1.1)][dco].
+
+Such certification is provided by ensuring that a `Signed-off-by`
+[commit trailer][trailer] is present on every commit:
+
+    Signed-off-by: FirstName LastName <email@example.org>
+
+The `Signed-off-by` trailer can be automatically added by git with the `-s` or
+`--signoff` option on `git commit`:
+
+```sh
+git commit --signoff
+```
+
+[artistic-perl]: https://spdx.org/licenses/Artistic-1.0-Perl.html
+[gpl2-or-later]: https://spdx.org/licenses/GPL-2.0-or-later.html
+[mit]: https://spdx.org/licenses/MIT.html
+[trailer]: https://git-scm.com/docs/git-interpret-trailers
+[dco]: licences/dco.txt

data/Manifest.txt

@@ -1,4 +1,3 @@
-.rspec
 CHANGELOG.md
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
@@ -8,102 +7,29 @@ Manifest.txt
 README.md
 Rakefile
 SECURITY.md
-bin/htmldiff
 bin/ldiff
-docs/COPYING.txt
-docs/artistic.txt
+integration/compare/array_diff_spec.rb
+integration/compare/hash_diff_spec.rb
+integration/compare/string_diff_spec.rb
+integration/rspec_differ_spec.rb
+integration/rspec_expectations_spec.rb
+integration/runner
 lib/diff-lcs.rb
 lib/diff/lcs.rb
 lib/diff/lcs/array.rb
-lib/diff/lcs/backports.rb
 lib/diff/lcs/block.rb
 lib/diff/lcs/callbacks.rb
 lib/diff/lcs/change.rb
-lib/diff/lcs/htmldiff.rb
 lib/diff/lcs/hunk.rb
 lib/diff/lcs/internals.rb
 lib/diff/lcs/ldiff.rb
 lib/diff/lcs/string.rb
 lib/diff/lcs/version.rb
-mise.toml
+licenses/COPYING.txt
+licenses/artistic.txt
+licenses/dco.txt
 spec/change_spec.rb
 spec/diff_spec.rb
-spec/fixtures/123_x
-spec/fixtures/456_x
-spec/fixtures/aX
-spec/fixtures/bXaX
-spec/fixtures/ds1.csv
-spec/fixtures/ds2.csv
-spec/fixtures/empty
-spec/fixtures/file1.bin
-spec/fixtures/file2.bin
-spec/fixtures/four_lines
-spec/fixtures/four_lines_with_missing_new_line
-spec/fixtures/ldiff/diff.missing_new_line1-e
-spec/fixtures/ldiff/diff.missing_new_line1-f
-spec/fixtures/ldiff/diff.missing_new_line2-e
-spec/fixtures/ldiff/diff.missing_new_line2-f
-spec/fixtures/ldiff/error.diff.chef-e
-spec/fixtures/ldiff/error.diff.chef-f
-spec/fixtures/ldiff/error.diff.missing_new_line1-e
-spec/fixtures/ldiff/error.diff.missing_new_line1-f
-spec/fixtures/ldiff/error.diff.missing_new_line2-e
-spec/fixtures/ldiff/error.diff.missing_new_line2-f
-spec/fixtures/ldiff/output.diff
-spec/fixtures/ldiff/output.diff-c
-spec/fixtures/ldiff/output.diff-e
-spec/fixtures/ldiff/output.diff-f
-spec/fixtures/ldiff/output.diff-u
-spec/fixtures/ldiff/output.diff.bin1
-spec/fixtures/ldiff/output.diff.bin1-c
-spec/fixtures/ldiff/output.diff.bin1-e
-spec/fixtures/ldiff/output.diff.bin1-f
-spec/fixtures/ldiff/output.diff.bin1-u
-spec/fixtures/ldiff/output.diff.bin2
-spec/fixtures/ldiff/output.diff.bin2-c
-spec/fixtures/ldiff/output.diff.bin2-e
-spec/fixtures/ldiff/output.diff.bin2-f
-spec/fixtures/ldiff/output.diff.bin2-u
-spec/fixtures/ldiff/output.diff.chef
-spec/fixtures/ldiff/output.diff.chef-c
-spec/fixtures/ldiff/output.diff.chef-e
-spec/fixtures/ldiff/output.diff.chef-f
-spec/fixtures/ldiff/output.diff.chef-u
-spec/fixtures/ldiff/output.diff.chef2
-spec/fixtures/ldiff/output.diff.chef2-c
-spec/fixtures/ldiff/output.diff.chef2-d
-spec/fixtures/ldiff/output.diff.chef2-e
-spec/fixtures/ldiff/output.diff.chef2-f
-spec/fixtures/ldiff/output.diff.chef2-u
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines-c
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines-e
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines-f
-spec/fixtures/ldiff/output.diff.empty.vs.four_lines-u
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty-c
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty-e
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty-f
-spec/fixtures/ldiff/output.diff.four_lines.vs.empty-u
-spec/fixtures/ldiff/output.diff.issue95_trailing_context
-spec/fixtures/ldiff/output.diff.issue95_trailing_context-c
-spec/fixtures/ldiff/output.diff.issue95_trailing_context-e
-spec/fixtures/ldiff/output.diff.issue95_trailing_context-f
-spec/fixtures/ldiff/output.diff.issue95_trailing_context-u
-spec/fixtures/ldiff/output.diff.missing_new_line1
-spec/fixtures/ldiff/output.diff.missing_new_line1-c
-spec/fixtures/ldiff/output.diff.missing_new_line1-e
-spec/fixtures/ldiff/output.diff.missing_new_line1-f
-spec/fixtures/ldiff/output.diff.missing_new_line1-u
-spec/fixtures/ldiff/output.diff.missing_new_line2
-spec/fixtures/ldiff/output.diff.missing_new_line2-c
-spec/fixtures/ldiff/output.diff.missing_new_line2-e
-spec/fixtures/ldiff/output.diff.missing_new_line2-f
-spec/fixtures/ldiff/output.diff.missing_new_line2-u
-spec/fixtures/new-chef
-spec/fixtures/new-chef2
-spec/fixtures/old-chef
-spec/fixtures/old-chef2
 spec/hunk_spec.rb
 spec/issues_spec.rb
 spec/lcs_spec.rb
@@ -113,3 +39,85 @@ spec/sdiff_spec.rb
 spec/spec_helper.rb
 spec/traverse_balanced_spec.rb
 spec/traverse_sequences_spec.rb
+test/fixtures/123_x
+test/fixtures/456_x
+test/fixtures/aX
+test/fixtures/bXaX
+test/fixtures/ds1.csv
+test/fixtures/ds2.csv
+test/fixtures/empty
+test/fixtures/file1.bin
+test/fixtures/file2.bin
+test/fixtures/four_lines
+test/fixtures/four_lines_with_missing_new_line
+test/fixtures/ldiff/diff.missing_new_line1-e
+test/fixtures/ldiff/diff.missing_new_line1-f
+test/fixtures/ldiff/diff.missing_new_line2-e
+test/fixtures/ldiff/diff.missing_new_line2-f
+test/fixtures/ldiff/error.diff.chef-e
+test/fixtures/ldiff/error.diff.chef-f
+test/fixtures/ldiff/error.diff.missing_new_line1-e
+test/fixtures/ldiff/error.diff.missing_new_line1-f
+test/fixtures/ldiff/error.diff.missing_new_line2-e
+test/fixtures/ldiff/error.diff.missing_new_line2-f
+test/fixtures/ldiff/output.diff
+test/fixtures/ldiff/output.diff-c
+test/fixtures/ldiff/output.diff-u
+test/fixtures/ldiff/output.diff.bin1
+test/fixtures/ldiff/output.diff.bin1-c
+test/fixtures/ldiff/output.diff.bin1-e
+test/fixtures/ldiff/output.diff.bin1-f
+test/fixtures/ldiff/output.diff.bin1-u
+test/fixtures/ldiff/output.diff.bin2
+test/fixtures/ldiff/output.diff.bin2-c
+test/fixtures/ldiff/output.diff.bin2-e
+test/fixtures/ldiff/output.diff.bin2-f
+test/fixtures/ldiff/output.diff.bin2-u
+test/fixtures/ldiff/output.diff.chef
+test/fixtures/ldiff/output.diff.chef-c
+test/fixtures/ldiff/output.diff.chef-u
+test/fixtures/ldiff/output.diff.chef2
+test/fixtures/ldiff/output.diff.chef2-c
+test/fixtures/ldiff/output.diff.chef2-d
+test/fixtures/ldiff/output.diff.chef2-u
+test/fixtures/ldiff/output.diff.empty.vs.four_lines
+test/fixtures/ldiff/output.diff.empty.vs.four_lines-c
+test/fixtures/ldiff/output.diff.empty.vs.four_lines-e
+test/fixtures/ldiff/output.diff.empty.vs.four_lines-f
+test/fixtures/ldiff/output.diff.empty.vs.four_lines-u
+test/fixtures/ldiff/output.diff.four_lines.vs.empty
+test/fixtures/ldiff/output.diff.four_lines.vs.empty-c
+test/fixtures/ldiff/output.diff.four_lines.vs.empty-e
+test/fixtures/ldiff/output.diff.four_lines.vs.empty-f
+test/fixtures/ldiff/output.diff.four_lines.vs.empty-u
+test/fixtures/ldiff/output.diff.issue95_trailing_context
+test/fixtures/ldiff/output.diff.issue95_trailing_context-c
+test/fixtures/ldiff/output.diff.issue95_trailing_context-e
+test/fixtures/ldiff/output.diff.issue95_trailing_context-f
+test/fixtures/ldiff/output.diff.issue95_trailing_context-u
+test/fixtures/ldiff/output.diff.missing_new_line1
+test/fixtures/ldiff/output.diff.missing_new_line1-c
+test/fixtures/ldiff/output.diff.missing_new_line1-e
+test/fixtures/ldiff/output.diff.missing_new_line1-f
+test/fixtures/ldiff/output.diff.missing_new_line1-u
+test/fixtures/ldiff/output.diff.missing_new_line2
+test/fixtures/ldiff/output.diff.missing_new_line2-c
+test/fixtures/ldiff/output.diff.missing_new_line2-e
+test/fixtures/ldiff/output.diff.missing_new_line2-f
+test/fixtures/ldiff/output.diff.missing_new_line2-u
+test/fixtures/new-chef
+test/fixtures/new-chef2
+test/fixtures/old-chef
+test/fixtures/old-chef2
+test/test_block.rb
+test/test_change.rb
+test/test_diff.rb
+test/test_helper.rb
+test/test_hunk.rb
+test/test_issues.rb
+test/test_lcs.rb
+test/test_ldiff.rb
+test/test_patch.rb
+test/test_sdiff.rb
+test/test_traverse_balanced.rb
+test/test_traverse_sequences.rb

data/README.md

@@ -1,14 +1,12 @@
 # Diff::LCS
 
-- home :: https://github.com/halostatue/diff-lcs
-- changelog :: https://github.com/halostatue/diff-lcs/blob/main/CHANGELOG.md
-- code :: https://github.com/halostatue/diff-lcs
-- bugs :: https://github.com/halostatue/diff-lcs/issues
-- rdoc :: http://rubydoc.info/github/halostatue/diff-lcs
+[![RubyGems Version][shield-gems]][rubygems] ![Coveralls][shield-coveralls]
+[![Build Status][shield-ci]][ci-workflow]
 
-<a href="https://github.com/halostatue/diff-lcs/actions">
-  <img src="https://github.com/halostatue/diff-lcs/workflows/CI/badge.svg" />
-</a>
+- code :: <https://github.com/halostatue/diff-lcs>
+- issues :: <https://github.com/halostatue/diff-lcs/issues>
+- docs :: <https://halostatue.github.io/diff-lcs/>
+- changelog :: <https://github.com/halostatue/diff-lcs/blob/main/CHANGELOG.md>
 
 ## Description
 
@@ -16,15 +14,23 @@ Diff::LCS computes the difference between two Enumerable sequences using the
 McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
 to create a simple HTML diff output format and a standard diff-like tool.
 
-This is release 1.6.1, providing a simple extension that allows for
-Diff::LCS::Change objects to be treated implicitly as arrays and fixes a number
-of formatting issues.
+This is release 2.0, which has significant breaking changes (removal of
+deprecations and workarounds) and requires at least Ruby 3.2 or higher. See full
+details in the `CHANGELOG`, but users of diff-lcs should not notice any
+significant changes to the APIs.
 
-Ruby versions below 2.5 are soft-deprecated, which means that older versions are
-no longer part of the CI test suite. If any changes have been introduced that
-break those versions, bug reports and patches will be accepted, but it will be
-up to the reporter to verify any fixes prior to release. The next major release
-will completely break compatibility.
+### Performance and Compatibility
+
+I have not run any benchmarks, but the use of immutable Data classes and the
+removal of a number of inner loop conditionals related to encoding and String
+handling (which have been unnecessary since at least Ruby 2.1 but kept for
+strict compatibility) should allow better optimization by modern Ruby
+implementations.
+
+If you are using RSpec for your test suite, you are unlikely to be able to use
+Diff::LCS 2.0 because of the minimum Ruby version unless the developers of RSpec
+loosen their version constraints. I cannot control this and have raised
+[rspec/rspec#290][rspec-issue-290].
 
 ## Synopsis
 
@@ -88,5 +94,12 @@ Subsequences</em>, CACM, vol.20, no.5, pp.350-353, May 1977, with a few minor
 improvements to improve the speed. A simplified description of the algorithm,
 originally written for the Perl version, was written by Mark-Jason Dominus.
 
+[ci-workflow]: https://github.com/halostatue/diff-lcs/actions/workflows/ci.yml
+[coveralls]: https://coveralls.io/github/halostatue/diff-lcs?branch=main
+[perl]: https://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/
+[rspec-issue-290]: https://github.com/rspec/rspec/issues/290
+[rubygems]: https://rubygems.org/gems/diff-lcs
+[shield-ci]: https://img.shields.io/github/actions/workflow/status/halostatue/diff-lcs/ci.yml?style=for-the-badge "Build Status"
+[shield-coveralls]: https://img.shields.io/coverallsCoverage/github/halostatue/diff-lcs?style=for-the-badge
+[shield-gems]: https://img.shields.io/gem/v/diff-lcs?style=for-the-badge "Version"
 [smalltalk]: ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st
-[perl]: http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/

data/Rakefile

@@ -1,52 +1,24 @@
 require "rubygems"
-require "rspec"
-require "rspec/core/rake_task"
 require "hoe"
 require "rake/clean"
-
-MAINTENANCE = ENV["MAINTENANCE"] == "true"
-BUILD_DOCS = MAINTENANCE || ENV["DOCS"] == "true"
-TRUSTED_RELEASE = ENV["rubygems_release_gem"] == "true"
+require "rdoc/task"
+require "minitest/test_task"
 
 Hoe.plugin :halostatue
-Hoe.plugin :rubygems
 
 Hoe.plugins.delete :debug
 Hoe.plugins.delete :newb
+Hoe.plugins.delete :publish
 Hoe.plugins.delete :signing
-Hoe.plugins.delete :publish unless BUILD_DOCS
-
-if RUBY_VERSION < "1.9"
-  class Array # :nodoc:
-    def to_h
-      Hash[*flatten(1)]
-    end
-  end
+Hoe.plugins.delete :test
 
-  class Gem::Specification # :nodoc:
-    def metadata=(*)
-    end
-
-    def default_value(*)
-    end
-  end
-
-  class Object # :nodoc:
-    def caller_locations(*)
-      []
-    end
-  end
-end
-
-_spec = Hoe.spec "diff-lcs" do
+hoe = Hoe.spec "diff-lcs" do
   developer("Austin Ziegler", "halostatue@gmail.com")
 
-  self.trusted_release = TRUSTED_RELEASE
+  self.trusted_release = ENV["rubygems_release_gem"] == "true"
 
-  require_ruby_version ">= 1.8"
+  require_ruby_version ">= 3.2.0", "< 5"
 
-  self.history_file = "CHANGELOG.md"
-  self.readme_file = "README.md"
   self.licenses = ["MIT", "Artistic-1.0-Perl", "GPL-2.0-or-later"]
 
   spec_extras[:metadata] = ->(val) {
@@ -54,62 +26,116 @@ _spec = Hoe.spec "diff-lcs" do
   }
 
   extra_dev_deps << ["hoe", "~> 4.0"]
-  extra_dev_deps << ["hoe-halostatue", "~> 2.0"]
-  extra_dev_deps << ["hoe-rubygems", "~> 1.0"]
-  extra_dev_deps << ["rspec", ">= 2.0", "< 4"]
+  extra_dev_deps << ["hoe-halostatue", "~> 3.0"]
+  extra_dev_deps << ["minitest", "~> 6.0"]
+  extra_dev_deps << ["minitest-autotest", "~> 1.0"]
+  extra_dev_deps << ["minitest-focus", "~> 1.1"]
   extra_dev_deps << ["rake", ">= 10.0", "< 14"]
-  extra_dev_deps << ["rdoc", ">= 6.3.1", "< 7"]
+  extra_dev_deps << ["rdoc", ">= 6.0", "< 8"]
+  extra_dev_deps << ["simplecov", "~> 0.9"]
+  extra_dev_deps << ["simplecov-lcov", "~> 0.9"]
+  extra_dev_deps << ["standard", "~> 1.50"]
+  extra_dev_deps << ["standard-thread_safety", "~> 1.0"]
+  extra_dev_deps << ["fasterer", "~> 0.11"]
 end
 
-if BUILD_DOCS
-  rake_tasks = Rake.application.instance_variable_get(:@tasks)
-  tasks = ["publish_docs", "publish_on_announce", "debug_email", "post_blog", "announce"]
-  tasks.each do |task|
-    rake_tasks.delete(task)
+Minitest::TestTask.create :test
+Minitest::TestTask.create :coverage do |t|
+  formatters = <<-RUBY.split($/).join(" ")
+    SimpleCov::Formatter::MultiFormatter.new([
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCov::Formatter::LcovFormatter,
+      SimpleCov::Formatter::SimpleFormatter
+    ])
+  RUBY
+  t.test_prelude = <<-RUBY.split($/).join("; ")
+  require "simplecov"
+  require "simplecov-lcov"
+
+  SimpleCov::Formatter::LcovFormatter.config do |config|
+    config.report_with_single_file = true
+    config.lcov_file_name = "lcov.info"
   end
-end
 
-desc "Run all specifications"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  rspec_dirs = %w[spec lib].join(":")
-  t.rspec_opts = ["-I#{rspec_dirs}"]
+  SimpleCov.start "test_frameworks" do
+    enable_coverage :branch
+    primary_coverage :branch
+    formatter #{formatters}
+  end
+  RUBY
 end
 
+task default: :test
+
 task :version do
   require "diff/lcs/version"
   puts Diff::LCS::VERSION
 end
 
-Rake::Task["spec"].actions.uniq! { |a| a.source_location }
+RDoc::Task.new do |config|
+  config.title = "diff-lcs"
+  config.main = "README.md"
+  config.rdoc_dir = "doc"
+  config.rdoc_files = hoe.spec.require_paths + hoe.spec.extra_rdoc_files -
+    FileList["integration/golden/*.txt", "Manifest.txt"].to_a
+  config.markup = "markdown"
+end
+task docs: :rerdoc
 
-# standard:disable Style/HashSyntax
-task :default => :spec unless Rake::Task["default"].prereqs.include?("spec")
-task :test => :spec unless Rake::Task["test"].prereqs.include?("spec")
-# standard:enable Style/HashSyntax
+def rspec_to_golden(file)
+  File.join("integration/golden", File.basename(file, "_spec.rb")) + ".txt"
+end
 
-if RUBY_VERSION >= "3.0" && RUBY_ENGINE == "ruby"
-  namespace :spec do
-    desc "Runs test coverage. Only works Ruby 2.0+ and assumes 'simplecov' is installed."
-    task :coverage do
-      ENV["COVERAGE"] = "true"
-      Rake::Task["spec"].execute
-    end
+def normalize_rspec_output(data)
+  data
+    .gsub(/Randomized with seed \d+/, "Randomized with seed XXXXX")
+    .gsub(/Finished in [\d.]+ seconds/, "Finished in X.XXXXX seconds")
+    .gsub(/files took [\d.]+ seconds to load/, "files took X.XXXXX seconds to load")
+end
+
+def unbundled(&block)
+  if defined?(Bundler)
+    Bundler.with_unbundled_env(&block)
+  else
+    block.call
   end
 end
 
-if MAINTENANCE
-  task ruby18: :package do
-    require "diff/lcs/version"
-    # standard:disable Layout/HeredocIndentation
-    puts <<-MESSAGE
-You are starting a barebones Ruby 1.8 docker environment for testing.
-A snapshot package has been built, so install it with:
+rspecs = FileList["integration/compare/*_spec.rb"]
+
+namespace :integration do
+  desc "Compare RSpec output with and without diff-lcs 2"
+  task :compare do
+    require "tempfile"
+    base = Tempfile.create("baseline") { _1.path }
+    work = Tempfile.create("working") { _1.path }
+
+    unbundled { sh "gem install rspec" }
 
-    cd diff-lcs
-    gem install pkg/diff-lcs-#{Diff::LCS::VERSION}
+    rspecs.to_a.each do |rspec_file|
+      basename = File.basename(rspec_file, "_spec.rb")
 
-    MESSAGE
-    # standard:enable Layout/HeredocIndentation
-    sh "docker run -it --rm -v #{Dir.pwd}:/root/diff-lcs bellbind/docker-ruby18-rails2 bash -l"
+      base_contents = unbundled { `integration/runner rspec #{rspec_file} 2>&1` }
+      base_contents = normalize_rspec_output(base_contents)
+
+      work_contents = unbundled { `integration/runner rspec -Ilib -rdiff/lcs #{rspec_file} 2>&1` }
+      work_contents = normalize_rspec_output(work_contents)
+
+      if base_contents == work_contents
+        puts "#{basename}: OK"
+      else
+        puts "#{basename}: FAIL"
+
+        File.write(base, base_contents)
+        File.write(work, work_contents)
+
+        unbundled { sh "integration/runner -Ilib bin/ldiff -U #{base} #{work}" }
+      end
+    end
   end
 end
+
+desc "Run RSpec integration tests with diff-lcs 2.0"
+task integration: ["integration:compare"] do
+  sh "rspec -Ilib -r diff/lcs integration/*_spec.rb"
+end

data/SECURITY.md

@@ -1,41 +1,36 @@
 # diff-lcs Security
 
+## LLM-Generated Security Report Policy
+
+Absolutely no security reports will be accepted that have been generated by LLM
+agents.
+
 ## Supported Versions
 
-Security reports are accepted for the most recent major release and the previous
-version for a limited time after the initial major release version. After a
-major release, the previous version will receive full support for six months and
-security support for an additional six months (for a total of twelve months).
+Security reports are accepted for the most recent major release, with a limited
+window of support after the initial major release.
 
-Because diff-lcs 1.x supports a wide range of Ruby versions, security reports
-will only be accepted when they can be demonstrated on Ruby 3.1 or higher.
+- Bug reports will be accepted up to three months after release.
+- Security reports will be accepted up to six months after release.
 
-> [!information]
->
-> There will be a diff-lcs 2.0 released in 2025 which narrows support to modern
-> versions of Ruby only.
+All issues raised must be demonstrated on the minimum supported Ruby version.
+
+> [!important]
 >
-> | Release Date | Support Ends | Security Support Ends |
-> | ------------ | ------------ | --------------------- |
-> | 2025         | +6 months    | +12 months            |
+> Because diff-lcs 1 has been the only version for over twenty years, security
+> reports will be accepted for one year after the release of diff-lcs 2.
 >
-> If the 2.0.0 release happens on 2025-07-01, regular support for diff-lcs 1.x
-> will end on 2026-12-31 and security support for diff-lcs 1.x will end on
-> 2026-06-30.
+> | Version | Release Date | Support Ends | Security Support Ends |
+> | ------- | ------------ | ------------ | --------------------- |
+> | 1.x     | 2010         | 2026-05-01   | 2027-02-01            |
+> | 2.x     | 2026-02-01   | -            | -                     |
 
 ## Reporting a Vulnerability
 
-By preference, use the [Tidelift security contact][tidelift]. Tidelift will
-coordinate the fix and disclosure.
-
-Alternatively, Send an email to [diff-lcs@halostatue.ca][email] with the text
-`Diff::LCS` in the subject. Emails sent to this address should be encrypted
-using [age][age] with the following public key:
+Report vulnerabilities via the [Tidelift security contact][tidelift]. Tidelift
+will coordinate the fix and disclosure.
 
-```
-age1fc6ngxmn02m62fej5cl30lrvwmxn4k3q2atqu53aatekmnqfwumqj4g93w
-```
+Alternatively, create a [private vulnerability report][advisory] with GitHub.
 
+[advisory]: https://github.com/halostatue/diff-lcs/security/advisories/new
 [tidelift]: https://tidelift.com/security
-[email]: mailto:diff-lcs@halostatue.ca
-[age]: https://github.com/FiloSottile/age

data/integration/compare/array_diff_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+RSpec.describe "Array diff failure" do
+  it "shows diff for array with different elements" do
+    expected = ["apple", "banana", "cherry", "date", "elderberry"]
+    actual = ["apple", "blueberry", "cherry", "date", "elderberry"]
+
+    expect(actual).to eq(expected)
+  end
+end

data/integration/compare/hash_diff_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.describe "Hash diff failure" do
+  it "shows diff for nested hash mismatch" do
+    expected = {
+      name: "John",
+      age: 30,
+      address: {
+        city: "New York",
+        zip: "10001"
+      }
+    }
+
+    actual = {
+      name: "John",
+      age: 35,
+      address: {
+        city: "Boston",
+        zip: "10001"
+      }
+    }
+
+    expect(actual).to eq(expected)
+  end
+end

data/integration/compare/string_diff_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+RSpec.describe "String diff failure" do
+  it "shows diff for multiline string mismatch" do
+    expected = "line1\nline2\nline3\nline4\nline5\n"
+    actual = "line1\nchanged\nline3\nline4\nline5\n"
+
+    expect(actual).to eq(expected)
+  end
+end