diff-lcs 1.6.2 → 2.0.0.beta.2

data/licenses/dco.txt

@@ -0,0 +1,34 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.

data/spec/hunk_spec.rb

@@ -2,82 +2,69 @@
 
 require "spec_helper"
 
-if String.method_defined?(:encoding)
-  require "diff/lcs/hunk"
+require "diff/lcs/hunk"
 
-  describe Diff::LCS::Hunk do
-    let(:old_data) { ["Tu a un carté avec {count} itéms".encode("UTF-16LE")] }
-    let(:new_data) { ["Tu a un carte avec {count} items".encode("UTF-16LE")] }
-    let(:pieces) { Diff::LCS.diff old_data, new_data }
-    let(:hunk) { Diff::LCS::Hunk.new(old_data, new_data, pieces[0], 3, 0) }
+describe Diff::LCS::Hunk do
+  let(:old_data) { ["Tu a un carté avec {count} itéms".encode("UTF-16LE")] }
+  let(:new_data) { ["Tu a un carte avec {count} items".encode("UTF-16LE")] }
+  let(:pieces) { Diff::LCS.diff old_data, new_data }
+  let(:hunk) { Diff::LCS::Hunk.new(old_data, new_data, pieces[0], 3, 0) }
 
-    it "produces a unified diff from the two pieces" do
-      expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
+  it "produces a unified diff from the two pieces" do
+    expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
         @@ -1 +1 @@
         -Tu a un carté avec {count} itéms
         +Tu a un carte avec {count} items
-      EXPECTED
+    EXPECTED
 
-      expect(hunk.diff(:unified)).to eq(expected)
-    end
+    expect(hunk.diff(:unified)).to eq(expected)
+  end
 
-    it "produces a unified diff from the two pieces (last entry)" do
-      expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
+  it "produces a unified diff from the two pieces (last entry)" do
+    expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
         @@ -1 +1 @@
         -Tu a un carté avec {count} itéms
         +Tu a un carte avec {count} items
         \
-      EXPECTED
+    EXPECTED
 
-      expect(hunk.diff(:unified, true)).to eq(expected)
-    end
+    expect(hunk.diff(:unified, true)).to eq(expected)
+  end
 
-    it "produces a context diff from the two pieces" do
-      expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
+  it "produces a context diff from the two pieces" do
+    expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
         ***************
         *** 1 ****
         ! Tu a un carté avec {count} itéms
         --- 1 ----
         ! Tu a un carte avec {count} items
-      EXPECTED
+    EXPECTED
 
-      expect(hunk.diff(:context)).to eq(expected)
-    end
+    expect(hunk.diff(:context)).to eq(expected)
+  end
 
-    it "produces an old diff from the two pieces" do
-      expected = <<-EXPECTED.gsub(/^ +/, "").encode("UTF-16LE").chomp
+  it "produces an old diff from the two pieces" do
+    expected = <<-EXPECTED.gsub(/^ +/, "").encode("UTF-16LE").chomp
         1c1
         < Tu a un carté avec {count} itéms
         ---
         > Tu a un carte avec {count} items
 
-      EXPECTED
-
-      expect(hunk.diff(:old)).to eq(expected)
-    end
-
-    it "produces a reverse ed diff from the two pieces" do
-      expected = <<-EXPECTED.gsub(/^ +/, "").encode("UTF-16LE").chomp
-        c1
-        Tu a un carte avec {count} items
-        .
-
-      EXPECTED
+    EXPECTED
 
-      expect(hunk.diff(:reverse_ed)).to eq(expected)
-    end
+    expect(hunk.diff(:old)).to eq(expected)
+  end
 
-    context "with empty first data set" do
-      let(:old_data) { [] }
+  context "with empty first data set" do
+    let(:old_data) { [] }
 
-      it "produces a unified diff" do
-        expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
+    it "produces a unified diff" do
+      expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
           @@ -0,0 +1 @@
           +Tu a un carte avec {count} items
-        EXPECTED
+      EXPECTED
 
-        expect(hunk.diff(:unified)).to eq(expected)
-      end
+      expect(hunk.diff(:unified)).to eq(expected)
     end
   end
 end

data/spec/lcs_spec.rb

@@ -31,26 +31,26 @@ describe Diff::LCS::Internals, ".lcs" do
   end
 end
 
-describe Diff::LCS, ".LCS" do
+describe Diff::LCS, ".lcs" do
   include Diff::LCS::SpecHelper::Matchers
 
-  it "returns the correct compacted values from Diff::LCS.LCS" do
-    res = Diff::LCS.LCS(seq1, seq2)
+  it "returns the correct compacted values from Diff::LCS.lcs" do
+    res = Diff::LCS.lcs(seq1, seq2)
     expect(res).to eq(correct_lcs)
     expect(res.compact).to eq(res)
   end
 
   it "is transitive" do
