diff-lcs 1.6.0 → 1.6.2

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.2
 platform: ruby
 authors:
 - Austin Ziegler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-05-12 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,26 +111,12 @@ 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
   to create a simple HTML diff output format and a standard diff-like tool.
 
-  This is release 1.4.3, providing a simple extension that allows for
+  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.
 
@@ -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