diff-lcs 1.5.1 → 1.6.2

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/hunk_spec.rb

@@ -72,7 +72,7 @@ if String.method_defined?(:encoding)
 
       it "produces a unified diff" do
         expected = <<-EXPECTED.gsub(/^\s+/, "").encode("UTF-16LE").chomp
-          @@ -1 +1,2 @@
+          @@ -0,0 +1 @@
           +Tu a un carte avec {count} items
         EXPECTED
 

data/spec/issues_spec.rb

@@ -68,38 +68,6 @@ describe "Diff::LCS Issues" do
     end
   end
 
-  describe "issue #60" do
-    it "should produce unified output with correct context" do
-      # standard:disable Layout/HeredocIndentation
-      old_data = <<-DATA_OLD.strip.split("\n").map(&:chomp)
-{
-  "name": "x",
-  "description": "hi"
-}
-      DATA_OLD
-
-      new_data = <<-DATA_NEW.strip.split("\n").map(&:chomp)
-{
-  "name": "x",
-  "description": "lo"
-}
-      DATA_NEW
-
-      diff = ::Diff::LCS.diff(old_data, new_data)
-      hunk = ::Diff::LCS::Hunk.new(old_data, new_data, diff.first, 3, 0)
-
-      expect(hunk.diff(:unified)).to eq(<<-EXPECTED.chomp)
-@@ -1,5 +1,5 @@
- {
-   "name": "x",
--  "description": "hi"
-+  "description": "lo"
- }
-      EXPECTED
-      # standard:enable Layout/HeredocIndentation
-    end
-  end
-
   describe "issue #65" do
     def diff_lines(old_lines, new_lines)
       file_length_difference = 0
@@ -157,4 +125,36 @@ describe "Diff::LCS Issues" do
       # standard:enable Layout/HeredocIndentation
     end
   end
+
+  describe "issue #107 (replaces issue #60)" do
+    it "should produce unified output with correct context" do
+      # standard:disable Layout/HeredocIndentation
+      old_data = <<-DATA_OLD.strip.split("\n").map(&:chomp)
+{
+  "name": "x",
+  "description": "hi"
+}
+      DATA_OLD
+
+      new_data = <<-DATA_NEW.strip.split("\n").map(&:chomp)
+{
+  "name": "x",
+  "description": "lo"
+}
+      DATA_NEW
+
+      diff = ::Diff::LCS.diff(old_data, new_data)
+      hunk = ::Diff::LCS::Hunk.new(old_data, new_data, diff.first, 3, 0)
+
+      expect(hunk.diff(:unified)).to eq(<<-EXPECTED.chomp)
+@@ -1,4 +1,4 @@
+ {
+   "name": "x",
+-  "description": "hi"
++  "description": "lo"
+ }
+      EXPECTED
+      # standard:enable Layout/HeredocIndentation
+    end
+  end
 end

data/spec/ldiff_spec.rb

@@ -7,9 +7,16 @@ RSpec.describe "bin/ldiff" do
 
   # standard:disable Style/HashSyntax
   fixtures = [
-    {:name => "output.diff", :left => "aX", :right => "bXaX"},
-    {:name => "output.diff.chef", :left => "old-chef", :right => "new-chef"},
-    {:name => "output.diff.chef2", :left => "old-chef2", :right => "new-chef2"}
+    {:name => "diff", :left => "aX", :right => "bXaX", :diff => 1},
+    {:name => "diff.missing_new_line1", :left => "four_lines", :right => "four_lines_with_missing_new_line", :diff => 1},
+    {:name => "diff.missing_new_line2", :left => "four_lines_with_missing_new_line", :right => "four_lines", :diff => 1},
+    {:name => "diff.issue95_trailing_context", :left => "123_x", :right => "456_x", :diff => 1},
+    {:name => "diff.four_lines.vs.empty", :left => "four_lines", :right => "empty", :diff => 1},
+    {:name => "diff.empty.vs.four_lines", :left => "empty", :right => "four_lines", :diff => 1},
+    {:name => "diff.bin1", :left => "file1.bin", :right => "file1.bin", :diff => 0},
+    {: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)|
     fixture = fixture.dup
     fixture[:flag] = flag
@@ -24,11 +31,14 @@ RSpec.describe "bin/ldiff" do
       "spec/fixtures/#{fixture[:right]}",
       "#",
       "=>",
-      "spec/fixtures/ldiff/#{fixture[:name]}#{fixture[:flag]}"
+      "spec/fixtures/ldiff/output.#{fixture[:name]}#{fixture[:flag]}"
     ].join(" ")
 
     it desc do
-      expect(run_ldiff(fixture)).to eq(read_fixture(fixture))
+      stdout, stderr, status = run_ldiff(fixture)
+      expect(status).to eq(fixture[:diff])
+      expect(stderr).to eq(read_fixture(fixture, mode: "error", allow_missing: true))
+      expect(stdout).to eq(read_fixture(fixture, mode: "output", allow_missing: false))
     end
   end
 
@@ -36,10 +46,13 @@ RSpec.describe "bin/ldiff" do
     test_ldiff(fixture)
   end
 
-  def read_fixture(options)
+  def read_fixture(options, mode: "output", allow_missing: false)
     fixture = options.fetch(:name)
     flag = options.fetch(:flag)
-    name = "spec/fixtures/ldiff/#{fixture}#{flag}"
+    name = "spec/fixtures/ldiff/#{mode}.#{fixture}#{flag}"
+
+    return "" if !::File.exist?(name) && allow_missing
+
     data = IO.__send__(IO.respond_to?(:binread) ? :binread : :read, name)
     clean_data(data, flag)
   end
@@ -82,8 +95,6 @@ RSpec.describe "bin/ldiff" do
       system("ruby -Ilib bin/ldiff #{flag} spec/fixtures/#{left} spec/fixtures/#{right}")
     end
 
-    expect(stderr).to be_empty if RUBY_VERSION >= "1.9"
-    expect(stdout).not_to be_empty
-    clean_data(stdout, flag)
+    [clean_data(stdout, flag), stderr, $?.exitstatus]
   end
 end

data/spec/patch_spec.rb

@@ -181,7 +181,7 @@ describe "Diff::LCS.patch" do
   # above.
   describe "fix bug 891: patchsets do not contain the last equal part" do
     before :each do
-      @s1 = %w[a b c d   e f g h i j k] # rubocop:disable Layout/SpaceInsideArrayPercentLiteral
+      @s1 = %w[a b c d   e f g h i j k] # standard:disable Layout/SpaceInsideArrayPercentLiteral
       @s2 = %w[a b c d D e f g h i j k]
     end
 

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