diff-lcs 1.5.1 → 2.0.0

data/{docs → licenses}/artistic.txt

@@ -122,6 +122,6 @@ products derived from this software without specific prior written permission.
 
 10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
 IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 				The End

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
-          @@ -1 +1,2 @@
+    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/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/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

@@ -7,10 +7,17 @@ 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"}
-  ].product([nil, "-e", "-f", "-c", "-u"]).map { |(fixture, flag)|
+    {: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, "-c", "-u"]).map { |(fixture, flag)|
     fixture = fixture.dup
     fixture[:flag] = flag
     fixture
@@ -20,15 +27,18 @@ 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/#{fixture[:name]}#{fixture[:flag]}"
+      "test/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 = "test/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
@@ -61,7 +74,7 @@ RSpec.describe "bin/ldiff" do
         ^
         [-+*]{3}
         \s*
-        spec/fixtures/(\S+)
+        test/fixtures/(\S+)
         \s*
         \d{4}-\d\d-\d\d
         \s*
@@ -69,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
 
@@ -79,11 +92,9 @@ 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
 
-    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

@@ -1,42 +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"
-
-  def require_do(resource)
-    require resource
-    yield if block_given?
-  rescue LoadError
-    nil
-  end
-
-  formatters = [SimpleCov::Formatter::HTMLFormatter]
+require "rubygems"
+require "simplecov"
+require "simplecov-lcov"
 
-  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
-  }
+require "diff/lcs"
 
-  SimpleCov.start do
-    formatter SimpleCov::Formatter::MultiFormatter.new(formatters)
-  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
@@ -71,8 +56,6 @@ module CaptureSubprocessIO
   private :_capture_subprocess_io
 end
 
-require "diff-lcs"
-
 module Diff::LCS::SpecHelper
   def hello
     "hello"
@@ -250,100 +233,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
+
+    def change(event)
+      @result << ["!", event.old_position, event.new_position]
     end
-    cb.reset
-    cb
+  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

data/test/fixtures/123_x

@@ -0,0 +1,2 @@
+123
+x

data/test/fixtures/456_x

@@ -0,0 +1,2 @@
+456
+x

data/test/fixtures/four_lines

@@ -0,0 +1,4 @@
+one
+two
+three
+four

data/test/fixtures/four_lines_with_missing_new_line

@@ -0,0 +1,4 @@
+one
+two
+three
+four

data/test/fixtures/ldiff/diff.missing_new_line1-e

@@ -0,0 +1 @@
+No newline at end of file

data/test/fixtures/ldiff/diff.missing_new_line1-f

@@ -0,0 +1 @@
+No newline at end of file

data/test/fixtures/ldiff/diff.missing_new_line2-e

@@ -0,0 +1 @@
+No newline at end of file

data/test/fixtures/ldiff/diff.missing_new_line2-f

@@ -0,0 +1 @@
+No newline at end of file

data/test/fixtures/ldiff/error.diff.chef-e

@@ -0,0 +1,2 @@
+<old_file>: No newline at end of file
+<new_file>: No newline at end of file

data/test/fixtures/ldiff/error.diff.chef-f

@@ -0,0 +1,2 @@
+<old_file>: No newline at end of file
+<new_file>: No newline at end of file