diff-lcs 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e25465dc42f53e6fbecbb5f1d5fb9507b4e8687aee1b5bd010b456ca409b559d
-  data.tar.gz: 0c5618a13890bc917f81b9f52053945f3aa0a8c5e2c1d07bb47559f5dd0b1e62
+  metadata.gz: f8c970551b0fef2c712a6dbdc87453ecbd383a6c5b69f0c1e20e7525a9f4d1ef
+  data.tar.gz: 6a46ef91155a305417163c3e92503b567e47bf69413e697101b613ed8665c016
 SHA512:
-  metadata.gz: '07578eb0c1c939b9f45a0b8dbc53576d13a04f72c4ecccf52d79fe5d984d41c1f8cdf58471de228bc76af6898bc1ed6ebddc58df04068c901653600b6670f003'
-  data.tar.gz: d4ace7d0c9b03c518a2ce1b7537da8c767f1cfd3f3d025a7bf5206df61b6c44863239a8cbf4601f5464a3a35115a4891bca665b1792f1cb860b2cde3103b43bb
+  metadata.gz: 9612854483a3dc37cab0f7ec561d23c4ff2c4d190c4d526c18ae45de8c42a2b48f4809fc7da78de524703a7424b7bfd128bb6705424ffa8c139d7a8a59eea10f
+  data.tar.gz: 16586385ffdfd194afd04f1da73ba3b358b7f324f3dfa5c76b8d37e4ffee0eff257ae7c718d85164d02130c9424b04b130521f87dc4d812d9426bbba6806dfd2

data/History.md

@@ -1,5 +1,16 @@
 # History
 
+## 1.4.2 / 2020-06-23
+
+- Camille Drapier fixed a small issue with RuboCop configuration. [#59][]
+- Applied another fix (and unit test) to fix an issue for the Chef team.
+  [#60][], [#61][]
+
+## 1.4.1 / 2020-06-23
+
+- Fix an issue where diff sizes could be negative, and they should be. [#57][],
+  [#58][]
+
 ## 1.4 / 2020-06-23
 
 - Ruby versions lower than 2.4 are soft-deprecated and will not be run as
@@ -245,3 +256,8 @@
 [#49]: https://github.com/halostatue/diff-lcs/pull/49
 [#52]: https://github.com/halostatue/diff-lcs/pull/52
 [#53]: https://github.com/halostatue/diff-lcs/issues/53
+[#57]: https://github.com/halostatue/diff-lcs/issues/57
+[#58]: https://github.com/halostatue/diff-lcs/pull/58
+[#59]: https://github.com/halostatue/diff-lcs/pull/59
+[#60]: https://github.com/halostatue/diff-lcs/issues/60
+[#61]: https://github.com/halostatue/diff-lcs/pull/61

data/lib/diff/lcs.rb

@@ -49,7 +49,7 @@ module Diff; end unless defined? Diff # rubocop:disable Style/Documentation
 #          a x b y c z p d q
 #    a b c a x b y c z
 module Diff::LCS
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end
 
 require 'diff/lcs/callbacks'

data/lib/diff/lcs/backports.rb

@@ -3,7 +3,7 @@
 unless 0.respond_to?(:positive?)
   class Fixnum # rubocop:disable Lint/UnifiedInteger, Style/Documentation
     def positive?
-      self > 0 # rubocop:disable Styel/NumericPredicate
+      self > 0 # rubocop:disable Style/NumericPredicate
     end
   end
 end

data/lib/diff/lcs/hunk.rb

@@ -2,12 +2,12 @@
 
 require 'diff/lcs/block'
 
-# A Hunk is a group of Blocks which overlap because of the context
-# surrounding each block. (So if we're not using context, every hunk will
-# contain one block.) Used in the diff program (bin/diff).
+# A Hunk is a group of Blocks which overlap because of the context surrounding
+# each block. (So if we're not using context, every hunk will contain one
+# block.) Used in the diff program (bin/ldiff).
 class Diff::LCS::Hunk
-  # Create a hunk using references to both the old and new data, as well as
-  # the piece of data.
+  # Create a hunk using references to both the old and new data, as well as the
+  # piece of data.
   def initialize(data_old, data_new, piece, flag_context, file_length_difference)
     # At first, a hunk will have just one Block in it
     @blocks = [Diff::LCS::Block.new(piece)]
@@ -61,17 +61,20 @@ class Diff::LCS::Hunk
     return if context.nil? or context.zero?
 
     add_start = context > @start_old ? @start_old : context
+
     @start_old -= add_start
     @start_new -= add_start
 
+    old_size = @data_old.size
+
     add_end =
-      if (@end_old + context) > @data_old.size
-        @data_old.size - @end_old
+      if (@end_old + context) > old_size
+        old_size - @end_old
       else
         context
       end
 
-    add_end = @max_diff_size if add_end > @max_diff_size
+    add_end = @max_diff_size if add_end >= old_size
 
     @end_old += add_end
     @end_new += add_end

data/spec/issues_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+require 'diff/lcs/hunk'
 
 describe 'Diff::LCS Issues' do
   include Diff::LCS::SpecHelper::Matchers
@@ -64,4 +65,34 @@ describe 'Diff::LCS Issues' do
       }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
     end
   end
+
+  describe "issue #60" do
+    it 'should produce unified output with correct context' do
+      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
+    end
+  end
 end

data/spec/ldiff_spec.rb

@@ -10,6 +10,11 @@ RSpec.describe 'bin/ldiff' do
   let(:output_diff_e) { read_fixture('-e') }
   let(:output_diff_f) { read_fixture('-f') }
   let(:output_diff_u) { read_fixture('-u') }
+  let(:output_diff_chef) { read_fixture('-u', base: 'output.diff.chef') }
+
+  specify do
+    expect(run_ldiff('-u', left: 'old-chef', right: 'new-chef')).to eq(output_diff_chef)
+  end
 
   specify do
     expect(run_ldiff).to eq(output_diff)
@@ -31,8 +36,8 @@ RSpec.describe 'bin/ldiff' do
     expect(run_ldiff('-u')).to eq(output_diff_u)
   end
 
-  def read_fixture(flag = nil)
-    clean_data(IO.binread("spec/fixtures/ldiff/output.diff#{flag}"), flag)
+  def read_fixture(flag = nil, base: 'output.diff')
+    clean_data(IO.binread("spec/fixtures/ldiff/#{base}#{flag}"), flag)
   end
 
   def clean_data(data, flag)
@@ -49,14 +54,15 @@ RSpec.describe 'bin/ldiff' do
   def clean_output_timestamp(data)
     data.gsub(
       %r{
-        [-*+]{3}
-        \s
-        spec/fixtures/(\w+)
-        \s
+        ^
+        [-+*]{3}
+        \s*
+        spec/fixtures/(\S+)
+        \s*
         \d{4}-\d\d-\d\d
-        \s
+        \s*
         \d\d:\d\d:\d\d(?:\.\d+)
-        \s
+        \s*
         (?:[-+]\d{4}|Z)
       }x,
       '*** spec/fixtures/\1	0000-00-00 00:00:00.000000000 -0000'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diff-lcs
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Austin Ziegler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-doofus