diff-lcs 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5809a8a19bbbf227168d81fa0dcfe681aff17a494b16cd6af723f7dd665ed0d0
-  data.tar.gz: 844c07fe8cdc69183f0c0bb8f16cdfadae58d099eb3ab5927ac2aa9b50133948
+  metadata.gz: bb036eaab7330d135a91816336705b672bcc3d3fc55b235392f0b0d2faaf2e76
+  data.tar.gz: d55364ad8b6a75e697ad90aaffac2d14168c8ef5710b4999d264775de0a220af
 SHA512:
-  metadata.gz: 219465ac1abcd2636a39e4425a0a84d64759b6818fa7b885ebfdd941af52344658568b52485c343e74b6dab7a300cf2109a38094ff94aca3f51bef31a3e13987
-  data.tar.gz: '082bd353ec1fb53cb848a435162ed9dd152f526cab697353de8fd8b9b319fdd319d90a7b1ec45f1259f2cf525fe81aba88f892c43712ff92d09da411391ace76'
+  metadata.gz: ca32f0e74df9eaab1530842477fca4cbcd730fde728dfeefd8d6e6f212e8ed0086e7cd288a1fb8e2a79ebed18591cda677ddce75ed2bd0863620993ba34aa553
+  data.tar.gz: 2ce80458cd347340b44d8d5cf56c7e11ee145f93559641233ce928bb7ac54e9966a07904e52e1f46f975714b13f28d70832d762185e3d7e867d8caff5fc14ad3

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 1.6.1 / 2025-03-25
+
+- Performed further work on `Diff::LCS::Ldiff` improvements ([#46][issue-46])
+  and resolve several thread safety issues cleanly by making it a class.
+  [#129][pull-129]
+
+- Restructure the project to be more consistent with the rest of the projects
+  that I manage.
+
+- Increased GitHub action security.
+
+- Added [trusted publishing][tp] for fully automated releases.
+
 ## 1.6.0 / 2025-02-13
 
 - Baptiste Courtois (@annih) has done significant work on making `bin/ldiff`
@@ -481,6 +494,7 @@
 [pull-103]: https://github.com/halostatue/diff-lcs/pull/103
 [pull-104]: https://github.com/halostatue/diff-lcs/pull/104
 [pull-105]: https://github.com/halostatue/diff-lcs/pull/105
+[pull-129]: https://github.com/halostatue/diff-lcs/pull/129
 [rspec-expectations#200]: https://github.com/rspec/rspec-expectations/pull/200
 [rspec-expectations#219]: https://github.com/rspec/rspec-expectations/issues/219
 [rspec-expectations#238]: https://github.com/rspec/rspec-expectations/issues/238
@@ -489,3 +503,4 @@
 [rubinius#2268]: https://github.com/rubinius/rubinius/issues/2268
 [standard ruby]: https://github.com/standardrb/standard
 [tidelift]: https://tidelift.com/security
+[tp]: https://guides.rubygems.org/trusted-publishing/

data/CONTRIBUTING.md

@@ -2,6 +2,7 @@
 
 Contribution to diff-lcs is encouraged in any form: a bug report, a feature
 request, or code contributions. There are a few DOs and DON'Ts for
+contributions.
 
 - DO:
 
@@ -17,16 +18,19 @@ request, or code contributions. There are a few DOs and DON'Ts for
     `CHANGELOG.md` as a separate commit from your main change. (Follow the style
     in the `CHANGELOG.md` and provide a link to your PR.)
 
-  - Add or update tests, written in [RSpec][rspec], as appropriate.
+  - Add or update tests as appropriate for your change. The test suite is
+    written in [RSpec][rspec].
 
-  - Add or update documentation, as appropriate.
+  - Add or update documentation as appropriate for your change. The
+    documentation is RDoc; diff-lcs does not use extensions that may be present
+    in alternative documentation generators.
 
 - DO NOT:
 
-  - Modify `VERSION` in `lib/diff/lcs.rb`. When your patch is accepted and a
-    release is made, the version will be updated at that point.
+  - Modify `VERSION` in `lib/diff/lcs/version.rb`. When your patch is accepted
+    and a release is made, the version will be updated at that point.
 
-  - Modify `diff-lcs.gemspect`; it is a generated file. (You _may_ use
+  - Modify `diff-lcs.gemspec`; it is a generated file. (You _may_ use
     `rake gemspec` to regenerate it if your change involves metadata related to
     gem itself).
 
@@ -60,13 +64,6 @@ Here's the most direct way to get your work merged into the project:
 - Create a pull request against halostatue/diff-lcs and describe what your
   change does and the why you think it should be merged.
 
-### Help Wanted
-
-I want to automated the releases. I am **not** switching from Hoe for release
-management, so the use of [rubygems/release-gem][release-gem] requires some care
-(perhaps by exporting `VERSION=$(rake version)` to the job), but assistance in
-getting this action going for an automated release would be greatly appreciated.
-
 [hoe]: https://github.com/seattlerb/hoe
 [qcm]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [release-gem]: https://github.com/rubygems/release-gem

data/LICENCE.md

@@ -1,15 +1,15 @@
-# License
+# 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.
+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–2013 Austin Ziegler.
-* Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by
+- Copyright 2004–2025 Austin Ziegler and contributors.
+- Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by
   Mario I. Wolczko.
 
 ## MIT License
@@ -17,20 +17,19 @@ licensing terms.
 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:
+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.
+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.
 
 ## Perl Artistic License
 

data/Manifest.txt

@@ -3,7 +3,6 @@ CHANGELOG.md
 CODE_OF_CONDUCT.md
 CONTRIBUTING.md
 CONTRIBUTORS.md
-Contributing.md
 LICENCE.md
 Manifest.txt
 README.md
@@ -25,17 +24,46 @@ 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
 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
@@ -47,6 +75,31 @@ 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

data/Rakefile

@@ -4,12 +4,14 @@ require "rspec/core/rake_task"
 require "hoe"
 require "rake/clean"
 
-Hoe.plugin :cov
-Hoe.plugin :doofus
-Hoe.plugin :gemspec2
-Hoe.plugin :git2
+Hoe.plugin :halostatue
 Hoe.plugin :rubygems
 
+Hoe.plugins.delete :debug
+Hoe.plugins.delete :newb
+Hoe.plugins.delete :publish
+Hoe.plugins.delete :signing
+
 if RUBY_VERSION < "1.9"
   class Array # :nodoc:
     def to_h
@@ -35,21 +37,20 @@ end
 _spec = Hoe.spec "diff-lcs" do
   developer("Austin Ziegler", "halostatue@gmail.com")
 
+  self.trusted_release = ENV["rubygems_release_gem"] == "true"
+
+  require_ruby_version ">= 1.8"
+
   self.history_file = "CHANGELOG.md"
   self.readme_file = "README.md"
   self.licenses = ["MIT", "Artistic-1.0-Perl", "GPL-2.0-or-later"]
 
-  require_ruby_version ">= 1.8"
-
   spec_extras[:metadata] = ->(val) {
     val["rubygems_mfa_required"] = "true"
-    val["changelog_uri"] = "https://github.com/halostatue/diff-lcs/blob/main/CHANGELOG.md"
   }
 
-  extra_dev_deps << ["hoe", ">= 3.0", "< 5"]
-  extra_dev_deps << ["hoe-doofus", "~> 1.0"]
-  extra_dev_deps << ["hoe-gemspec2", "~> 1.1"]
-  extra_dev_deps << ["hoe-git2", "~> 1.7"]
+  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 << ["rake", ">= 10.0", "< 14"]
@@ -69,11 +70,11 @@ task :default => :spec unless Rake::Task["default"].prereqs.include?("spec")
 task :test => :spec unless Rake::Task["test"].prereqs.include?("spec")
 # standard:enable Style/HashSyntax
 
-if RUBY_VERSION >= "2.0" && RUBY_ENGINE == "ruby"
+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"] = "yes"
+      ENV["COVERAGE"] = "true"
       Rake::Task["spec"].execute
     end
   end

data/lib/diff/lcs/ldiff.rb

@@ -3,11 +3,11 @@
 require "optparse"
 require "diff/lcs/hunk"
 
-module Diff::LCS::Ldiff # :nodoc:
+class Diff::LCS::Ldiff # :nodoc:
   # standard:disable Layout/HeredocIndentation
   BANNER = <<-COPYRIGHT
 ldiff #{Diff::LCS::VERSION}
-  Copyright 2004-2019 Austin Ziegler
+  Copyright 2004-2025 Austin Ziegler
 
   Part of Diff::LCS.
   https://github.com/halostatue/diff-lcs
@@ -24,15 +24,21 @@ ldiff #{Diff::LCS::VERSION}
     end
   end
 
-  class << self
-    attr_reader :format, :lines # :nodoc:
-    attr_reader :file_old, :file_new # :nodoc:
-    attr_reader :data_old, :data_new # :nodoc:
+  attr_reader :format, :lines # :nodoc:
+  attr_reader :file_old, :file_new # :nodoc:
+  attr_reader :data_old, :data_new # :nodoc:
+
+  def self.run(args, input = $stdin, output = $stdout, error = $stderr) # :nodoc:
+    new.run(args, input, output, error)
   end
 
-  def self.run(args, _input = $stdin, output = $stdout, error = $stderr) # :nodoc:
+  def initialize
     @binary = nil
+    @format = :old
+    @lines = 0
+  end
 
+  def run(args, _input = $stdin, output = $stdout, error = $stderr) # :nodoc:
     args.options do |o|
       o.banner = "Usage: #{File.basename($0)} [options] oldfile newfile"
       o.separator ""
@@ -101,7 +107,7 @@ ldiff #{Diff::LCS::VERSION}
     ) ? 1 : 0
   end
 
-  def self.diff?(info_old, info_new, format, output, binary: nil, lines: 0)
+  def diff?(info_old, info_new, format, output, binary: nil, lines: 0)
     case format
     when :context
       char_old = "*" * 3

data/lib/diff/lcs/version.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Diff
+  module LCS
+    VERSION = "1.6.1"
+  end
+end

data/lib/diff/lcs.rb

@@ -49,9 +49,9 @@ module Diff; end unless defined? Diff
 #          a x b y c z p d q
 #    a b c a x b y c z
 module Diff::LCS
-  VERSION = "1.6.0"
 end
 
+require "diff/lcs/version"
 require "diff/lcs/callbacks"
 require "diff/lcs/internals"
 

data/mise.toml

@@ -0,0 +1,5 @@
+[tools]
+ruby = "3.4"
+
+[env]
+MAINTENANCE = "true"

data/spec/fixtures/123_x

@@ -0,0 +1,2 @@
+123
+x

data/spec/fixtures/456_x

@@ -0,0 +1,2 @@
+456
+x

data/spec/fixtures/four_lines

@@ -0,0 +1,4 @@
+one
+two
+three
+four

data/spec/fixtures/four_lines_with_missing_new_line

@@ -0,0 +1,4 @@
+one
+two
+three
+four

data/spec/fixtures/ldiff/diff.missing_new_line1-e

@@ -0,0 +1 @@
+No newline at end of file

data/spec/fixtures/ldiff/diff.missing_new_line1-f

@@ -0,0 +1 @@
+No newline at end of file

data/spec/fixtures/ldiff/diff.missing_new_line2-e

@@ -0,0 +1 @@
+No newline at end of file

data/spec/fixtures/ldiff/diff.missing_new_line2-f

@@ -0,0 +1 @@
+No newline at end of file

data/spec/fixtures/ldiff/error.diff.chef-e

@@ -0,0 +1,2 @@
+<old_file>: No newline at end of file
+<new_file>: No newline at end of file

data/spec/fixtures/ldiff/error.diff.chef-f

@@ -0,0 +1,2 @@
+<old_file>: No newline at end of file
+<new_file>: No newline at end of file

data/spec/fixtures/ldiff/error.diff.missing_new_line1-e

@@ -0,0 +1 @@
+<new_file>: No newline at end of file

data/spec/fixtures/ldiff/error.diff.missing_new_line1-f

@@ -0,0 +1 @@
+<new_file>: No newline at end of file

data/spec/fixtures/ldiff/error.diff.missing_new_line2-e

@@ -0,0 +1 @@
+<old_file>: No newline at end of file

data/spec/fixtures/ldiff/error.diff.missing_new_line2-f

@@ -0,0 +1 @@
+<old_file>: No newline at end of file

data/spec/fixtures/ldiff/output.diff.bin2

@@ -0,0 +1 @@
+Binary files spec/fixtures/file1.bin and spec/fixtures/file2.bin differ

data/spec/fixtures/ldiff/output.diff.bin2-c

@@ -0,0 +1 @@
+Binary files spec/fixtures/file1.bin and spec/fixtures/file2.bin differ

data/spec/fixtures/ldiff/output.diff.bin2-e

@@ -0,0 +1 @@
+Binary files spec/fixtures/file1.bin and spec/fixtures/file2.bin differ

data/spec/fixtures/ldiff/output.diff.bin2-f

@@ -0,0 +1 @@
+Binary files spec/fixtures/file1.bin and spec/fixtures/file2.bin differ

data/spec/fixtures/ldiff/output.diff.bin2-u

@@ -0,0 +1 @@
+Binary files spec/fixtures/file1.bin and spec/fixtures/file2.bin differ

data/spec/fixtures/ldiff/output.diff.empty.vs.four_lines

@@ -0,0 +1,5 @@
+0a1,4
+> one
+> two
+> three
+> four

data/spec/fixtures/ldiff/output.diff.empty.vs.four_lines-c

@@ -0,0 +1,9 @@
+*** spec/fixtures/empty	2025-01-31 12:14:52.856031635 +0100
+--- spec/fixtures/four_lines	2025-01-31 12:13:45.476036544 +0100
+***************
+*** 0 ****
+--- 1,4 ----
++ one
++ two
++ three
++ four

data/spec/fixtures/ldiff/output.diff.empty.vs.four_lines-e

@@ -0,0 +1,6 @@
+0a
+one
+two
+three
+four
+.

data/spec/fixtures/ldiff/output.diff.empty.vs.four_lines-f

@@ -0,0 +1,6 @@
+a0
+one
+two
+three
+four
+.

data/spec/fixtures/ldiff/output.diff.empty.vs.four_lines-u

@@ -0,0 +1,7 @@
+--- spec/fixtures/empty	2025-01-31 12:14:52.856031635 +0100
++++ spec/fixtures/four_lines	2025-01-31 12:13:45.476036544 +0100
+@@ -0,0 +1,4 @@
++one
++two
++three
++four

data/spec/fixtures/ldiff/output.diff.four_lines.vs.empty

@@ -0,0 +1,5 @@
+1,4d0
+< one
+< two
+< three
+< four

data/spec/fixtures/ldiff/output.diff.four_lines.vs.empty-c

@@ -0,0 +1,9 @@
+*** spec/fixtures/four_lines	2025-01-31 12:13:45.476036544 +0100
+--- spec/fixtures/empty	2025-01-31 12:14:52.856031635 +0100
+***************
+*** 1,4 ****
+- one
+- two
+- three
+- four
+--- 0 ----

data/spec/fixtures/ldiff/output.diff.four_lines.vs.empty-e

@@ -0,0 +1 @@
+1,4d

data/spec/fixtures/ldiff/output.diff.four_lines.vs.empty-f

@@ -0,0 +1 @@
+d1 4

data/spec/fixtures/ldiff/output.diff.four_lines.vs.empty-u

@@ -0,0 +1,7 @@
+--- spec/fixtures/four_lines	2025-01-31 12:13:45.476036544 +0100
++++ spec/fixtures/empty	2025-01-31 12:14:52.856031635 +0100
+@@ -1,4 +0,0 @@
+-one
+-two
+-three
+-four

data/spec/fixtures/ldiff/output.diff.issue95_trailing_context

@@ -0,0 +1,4 @@
+1c1
+< 123
+---
+> 456

data/spec/fixtures/ldiff/output.diff.issue95_trailing_context-c

@@ -0,0 +1,9 @@
+*** spec/fixtures/123_x	2025-01-31 17:00:17.070615716 +0100
+--- spec/fixtures/456_x	2025-01-31 16:58:26.380624827 +0100
+***************
+*** 1,2 ****
+! 123
+  x
+--- 1,2 ----
+! 456
+  x

data/spec/fixtures/ldiff/output.diff.issue95_trailing_context-e

@@ -0,0 +1,3 @@
+1c
+456
+.

data/spec/fixtures/ldiff/output.diff.issue95_trailing_context-f

@@ -0,0 +1,3 @@
+c1
+456
+.

data/spec/fixtures/ldiff/output.diff.issue95_trailing_context-u

@@ -0,0 +1,6 @@
+--- spec/fixtures/123_x	2025-01-31 17:00:17.070615716 +0100
++++ spec/fixtures/456_x	2025-01-31 16:58:26.380624827 +0100
+@@ -1,2 +1,2 @@
+-123
++456
+ x

data/spec/fixtures/ldiff/output.diff.missing_new_line1

@@ -0,0 +1,5 @@
+4c4
+< four
+---
+> four
+

data/spec/fixtures/ldiff/output.diff.missing_new_line1-c

@@ -0,0 +1,14 @@
+*** spec/fixtures/four_lines	2025-01-31 12:17:43.926013315 +0100
+--- spec/fixtures/four_lines_with_missing_new_line	2025-01-31 12:17:43.926013315 +0100
+***************
+*** 1,4 ****
+  one
+  two
+  three
+! four
+--- 1,4 ----
+  one
+  two
+  three
+! four
+

data/spec/fixtures/ldiff/output.diff.missing_new_line1-u

@@ -0,0 +1,9 @@
+--- spec/fixtures/four_lines	2025-01-31 12:17:43.926013315 +0100
++++ spec/fixtures/four_lines_with_missing_new_line	2025-01-31 12:17:43.926013315 +0100
+@@ -1,4 +1,4 @@
+ one
+ two
+ three
+-four
++four
+

data/spec/fixtures/ldiff/output.diff.missing_new_line2

@@ -0,0 +1,5 @@
+4c4
+< four
+
+---
+> four

data/spec/fixtures/ldiff/output.diff.missing_new_line2-c

@@ -0,0 +1,14 @@
+*** spec/fixtures/four_lines_with_missing_new_line	2025-01-31 12:17:43.926013315 +0100
+--- spec/fixtures/four_lines	2025-01-31 12:17:43.926013315 +0100
+***************
+*** 1,4 ****
+  one
+  two
+  three
+! four
+
+--- 1,4 ----
+  one
+  two
+  three
+! four

data/spec/fixtures/ldiff/output.diff.missing_new_line2-u

@@ -0,0 +1,9 @@
+--- spec/fixtures/four_lines_with_missing_new_line	2025-01-31 12:17:43.926013315 +0100
++++ spec/fixtures/four_lines	2025-01-31 12:17:43.926013315 +0100
+@@ -1,4 +1,4 @@
+ one
+ two
+ three
+-four
+
++four

data/spec/spec_helper.rb

@@ -7,28 +7,21 @@ require "psych" if RUBY_VERSION >= "1.9"
 
 if ENV["COVERAGE"]
   require "simplecov"
+  require "simplecov-lcov"
 
-  def require_do(resource)
-    require resource
-    yield if block_given?
-  rescue LoadError
-    nil
+  SimpleCov::Formatter::LcovFormatter.config do |config|
+    config.report_with_single_file = true
+    config.lcov_file_name = "lcov.info"
   end
 
-  formatters = [SimpleCov::Formatter::HTMLFormatter]
-
-  require_do("simplecov-rcov") {
-    formatters << SimpleCov::Formatter::RcovFormatter
-  }
-  require_do("simplecov-vim/formatter") {
-    formatters << SimpleCov::Formatter::VimFormatter
-  }
-  require_do("simplecov-sublime-ruby-coverage") {
-    formatters << SimpleCov::Formatter::SublimeRubyCoverageFormatter
-  }
-
-  SimpleCov.start do
-    formatter SimpleCov::Formatter::MultiFormatter.new(formatters)
+  SimpleCov.start "test_frameworks" do
+    enable_coverage :branch
+    primary_coverage :branch
+    formatter SimpleCov::Formatter::MultiFormatter.new([
+      SimpleCov::Formatter::HTMLFormatter,
+      SimpleCov::Formatter::LcovFormatter,
+      SimpleCov::Formatter::SimpleFormatter
+    ])
   end
 end
 
@@ -250,100 +243,107 @@ module Diff::LCS::SpecHelper
     new_result
   end
 
-  def simple_callback
-    callbacks = Object.new
-    class << callbacks
-      attr_reader :matched_a
-      attr_reader :matched_b
-      attr_reader :discards_a
-      attr_reader :discards_b
-      attr_reader :done_a
-      attr_reader :done_b
-
-      def reset
-        @matched_a = []
-        @matched_b = []
-        @discards_a = []
-        @discards_b = []
-        @done_a = []
-        @done_b = []
-      end
+  class SimpleCallback
+    def initialize
+      reset
+    end
 
-      def match(event)
-        @matched_a << event.old_element
-        @matched_b << event.new_element
-      end
+    attr_reader :matched_a
+    attr_reader :matched_b
+    attr_reader :discards_a
+    attr_reader :discards_b
+    attr_reader :done_a
+    attr_reader :done_b
+
+    def reset
+      @matched_a = []
+      @matched_b = []
+      @discards_a = []
+      @discards_b = []
+      @done_a = []
+      @done_b = []
+      self
+    end
 
-      def discard_b(event)
-        @discards_b << event.new_element
-      end
+    def match(event)
+      @matched_a << event.old_element
+      @matched_b << event.new_element
+    end
 
-      def discard_a(event)
-        @discards_a << event.old_element
-      end
+    def discard_b(event)
+      @discards_b << event.new_element
+    end
 
-      def finished_a(event)
-        @done_a << [
-          event.old_element, event.old_position,
-          event.new_element, event.new_position
-        ]
-      end
+    def discard_a(event)
+      @discards_a << event.old_element
+    end
 
-      def finished_b(event)
-        @done_b << [
-          event.old_element, event.old_position,
-          event.new_element, event.new_position
-        ]
-      end
+    def finished_a(event)
+      @done_a << [
+        event.old_element, event.old_position,
+        event.new_element, event.new_position
+      ]
+    end
+
+    def finished_b(event)
+      @done_b << [
+        event.old_element, event.old_position,
+        event.new_element, event.new_position
+      ]
     end
-    callbacks.reset
-    callbacks
+  end
+
+  def simple_callback
+    SimpleCallback.new
+  end
+
+  class SimpleCallbackNoFinishers < SimpleCallback
+    undef :finished_a
+    undef :finished_b
   end
 
   def simple_callback_no_finishers
-    simple = simple_callback
-    class << simple
-      undef :finished_a
-      undef :finished_b
-    end
-    simple
+    SimpleCallbackNoFinishers.new
   end
 
-  def balanced_callback
-    cb = Object.new
-    class << cb
-      attr_reader :result
+  class BalancedCallback
+    def initialize
+      reset
+    end
 
-      def reset
-        @result = []
-      end
+    attr_reader :result
 
-      def match(event)
-        @result << ["=", event.old_position, event.new_position]
-      end
+    def reset
+      @result = []
+    end
 
-      def discard_a(event)
-        @result << ["<", event.old_position, event.new_position]
-      end
+    def match(event)
+      @result << ["=", event.old_position, event.new_position]
+    end
 
-      def discard_b(event)
-        @result << [">", event.old_position, event.new_position]
-      end
+    def discard_a(event)
+      @result << ["<", event.old_position, event.new_position]
+    end
 
-      def change(event)
-        @result << ["!", event.old_position, event.new_position]
-      end
+    def discard_b(event)
+      @result << [">", event.old_position, event.new_position]
     end
-    cb.reset
-    cb
+
+    def change(event)
+      @result << ["!", event.old_position, event.new_position]
+    end
+  end
+
+  def balanced_callback
+    BalancedCallback.new
+  end
+
+  class BalancedCallbackNoChange < BalancedCallback
+    undef :change
   end
 
   def balanced_callback_no_change
-    balanced = balanced_callback
-    class << balanced
-      undef :change
-    end
-    balanced
+    BalancedCallbackNoChange.new
   end
 
   module Matchers

metadata

@@ -1,77 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Austin Ziegler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: hoe-doofus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-gemspec2
+  name: hoe-halostatue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: hoe-git2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hoe-rubygems
   requirement: !ruby/object:Gem::Requirement
@@ -146,20 +111,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
 description: |-
   Diff::LCS computes the difference between two Enumerable sequences using the
   McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities
@@ -185,7 +136,6 @@ extra_rdoc_files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
-- Contributing.md
 - LICENCE.md
 - Manifest.txt
 - README.md
@@ -198,7 +148,6 @@ files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
-- Contributing.md
 - LICENCE.md
 - Manifest.txt
 - README.md
@@ -220,17 +169,46 @@ files:
 - lib/diff/lcs/internals.rb
 - lib/diff/lcs/ldiff.rb
 - lib/diff/lcs/string.rb
+- lib/diff/lcs/version.rb
+- mise.toml
 - 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
@@ -242,6 +220,31 @@ files:
 - 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
@@ -261,9 +264,11 @@ licenses:
 - Artistic-1.0-Perl
 - GPL-2.0-or-later
 metadata:
-  rubygems_mfa_required: 'true'
+  homepage_uri: https://github.com/halostatue/diff-lcs
   changelog_uri: https://github.com/halostatue/diff-lcs/blob/main/CHANGELOG.md
-post_install_message:
+  source_code_uri: https://github.com/halostatue/diff-lcs
+  bug_tracker_uri: https://github.com/halostatue/diff-lcs/issues
+  rubygems_mfa_required: 'true'
 rdoc_options:
 - "--main"
 - README.md
@@ -280,8 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Diff::LCS computes the difference between two Enumerable sequences using
   the McIlroy-Hunt longest common subsequence (LCS) algorithm

data/Contributing.md

@@ -1,74 +0,0 @@
-# Contributing
-
-Contribution to diff-lcs is encouraged in any form: a bug report, a feature
-request, or code contributions. There are a few DOs and DON'Ts for
-
-- DO:
-
-  - Keep the coding style that already exists for any updated Ruby code (support
-    or otherwise). I use [Standard Ruby][standardrb] for linting and formatting.
-
-  - Use thoughtfully-named topic branches for contributions. Rebase your commits
-    into logical chunks as necessary.
-
-  - Use [quality commit messages][qcm].
-
-  - Add your name or GitHub handle to `CONTRIBUTORS.md` and a record in the
-    `CHANGELOG.md` as a separate commit from your main change. (Follow the style
-    in the `CHANGELOG.md` and provide a link to your PR.)
-
-  - Add or update tests, written in [RSpec][rspec], as appropriate.
-
-  - Add or update documentation, as appropriate.
-
-- DO NOT:
-
-  - Modify `VERSION` in `lib/diff/lcs.rb`. When your patch is accepted and a
-    release is made, the version will be updated at that point.
-
-  - Modify `diff-lcs.gemspect`; it is a generated file. (You _may_ use
-    `rake gemspec` to regenerate it if your change involves metadata related to
-    gem itself).
-
-  - Modify the `Gemfile`.
-
-## Test Dependencies
-
-diff-lcs uses Ryan Davis's [Hoe][Hoe] to manage the release process, and it adds
-a number of rake tasks. You will mostly be interested in `rake`, which runs
-tests in the same way that `rake spec` does.
-
-To assist with the installation of the development dependencies for diff-lcs, I
-have provided a Gemfile pointing to the (generated) `diff-lcs.gemspec` file.
-`minitar.gemspec` file. This will permit you to use `bundle install` to install
-the dependencies.
-
-You can run tests with code coverage analysis by running `rake spec:coverage`.
-
-## Workflow
-
-Here's the most direct way to get your work merged into the project:
-
-- Fork the project.
-- Clone your fork (`git clone git://github.com/<username>/diff-lcs.git`).
-- Create a topic branch to contain your change
-  (`git checkout -b my_awesome_feature`).
-- Hack away, add tests. Not necessarily in that order.
-- Make sure everything still passes by running `rake`.
-- If necessary, rebase your commits into logical chunks, without errors.
-- Push the branch up (`git push origin my_awesome_feature`).
-- Create a pull request against halostatue/diff-lcs and describe what your
-  change does and the why you think it should be merged.
-
-### Help Wanted
-
-I want to automated the releases. I am **not** switching from Hoe for release
-management, so the use of [rubygems/release-gem][release-gem] requires some care
-(perhaps by exporting `VERSION=$(rake version)` to the job), but assistance in
-getting this action going for an automated release would be greatly appreciated.
-
-[hoe]: https://github.com/seattlerb/hoe
-[qcm]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[release-gem]: https://github.com/rubygems/release-gem
-[rspec]: http://rspec.info/documentation/
-[standardrb]: https://github.com/standardrb/standard