-    res = Diff::LCS.LCS(seq2, seq1)
+    res = Diff::LCS.lcs(seq2, seq1)
     expect(res).to eq(correct_lcs)
     expect(res.compact).to eq(res)
   end
 
   it "returns %W(h e l l o) with (hello, hello)" do
-    expect(Diff::LCS.LCS(hello, hello)).to eq(hello.chars)
+    expect(Diff::LCS.lcs(hello, hello)).to eq(hello.chars)
   end
 
   it "returns hello_ary with (hello_ary, hello_ary)" do
-    expect(Diff::LCS.LCS(hello_ary, hello_ary)).to eq(hello_ary)
+    expect(Diff::LCS.lcs(hello_ary, hello_ary)).to eq(hello_ary)
   end
 end

data/spec/ldiff_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe "bin/ldiff" do
     {:name => "diff.bin2", :left => "file1.bin", :right => "file2.bin", :diff => 1},
     {:name => "diff.chef", :left => "old-chef", :right => "new-chef", :diff => 1},
     {:name => "diff.chef2", :left => "old-chef2", :right => "new-chef2", :diff => 1}
-  ].product([nil, "-e", "-f", "-c", "-u"]).map { |(fixture, flag)|
+  ].product([nil, "-c", "-u"]).map { |(fixture, flag)|
     fixture = fixture.dup
     fixture[:flag] = flag
     fixture
@@ -27,11 +27,11 @@ RSpec.describe "bin/ldiff" do
   def self.test_ldiff(fixture)
     desc = [
       fixture[:flag],
-      "spec/fixtures/#{fixture[:left]}",
-      "spec/fixtures/#{fixture[:right]}",
+      "test/fixtures/#{fixture[:left]}",
+      "test/fixtures/#{fixture[:right]}",
       "#",
       "=>",
-      "spec/fixtures/ldiff/output.#{fixture[:name]}#{fixture[:flag]}"
+      "test/fixtures/ldiff/output.#{fixture[:name]}#{fixture[:flag]}"
     ].join(" ")
 
     it desc do
@@ -49,7 +49,7 @@ RSpec.describe "bin/ldiff" do
   def read_fixture(options, mode: "output", allow_missing: false)
     fixture = options.fetch(:name)
     flag = options.fetch(:flag)
-    name = "spec/fixtures/ldiff/#{mode}.#{fixture}#{flag}"
+    name = "test/fixtures/ldiff/#{mode}.#{fixture}#{flag}"
 
     return "" if !::File.exist?(name) && allow_missing
 
@@ -74,7 +74,7 @@ RSpec.describe "bin/ldiff" do
         ^
         [-+*]{3}
         \s*
-        spec/fixtures/(\S+)
+        test/fixtures/(\S+)
         \s*
         \d{4}-\d\d-\d\d
         \s*
@@ -82,7 +82,7 @@ RSpec.describe "bin/ldiff" do
         \s*
         (?:[-+]\d{4}|Z)
       }x,
-      '*** spec/fixtures/\1	0000-00-00 :00 =>:00 =>00.000000000 -0000'
+      '*** test/fixtures/\1	0000-00-00 :00 =>:00 =>00.000000000 -0000'
     )
   end
 
@@ -92,7 +92,7 @@ RSpec.describe "bin/ldiff" do
     right = options.fetch(:right)
 
     stdout, stderr = capture_subprocess_io do
-      system("ruby -Ilib bin/ldiff #{flag} spec/fixtures/#{left} spec/fixtures/#{right}")
+      system("ruby -Ilib bin/ldiff #{flag} test/fixtures/#{left} test/fixtures/#{right}")
     end
 
     [clean_data(stdout, flag), stderr, $?.exitstatus]

data/spec/spec_helper.rb

@@ -1,35 +1,27 @@
 # frozen_string_literal: true
 
-require "rubygems"
-require "pathname"
-
-require "psych" if RUBY_VERSION >= "1.9"
+$LOAD_PATH.unshift File.expand_path(__dir__, "../lib")
 
-if ENV["COVERAGE"]
-  require "simplecov"
-  require "simplecov-lcov"
+require "rubygems"
+require "simplecov"
+require "simplecov-lcov"
 
-  SimpleCov::Formatter::LcovFormatter.config do |config|
-    config.report_with_single_file = true
-    config.lcov_file_name = "lcov.info"
-  end
+require "diff/lcs"
 
-  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
+SimpleCov::Formatter::LcovFormatter.config do |config|
+  config.report_with_single_file = true
+  config.lcov_file_name = "lcov.info"
 end
 
-file = Pathname.new(__FILE__).expand_path
-path = file.parent
-parent = path.parent
-
-$:.unshift parent.join("lib")
+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
 
 module CaptureSubprocessIO
   def _synchronize
@@ -64,8 +56,6 @@ module CaptureSubprocessIO
   private :_capture_subprocess_io
 end
 
