diff-lcs 1.4.4 → 1.5.1

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,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.1
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2024-01-31 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
@@ -39,19 +59,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: hoe-git
+  name: hoe-git2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: hoe-rubygems
   requirement: !ruby/object:Gem::Requirement
@@ -112,28 +132,20 @@ 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
@@ -172,7 +184,6 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- autotest/discover.rb
 - bin/htmldiff
 - bin/ldiff
 - docs/COPYING.txt
@@ -200,6 +211,21 @@ files:
 - spec/fixtures/ldiff/output.diff-e
 - spec/fixtures/ldiff/output.diff-f
 - spec/fixtures/ldiff/output.diff-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/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
@@ -213,11 +239,12 @@ homepage: https://github.com/halostatue/diff-lcs
 licenses:
 - MIT
 - Artistic-2.0
-- GPL-2.0+
+- GPL-2.0-or-later
 metadata:
   homepage_uri: https://github.com/halostatue/diff-lcs
   source_code_uri: https://github.com/halostatue/diff-lcs
   bug_tracker_uri: https://github.com/halostatue/diff-lcs/issues
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
 - "--main"
@@ -235,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Diff::LCS computes the difference between two Enumerable sequences using

data/autotest/discover.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-Autotest.add_discovery { 'rspec2' }