diff-lcs 1.4.4 → 1.6.2

data/spec/traverse_sequences_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+require "spec_helper"
 
-describe 'Diff::LCS.traverse_sequences' do
-  describe 'callback with no finishers' do
-    describe 'over (seq1, seq2)' do
+describe "Diff::LCS.traverse_sequences" do
+  describe "callback with no finishers" do
+    describe "over (seq1, seq2)" do
       before(:each) do
         @callback_s1_s2 = simple_callback_no_finishers
         Diff::LCS.traverse_sequences(seq1, seq2, @callback_s1_s2)
@@ -13,27 +13,27 @@ describe 'Diff::LCS.traverse_sequences' do
         Diff::LCS.traverse_sequences(seq2, seq1, @callback_s2_s1)
       end
 
-      it 'has the correct LCS result on left-matches' do
+      it "has the correct LCS result on left-matches" do
         expect(@callback_s1_s2.matched_a).to eq(correct_lcs)
         expect(@callback_s2_s1.matched_a).to eq(correct_lcs)
       end
 
-      it 'has the correct LCS result on right-matches' do
+      it "has the correct LCS result on right-matches" do
         expect(@callback_s1_s2.matched_b).to eq(correct_lcs)
         expect(@callback_s2_s1.matched_b).to eq(correct_lcs)
       end
 
-      it 'has the correct skipped sequences with the left sequence' do
+      it "has the correct skipped sequences with the left sequence" do
         expect(@callback_s1_s2.discards_a).to eq(skipped_seq1)
         expect(@callback_s2_s1.discards_a).to eq(skipped_seq2)
       end
 
-      it 'has the correct skipped sequences with the right sequence' do
+      it "has the correct skipped sequences with the right sequence" do
         expect(@callback_s1_s2.discards_b).to eq(skipped_seq2)
         expect(@callback_s2_s1.discards_b).to eq(skipped_seq1)
       end
 
-      it 'does not have anything done markers from the left or right sequences' do
+      it "does not have anything done markers from the left or right sequences" do
         expect(@callback_s1_s2.done_a).to be_empty
         expect(@callback_s1_s2.done_b).to be_empty
         expect(@callback_s2_s1.done_a).to be_empty
@@ -41,64 +41,64 @@ describe 'Diff::LCS.traverse_sequences' do
       end
     end
 
-    describe 'over (hello, hello)' do
+    describe "over (hello, hello)" do
       before(:each) do
         @callback = simple_callback_no_finishers
         Diff::LCS.traverse_sequences(hello, hello, @callback)
       end
 