-require "diff-lcs"
-
 module Diff::LCS::SpecHelper
   def hello
     "hello"

data/test/fixtures/ldiff/output.diff-c

@@ -0,0 +1,7 @@
+*** test/fixtures/aX	2020-06-23 11:15:32.000000000 -0400
+--- test/fixtures/bXaX	2020-06-23 11:15:32.000000000 -0400
+***************
+*** 1 ****
+! aX
+--- 1 ----
+! bXaX

data/test/fixtures/ldiff/output.diff-u

@@ -0,0 +1,5 @@
+--- test/fixtures/aX	2020-06-23 11:15:32.000000000 -0400
++++ test/fixtures/bXaX	2020-06-23 11:15:32.000000000 -0400
+@@ -1 +1 @@
+-aX
++bXaX

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

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

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

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

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

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

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

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

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

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

data/{spec → test}/fixtures/ldiff/output.diff.chef-c

@@ -1,5 +1,5 @@
-*** spec/fixtures/old-chef	2020-06-23 23:18:20.000000000 -0400
---- spec/fixtures/new-chef	2020-06-23 23:18:20.000000000 -0400
+*** test/fixtures/old-chef	2020-06-23 23:18:20.000000000 -0400
+--- test/fixtures/new-chef	2020-06-23 23:18:20.000000000 -0400
 ***************
 *** 1,4 ****
   {

data/test/fixtures/ldiff/output.diff.chef-u

@@ -0,0 +1,9 @@
+--- test/fixtures/old-chef	2020-06-23 23:18:20.000000000 -0400
++++ test/fixtures/new-chef	2020-06-23 23:18:20.000000000 -0400
+@@ -1,4 +1,4 @@
+ {
+   "name": "x",
+-  "description": "hi"
++  "description": "lo"
+ }
+

data/{spec → test}/fixtures/ldiff/output.diff.chef2-c

@@ -1,5 +1,5 @@
-*** spec/fixtures/old-chef2	2020-06-30 09:43:35.000000000 -0400
---- spec/fixtures/new-chef2	2020-06-30 09:44:32.000000000 -0400
+*** test/fixtures/old-chef2	2020-06-30 09:43:35.000000000 -0400
+--- test/fixtures/new-chef2	2020-06-30 09:44:32.000000000 -0400
 ***************
 *** 1,5 ****
   recipe[a::default]

data/{spec → test}/fixtures/ldiff/output.diff.chef2-u

@@ -1,5 +1,5 @@
---- spec/fixtures/old-chef2	2020-06-30 09:43:35.000000000 -0400
-+++ spec/fixtures/new-chef2	2020-06-30 09:44:32.000000000 -0400
+--- test/fixtures/old-chef2	2020-06-30 09:43:35.000000000 -0400
++++ test/fixtures/new-chef2	2020-06-30 09:44:32.000000000 -0400
 @@ -1,5 +1,4 @@
  recipe[a::default]
 -recipe[b::default]

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

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

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

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

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

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

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

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

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

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

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

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

data/{spec → test}/fixtures/ldiff/output.diff.missing_new_line1-c

@@ -1,5 +1,5 @@
-*** 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
+*** test/fixtures/four_lines	2025-01-31 12:17:43.926013315 +0100
+--- test/fixtures/four_lines_with_missing_new_line	2025-01-31 12:17:43.926013315 +0100
 ***************
 *** 1,4 ****
   one

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

@@ -0,0 +1,9 @@
+--- test/fixtures/four_lines	2025-01-31 12:17:43.926013315 +0100
++++ test/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 → test}/fixtures/ldiff/output.diff.missing_new_line2-c

@@ -1,5 +1,5 @@
-*** 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
+*** test/fixtures/four_lines_with_missing_new_line	2025-01-31 12:17:43.926013315 +0100
+--- test/fixtures/four_lines	2025-01-31 12:17:43.926013315 +0100
 ***************
 *** 1,4 ****
   one

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

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

data/test/test_block.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+require "diff/lcs/block"
+
+class TestBlock < Minitest::Test
+  include Diff::LCS::TestHelper
+
+  def test_op_unchanged
+    block = Diff::LCS::Block.from_chunk([])
+    assert_equal "^", block.op
+  end
+
+  def test_op_delete
+    changes = [Diff::LCS::Change.new("-", 0, "a")]
+    block = Diff::LCS::Block.from_chunk(changes)
+    assert_equal "-", block.op
+  end
+
+  def test_op_insert
+    changes = [Diff::LCS::Change.new("+", 0, "a")]
+    block = Diff::LCS::Block.from_chunk(changes)
+    assert_equal "+", block.op
+  end
+
+  def test_op_conflict
+    changes = [
+      Diff::LCS::Change.new("-", 0, "a"),
+      Diff::LCS::Change.new("+", 0, "b")
+    ]
+    block = Diff::LCS::Block.from_chunk(changes)
+    assert_equal "!", block.op
+  end
+end