diff-lcs 2.0.0.beta.1 → 2.0.0.beta.2

data/lib/diff/lcs/change.rb

@@ -10,7 +10,7 @@ class Diff::LCS::Change
   # (changed), '<' (tail changes from first sequence), or '>' (tail changes from second
   # sequence). The last two ('<>') are only found with Diff::LCS::diff and
   # Diff::LCS::sdiff.
-  VALID_ACTIONS = %w[+ - = ! > <].freeze
+  VALID_ACTIONS = %w[= - + ! > <].freeze
 
   def self.valid_action?(action) = VALID_ACTIONS.include?(action)
 
@@ -37,6 +37,9 @@ class Diff::LCS::Change
 
   def to_a = [action, position, element]
   alias_method :to_ary, :to_a
+  alias_method :deconstruct, :to_a
+
+  def deconstruct_keys(_) = {action:, position:, element:}
 
   def self.from_a(arr)
     case arr
@@ -59,8 +62,8 @@ class Diff::LCS::Change
   end
 
   def <=>(other)
-    r = action <=> other.action
-    r = position <=> other.position if r.zero?
+    r = position <=> other.position
+    r = VALID_ACTIONS.index(action) <=> VALID_ACTIONS.index(other.action) if r.zero?
     r = element <=> other.element if r.zero?
     r
   end
@@ -111,28 +114,27 @@ class Diff::LCS::ContextChange
 
   def to_a = [action, [old_position, old_element], [new_position, new_element]]
   alias_method :to_ary, :to_a
+  alias_method :deconstruct, :to_a
+
+  def deconstruct_keys(_) = {action:, old_position:, old_element:, new_position:, new_element:}
 
   def self.from_a(arr) = Diff::LCS::Change.from_a(arr)
 
   # Simplifies a context change for use in some diff callbacks. '<' actions are converted
   # to '-' and '>' actions are converted to '+'.
   def self.simplify(event)
-    ea = event.to_a
-
-    case ea[0]
+    case event.action
     when "-"
-      ea[2][1] = nil
+      event.with(new_element: nil)
     when "<"
-      ea[0] = "-"
-      ea[2][1] = nil
+      event.with(action: "-", new_element: nil)
     when "+"
-      ea[1][1] = nil
+      event.with(old_element: nil)
     when ">"
-      ea[0] = "+"
-      ea[1][1] = nil
+      event.with(action: "+", old_element: nil)
+    else
+      event
     end
-
-    from_a(ea)
   end
 
   def ==(other)
@@ -145,9 +147,12 @@ class Diff::LCS::ContextChange
   end
 
   def <=>(other)
-    r = action <=> other.action
-    r = old_position <=> other.old_position if r.zero?
+    r = old_position <=> other.old_position
     r = new_position <=> other.new_position if r.zero?
+    if r.zero?
+      r = Diff::LCS::Change::VALID_ACTIONS.index(action) <=>
+        Diff::LCS::Change::VALID_ACTIONS.index(other.action)
+    end
     r = old_element <=> other.old_element if r.zero?
     r = new_element <=> other.new_element if r.zero?
     r

data/lib/diff/lcs/ldiff.rb

@@ -16,9 +16,14 @@ class Diff::LCS::Ldiff # :nodoc:
     MIT licence.
   COPYRIGHT
 
-  InputInfo = Struct.new(:filename, :data, :stat) do
+  InputInfo = Struct.new(:filename, :data, :mtime) do
     def initialize(filename)
-      super(filename, ::File.read(filename), ::File.stat(filename))
+      if filename == "-"
+        super("<stdin>", $stdin.read, Time.now)
+        return
+      end
+
+      super(filename, ::File.read(filename), ::File.stat(filename).mtime)
     end
   end
 
@@ -142,9 +147,9 @@ class Diff::LCS::Ldiff # :nodoc:
       output << "Files #{info_old.filename} and #{info_new.filename} differ\n"
       return true
     when :unified, :context
-      ft = info_old.stat.mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
+      ft = info_old.mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
       output << "#{char_old} #{info_old.filename}\t#{ft}\n"
-      ft = info_new.stat.mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
+      ft = info_new.mtime.localtime.strftime("%Y-%m-%d %H:%M:%S.000000000 %z")
       output << "#{char_new} #{info_new.filename}\t#{ft}\n"
     when :ed
       output = []

data/lib/diff/lcs/version.rb

@@ -2,6 +2,6 @@
 
 module Diff
   module LCS
-    VERSION = "2.0.0.beta.1"
+    VERSION = "2.0.0.beta.2"
   end
 end

data/spec/hunk_spec.rb

@@ -2,71 +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
+    EXPECTED
 
-      expect(hunk.diff(:old)).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/ldiff_spec.rb

@@ -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,13 +1,13 @@
 # frozen_string_literal: true
 
-require "rubygems"
-require "pathname"
-
-require "psych" if RUBY_VERSION >= "1.9"
+$LOAD_PATH.unshift File.expand_path(__dir__, "../lib")
 
+require "rubygems"
 require "simplecov"
 require "simplecov-lcov"
 
+require "diff/lcs"
+
 SimpleCov::Formatter::LcovFormatter.config do |config|
   config.report_with_single_file = true
   config.lcov_file_name = "lcov.info"
@@ -23,12 +23,6 @@ SimpleCov.start "test_frameworks" do
   ])
 end
 
-file = Pathname.new(__FILE__).expand_path
-path = file.parent
-parent = path.parent
-
-$:.unshift parent.join("lib")
-
 module CaptureSubprocessIO
   def _synchronize
     yield
@@ -62,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