-      it 'has the correct LCS result on left-matches' do
-        expect(@callback.matched_a).to eq(hello.split(//))
+      it "has the correct LCS result on left-matches" do
+        expect(@callback.matched_a).to eq(hello.chars)
       end
 
-      it 'has the correct LCS result on right-matches' do
-        expect(@callback.matched_b).to eq(hello.split(//))
+      it "has the correct LCS result on right-matches" do
+        expect(@callback.matched_b).to eq(hello.chars)
       end
 
-      it 'has the correct skipped sequences with the left sequence', :only => true do
+      it "has the correct skipped sequences with the left sequence" do
         expect(@callback.discards_a).to be_empty
       end
 
-      it 'has the correct skipped sequences with the right sequence' do
+      it "has the correct skipped sequences with the right sequence" do
         expect(@callback.discards_b).to be_empty
       end
 
-      it 'does not have anything done markers from the left or right sequences' do
+      it "does not have anything done markers from the left or right sequences" do
         expect(@callback.done_a).to be_empty
         expect(@callback.done_b).to be_empty
       end
     end
 
-    describe 'over (hello_ary, hello_ary)' do
+    describe "over (hello_ary, hello_ary)" do
       before(:each) do
         @callback = simple_callback_no_finishers
         Diff::LCS.traverse_sequences(hello_ary, hello_ary, @callback)
       end
 
-      it 'has the correct LCS result on left-matches' do
+      it "has the correct LCS result on left-matches" do
         expect(@callback.matched_a).to eq(hello_ary)
       end
 
-      it 'has the correct LCS result on right-matches' do
+      it "has the correct LCS result on right-matches" do
         expect(@callback.matched_b).to eq(hello_ary)
       end
 
-      it 'has the correct skipped sequences with the left sequence' do
+      it "has the correct skipped sequences with the left sequence" do
         expect(@callback.discards_a).to be_empty
       end
 
-      it 'has the correct skipped sequences with the right sequence' do
+      it "has the correct skipped sequences with the right sequence" do
         expect(@callback.discards_b).to be_empty
       end
 
-      it 'does not have anything done markers from the left or right sequences' do
+      it "does not have anything done markers from the left or right sequences" do
         expect(@callback.done_a).to be_empty
         expect(@callback.done_b).to be_empty
       end
     end
   end
 
-  describe 'callback with finisher' do
+  describe "callback with finisher" do
     before(:each) do
       @callback_s1_s2 = simple_callback
       Diff::LCS.traverse_sequences(seq1, seq2, @callback_s1_s2)
@@ -106,34 +106,32 @@ describe 'Diff::LCS.traverse_sequences' do
       Diff::LCS.traverse_sequences(seq2, seq1, @callback_s2_s1)
     end
 
-    it 'has the correct LCS result on left-matches' do
+    it "has the correct LCS result on left-matches" do
       expect(@callback_s1_s2.matched_a).to eq(correct_lcs)
       expect(@callback_s2_s1.matched_a).to eq(correct_lcs)
     end
 
-    it 'has the correct LCS result on right-matches' do
+    it "has the correct LCS result on right-matches" do
       expect(@callback_s1_s2.matched_b).to eq(correct_lcs)
       expect(@callback_s2_s1.matched_b).to eq(correct_lcs)
     end
 
-    it 'has the correct skipped sequences for the left sequence' do
+    it "has the correct skipped sequences for the left sequence" do
       expect(@callback_s1_s2.discards_a).to eq(skipped_seq1)
       expect(@callback_s2_s1.discards_a).to eq(skipped_seq2)
     end
 
-    it 'has the correct skipped sequences for the right sequence' do
+    it "has the correct skipped sequences for the right sequence" do
       expect(@callback_s1_s2.discards_b).to eq(skipped_seq2)
       expect(@callback_s2_s1.discards_b).to eq(skipped_seq1)
     end
 
-    it 'has done markers differently-sized sequences' do
-      expect(@callback_s1_s2.done_a).to eq([['p', 9, 's', 10]])
+    it "has done markers differently-sized sequences" do
+      expect(@callback_s1_s2.done_a).to eq([["p", 9, "t", 11]])
       expect(@callback_s1_s2.done_b).to be_empty
 
-      # 20110731 I don't yet understand why this particular behaviour
-      # isn't transitive.
       expect(@callback_s2_s1.done_a).to be_empty
-      expect(@callback_s2_s1.done_b).to be_empty
+      expect(@callback_s2_s1.done_b).to eq([["t", 11, "p", 9]])
     end
   end
 end

metadata

@@ -1,57 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.6.2
 platform: ruby
 authors:
 - Austin Ziegler
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hoe-doofus
-  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: hoe-gemspec2
+  name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: hoe-git
+  name: hoe-halostatue
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hoe-rubygems
   requirement: !ruby/object:Gem::Requirement
@@ -112,42 +97,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 6.3.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '7'
 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
-  Diff::LCS::Change objects to be treated implicitly as arrays and fixes a
-  number of formatting issues.
+  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.
 
-  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.
+  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.
 email:
 - halostatue@gmail.com
 executables:
@@ -155,24 +132,27 @@ executables:
 - ldiff
 extensions: []
 extra_rdoc_files:
-- Code-of-Conduct.md
-- Contributing.md
-- History.md
-- License.md
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
+- CONTRIBUTORS.md
+- LICENCE.md
 - Manifest.txt
-- README.rdoc
+- README.md
+- SECURITY.md
 - docs/COPYING.txt
 - docs/artistic.txt
 files:
 - ".rspec"
-- Code-of-Conduct.md
-- Contributing.md
-- History.md
-- License.md
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
+- CONTRIBUTORS.md
+- LICENCE.md
 - Manifest.txt
-- README.rdoc
+- README.md
 - Rakefile
-- autotest/discover.rb
+- SECURITY.md
 - bin/htmldiff
 - bin/ldiff
 - docs/COPYING.txt
@@ -189,17 +169,86 @@ 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
+- 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
@@ -212,16 +261,17 @@ files:
 homepage: https://github.com/halostatue/diff-lcs
 licenses:
 - MIT
-- Artistic-2.0
-- GPL-2.0+
+- Artistic-1.0-Perl
+- GPL-2.0-or-later
 metadata:
   homepage_uri: https://github.com/halostatue/diff-lcs
+  changelog_uri: https://github.com/halostatue/diff-lcs/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/halostatue/diff-lcs
   bug_tracker_uri: https://github.com/halostatue/diff-lcs/issues
-post_install_message:
+  rubygems_mfa_required: 'true'
 rdoc_options:
 - "--main"
-- README.rdoc
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -235,8 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-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/Code-of-Conduct.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

data/Contributing.md

@@ -1,118 +0,0 @@
-## Contributing
-
-I value any contribution to Diff::LCS you can provide: a bug report, a
-feature request, or code contributions. Code contributions to Diff::LCS are
-especially <del>welcome</del>encouraged. Because Diff::LCS is a complex
-codebase, there are a few guidelines:
-
-- Code changes _will not_ be accepted without tests. The test suite is
-  written with [RSpec][].
-- Match my coding style.
-- Use a thoughtfully-named topic branch that contains your change. Rebase
-  your commits into logical chunks as necessary.
-- Use [quality commit messages][].
-- Do not change the version number; when your patch is accepted and a release
-  is made, the version will be updated at that point.
-- Submit a GitHub pull request with your changes.
-- New or changed behaviours require appropriate documentation.
-
-### Test Dependencies
-
-Diff::LCS uses Ryan Davis’s [Hoe][] to manage the release process, and it
-adds a number of rake tasks. You will mostly be interested in:
-
-```sh
-$ rake
-```
-
-which runs the tests the same way that:
-
-```sh
-$ rake spec
-```
-
-will do.
-
-To assist with the installation of the development dependencies, I have
-provided a Gemfile pointing to the (generated) `diff-lcs.gemspec` file. This
-will permit you to do:
-
-```sh
-$ bundle install
-```
-
-to get the development dependencies. If you aleady have `hoe` installed, you
-can accomplish the same thing with:
-
-```sh
-$ rake newb
-```
-
-This task will install any missing dependencies, run the tests/specs, and
-generate the RDoc.
-
-You can run tests with code coverage analysis by running:
-
-```sh
-$ rake spec:coverage
-```
-
-### Workflow
-
-Here's the most direct way to get your work merged into the project:
-
-- Fork the project.
-- Clone down 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.
-
-### Contributors
-
-- Austin Ziegler created Diff::LCS.
-
-Thanks to everyone else who has contributed code or bug reports to Diff::LCS:
-
-- @ginriki
-- @joshbronson
-- @kevinmook
-- @mckaz
-- Akinori Musha
-- Artem Ignatyev
-- Brandon Fish
-- Camille Drapier
-- Cédric Boutillier
-- Gregg Kellogg
-- Jagdeep Singh
-- Jason Gladish
-- Jon Rowe
-- Josef Strzibny
-- Josep (@apuratepp)
-- Josh Bronson
-- Jun Aruga
-- Kenichi Kamiya
-- Kensuke Nagae
-- Kevin Ansfield
-- Koichi Ito
-- Mark Friedgan
-- Michael Granger
-- Myron Marston
-- Nicolas Leger
-- Oleg Orlov
-- Paul Kunysch
-- Pete Higgins
-- Peter Wagenet
-- Philippe Lafoucrière
-- Ryan Lovelett
-- Scott Steele
-- Simon Courtois
-- Tomas Jura
-- Vít Ondruch
-
-[rspec]: http://rspec.info/documentation/
-[quality commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[hoe]: https://github.com/seattlerb/hoe