diff-lcs 1.6.2 → 2.0.0.beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (140) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +65 -4
  3. data/CONTRIBUTING.md +91 -35
  4. data/CONTRIBUTORS.md +19 -9
  5. data/LICENCE.md +39 -11
  6. data/Manifest.txt +91 -83
  7. data/README.md +13 -9
  8. data/Rakefile +99 -73
  9. data/SECURITY.md +22 -27
  10. data/integration/compare/array_diff_spec.rb +10 -0
  11. data/integration/compare/hash_diff_spec.rb +25 -0
  12. data/integration/compare/string_diff_spec.rb +10 -0
  13. data/integration/rspec_differ_spec.rb +26 -0
  14. data/integration/rspec_expectations_spec.rb +32 -0
  15. data/integration/runner +20 -0
  16. data/lib/diff/lcs/block.rb +29 -24
  17. data/lib/diff/lcs/callbacks.rb +240 -242
  18. data/lib/diff/lcs/change.rb +102 -104
  19. data/lib/diff/lcs/hunk.rb +92 -155
  20. data/lib/diff/lcs/internals.rb +92 -96
  21. data/lib/diff/lcs/ldiff.rb +30 -38
  22. data/lib/diff/lcs/version.rb +1 -1
  23. data/lib/diff/lcs.rb +439 -466
  24. data/licenses/dco.txt +34 -0
  25. data/spec/hunk_spec.rb +32 -45
  26. data/spec/lcs_spec.rb +6 -6
  27. data/spec/ldiff_spec.rb +8 -8
  28. data/spec/spec_helper.rb +17 -27
  29. data/test/fixtures/ldiff/output.diff-c +7 -0
  30. data/test/fixtures/ldiff/output.diff-u +5 -0
  31. data/test/fixtures/ldiff/output.diff.bin2 +1 -0
  32. data/test/fixtures/ldiff/output.diff.bin2-c +1 -0
  33. data/test/fixtures/ldiff/output.diff.bin2-e +1 -0
  34. data/test/fixtures/ldiff/output.diff.bin2-f +1 -0
  35. data/test/fixtures/ldiff/output.diff.bin2-u +1 -0
  36. data/{spec → test}/fixtures/ldiff/output.diff.chef-c +2 -2
  37. data/test/fixtures/ldiff/output.diff.chef-u +9 -0
  38. data/{spec → test}/fixtures/ldiff/output.diff.chef2-c +2 -2
  39. data/{spec → test}/fixtures/ldiff/output.diff.chef2-u +2 -2
  40. data/test/fixtures/ldiff/output.diff.empty.vs.four_lines-c +9 -0
  41. data/test/fixtures/ldiff/output.diff.empty.vs.four_lines-u +7 -0
  42. data/test/fixtures/ldiff/output.diff.four_lines.vs.empty-c +9 -0
  43. data/test/fixtures/ldiff/output.diff.four_lines.vs.empty-u +7 -0
  44. data/test/fixtures/ldiff/output.diff.issue95_trailing_context-c +9 -0
  45. data/test/fixtures/ldiff/output.diff.issue95_trailing_context-u +6 -0
  46. data/{spec → test}/fixtures/ldiff/output.diff.missing_new_line1-c +2 -2
  47. data/test/fixtures/ldiff/output.diff.missing_new_line1-u +9 -0
  48. data/{spec → test}/fixtures/ldiff/output.diff.missing_new_line2-c +2 -2
  49. data/test/fixtures/ldiff/output.diff.missing_new_line2-u +9 -0
  50. data/test/test_block.rb +34 -0
  51. data/test/test_change.rb +234 -0
  52. data/test/test_diff.rb +53 -0
  53. data/test/test_helper.rb +225 -0
  54. data/test/test_hunk.rb +72 -0
  55. data/test/test_issues.rb +168 -0
  56. data/test/test_lcs.rb +47 -0
  57. data/test/test_ldiff.rb +89 -0
  58. data/test/test_patch.rb +362 -0
  59. data/test/test_sdiff.rb +167 -0
  60. data/test/test_traverse_balanced.rb +322 -0
  61. data/test/test_traverse_sequences.rb +187 -0
  62. metadata +199 -110
  63. data/.rspec +0 -1
  64. data/bin/htmldiff +0 -35
  65. data/lib/diff/lcs/backports.rb +0 -13
  66. data/lib/diff/lcs/htmldiff.rb +0 -160
  67. data/mise.toml +0 -5
  68. data/spec/fixtures/ldiff/output.diff-c +0 -7
  69. data/spec/fixtures/ldiff/output.diff-e +0 -3
  70. data/spec/fixtures/ldiff/output.diff-f +0 -3
  71. data/spec/fixtures/ldiff/output.diff-u +0 -5
  72. data/spec/fixtures/ldiff/output.diff.bin2 +0 -1
  73. data/spec/fixtures/ldiff/output.diff.bin2-c +0 -1
  74. data/spec/fixtures/ldiff/output.diff.bin2-e +0 -1
  75. data/spec/fixtures/ldiff/output.diff.bin2-f +0 -1
  76. data/spec/fixtures/ldiff/output.diff.bin2-u +0 -1
  77. data/spec/fixtures/ldiff/output.diff.chef-e +0 -3
  78. data/spec/fixtures/ldiff/output.diff.chef-f +0 -3
  79. data/spec/fixtures/ldiff/output.diff.chef-u +0 -9
  80. data/spec/fixtures/ldiff/output.diff.chef2-e +0 -7
  81. data/spec/fixtures/ldiff/output.diff.chef2-f +0 -7
  82. data/spec/fixtures/ldiff/output.diff.empty.vs.four_lines-c +0 -9
  83. data/spec/fixtures/ldiff/output.diff.empty.vs.four_lines-u +0 -7
  84. data/spec/fixtures/ldiff/output.diff.four_lines.vs.empty-c +0 -9
  85. data/spec/fixtures/ldiff/output.diff.four_lines.vs.empty-u +0 -7
  86. data/spec/fixtures/ldiff/output.diff.issue95_trailing_context-c +0 -9
  87. data/spec/fixtures/ldiff/output.diff.issue95_trailing_context-u +0 -6
  88. data/spec/fixtures/ldiff/output.diff.missing_new_line1-u +0 -9
  89. data/spec/fixtures/ldiff/output.diff.missing_new_line2-u +0 -9
  90. /data/{docs → licenses}/COPYING.txt +0 -0
  91. /data/{docs → licenses}/artistic.txt +0 -0
  92. /data/{spec → test}/fixtures/123_x +0 -0
  93. /data/{spec → test}/fixtures/456_x +0 -0
  94. /data/{spec → test}/fixtures/aX +0 -0
  95. /data/{spec → test}/fixtures/bXaX +0 -0
  96. /data/{spec → test}/fixtures/ds1.csv +0 -0
  97. /data/{spec → test}/fixtures/ds2.csv +0 -0
  98. /data/{spec → test}/fixtures/empty +0 -0
  99. /data/{spec → test}/fixtures/file1.bin +0 -0
  100. /data/{spec → test}/fixtures/file2.bin +0 -0
  101. /data/{spec → test}/fixtures/four_lines +0 -0
  102. /data/{spec → test}/fixtures/four_lines_with_missing_new_line +0 -0
  103. /data/{spec → test}/fixtures/ldiff/diff.missing_new_line1-e +0 -0
  104. /data/{spec → test}/fixtures/ldiff/diff.missing_new_line1-f +0 -0
  105. /data/{spec → test}/fixtures/ldiff/diff.missing_new_line2-e +0 -0
  106. /data/{spec → test}/fixtures/ldiff/diff.missing_new_line2-f +0 -0
  107. /data/{spec → test}/fixtures/ldiff/error.diff.chef-e +0 -0
  108. /data/{spec → test}/fixtures/ldiff/error.diff.chef-f +0 -0
  109. /data/{spec → test}/fixtures/ldiff/error.diff.missing_new_line1-e +0 -0
  110. /data/{spec → test}/fixtures/ldiff/error.diff.missing_new_line1-f +0 -0
  111. /data/{spec → test}/fixtures/ldiff/error.diff.missing_new_line2-e +0 -0
  112. /data/{spec → test}/fixtures/ldiff/error.diff.missing_new_line2-f +0 -0
  113. /data/{spec → test}/fixtures/ldiff/output.diff +0 -0
  114. /data/{spec → test}/fixtures/ldiff/output.diff.bin1 +0 -0
  115. /data/{spec → test}/fixtures/ldiff/output.diff.bin1-c +0 -0
  116. /data/{spec → test}/fixtures/ldiff/output.diff.bin1-e +0 -0
  117. /data/{spec → test}/fixtures/ldiff/output.diff.bin1-f +0 -0
  118. /data/{spec → test}/fixtures/ldiff/output.diff.bin1-u +0 -0
  119. /data/{spec → test}/fixtures/ldiff/output.diff.chef +0 -0
  120. /data/{spec → test}/fixtures/ldiff/output.diff.chef2 +0 -0
  121. /data/{spec → test}/fixtures/ldiff/output.diff.chef2-d +0 -0
  122. /data/{spec → test}/fixtures/ldiff/output.diff.empty.vs.four_lines +0 -0
  123. /data/{spec → test}/fixtures/ldiff/output.diff.empty.vs.four_lines-e +0 -0
  124. /data/{spec → test}/fixtures/ldiff/output.diff.empty.vs.four_lines-f +0 -0
  125. /data/{spec → test}/fixtures/ldiff/output.diff.four_lines.vs.empty +0 -0
  126. /data/{spec → test}/fixtures/ldiff/output.diff.four_lines.vs.empty-e +0 -0
  127. /data/{spec → test}/fixtures/ldiff/output.diff.four_lines.vs.empty-f +0 -0
  128. /data/{spec → test}/fixtures/ldiff/output.diff.issue95_trailing_context +0 -0
  129. /data/{spec → test}/fixtures/ldiff/output.diff.issue95_trailing_context-e +0 -0
  130. /data/{spec → test}/fixtures/ldiff/output.diff.issue95_trailing_context-f +0 -0
  131. /data/{spec → test}/fixtures/ldiff/output.diff.missing_new_line1 +0 -0
  132. /data/{spec → test}/fixtures/ldiff/output.diff.missing_new_line1-e +0 -0
  133. /data/{spec → test}/fixtures/ldiff/output.diff.missing_new_line1-f +0 -0
  134. /data/{spec → test}/fixtures/ldiff/output.diff.missing_new_line2 +0 -0
  135. /data/{spec → test}/fixtures/ldiff/output.diff.missing_new_line2-e +0 -0
  136. /data/{spec → test}/fixtures/ldiff/output.diff.missing_new_line2-f +0 -0
  137. /data/{spec → test}/fixtures/new-chef +0 -0
  138. /data/{spec → test}/fixtures/new-chef2 +0 -0
  139. /data/{spec → test}/fixtures/old-chef +0 -0
  140. /data/{spec → test}/fixtures/old-chef2 +0 -0
data/spec/fixtures/ldiff/output.diff.chef-f DELETED
@@ -1,3 +0,0 @@
1
- c3
2
- "description": "lo"
3
- .
data/spec/fixtures/ldiff/output.diff.chef-u DELETED
@@ -1,9 +0,0 @@
1
- --- spec/fixtures/old-chef 2020-06-23 23:18:20.000000000 -0400
2
- +++ spec/fixtures/new-chef 2020-06-23 23:18:20.000000000 -0400
3
- @@ -1,4 +1,4 @@
4
- {
5
- "name": "x",
6
- - "description": "hi"
7
- + "description": "lo"
8
- }
9
-
data/spec/fixtures/ldiff/output.diff.chef2-e DELETED
@@ -1,7 +0,0 @@
1
- 14a
2
- recipe[o::new]
3
- recipe[p::new]
4
- recipe[q::new]
5
- recipe[r::new]
6
- .
7
- 2d
data/spec/fixtures/ldiff/output.diff.chef2-f DELETED
@@ -1,7 +0,0 @@
1
- d2
2
- a14
3
- recipe[o::new]
4
- recipe[p::new]
5
- recipe[q::new]
6
- recipe[r::new]
7
- .
data/spec/fixtures/ldiff/output.diff.empty.vs.four_lines-c DELETED
@@ -1,9 +0,0 @@
1
- *** spec/fixtures/empty 2025-01-31 12:14:52.856031635 +0100
2
- --- spec/fixtures/four_lines 2025-01-31 12:13:45.476036544 +0100
3
- ***************
4
- *** 0 ****
5
- --- 1,4 ----
6
- + one
7
- + two
8
- + three
9
- + four
data/spec/fixtures/ldiff/output.diff.empty.vs.four_lines-u DELETED
@@ -1,7 +0,0 @@
1
- --- spec/fixtures/empty 2025-01-31 12:14:52.856031635 +0100
2
- +++ spec/fixtures/four_lines 2025-01-31 12:13:45.476036544 +0100
3
- @@ -0,0 +1,4 @@
4
- +one
5
- +two
6
- +three
7
- +four
data/spec/fixtures/ldiff/output.diff.four_lines.vs.empty-c DELETED
@@ -1,9 +0,0 @@
1
- *** spec/fixtures/four_lines 2025-01-31 12:13:45.476036544 +0100
2
- --- spec/fixtures/empty 2025-01-31 12:14:52.856031635 +0100
3
- ***************
4
- *** 1,4 ****
5
- - one
6
- - two
7
- - three
8
- - four
9
- --- 0 ----
data/spec/fixtures/ldiff/output.diff.four_lines.vs.empty-u DELETED
@@ -1,7 +0,0 @@
1
- --- spec/fixtures/four_lines 2025-01-31 12:13:45.476036544 +0100
2
- +++ spec/fixtures/empty 2025-01-31 12:14:52.856031635 +0100
3
- @@ -1,4 +0,0 @@
4
- -one
5
- -two
6
- -three
7
- -four
data/spec/fixtures/ldiff/output.diff.issue95_trailing_context-c DELETED
@@ -1,9 +0,0 @@
1
- *** spec/fixtures/123_x 2025-01-31 17:00:17.070615716 +0100
2
- --- spec/fixtures/456_x 2025-01-31 16:58:26.380624827 +0100
3
- ***************
4
- *** 1,2 ****
5
- ! 123
6
- x
7
- --- 1,2 ----
8
- ! 456
9
- x
data/spec/fixtures/ldiff/output.diff.issue95_trailing_context-u DELETED
@@ -1,6 +0,0 @@
1
- --- spec/fixtures/123_x 2025-01-31 17:00:17.070615716 +0100
2
- +++ spec/fixtures/456_x 2025-01-31 16:58:26.380624827 +0100
3
- @@ -1,2 +1,2 @@
4
- -123
5
- +456
6
- x
data/spec/fixtures/ldiff/output.diff.missing_new_line1-u DELETED
@@ -1,9 +0,0 @@
1
- --- spec/fixtures/four_lines 2025-01-31 12:17:43.926013315 +0100
2
- +++ spec/fixtures/four_lines_with_missing_new_line 2025-01-31 12:17:43.926013315 +0100
3
- @@ -1,4 +1,4 @@
4
- one
5
- two
6
- three
7
- -four
8
- +four
9
-
data/spec/fixtures/ldiff/output.diff.missing_new_line2-u DELETED
@@ -1,9 +0,0 @@
1
- --- spec/fixtures/four_lines_with_missing_new_line 2025-01-31 12:17:43.926013315 +0100
2
- +++ spec/fixtures/four_lines 2025-01-31 12:17:43.926013315 +0100
3
- @@ -1,4 +1,4 @@
4
- one
5
- two
6
- three
7
- -four
8
-
9
- +four
/data/{docs → licenses}/COPYING.txt RENAMED
File without changes
/data/{docs → licenses}/artistic.txt RENAMED
File without changes
/data/{spec → test}/fixtures/123_x RENAMED
File without changes
/data/{spec → test}/fixtures/456_x RENAMED
File without changes
/data/{spec → test}/fixtures/aX RENAMED
File without changes
/data/{spec → test}/fixtures/bXaX RENAMED
File without changes
/data/{spec → test}/fixtures/ds1.csv RENAMED
File without changes
/data/{spec → test}/fixtures/ds2.csv RENAMED
File without changes
/data/{spec → test}/fixtures/empty RENAMED
File without changes
/data/{spec → test}/fixtures/file1.bin RENAMED
File without changes
/data/{spec → test}/fixtures/file2.bin RENAMED
File without changes
/data/{spec → test}/fixtures/four_lines RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/error.diff.chef-e RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/error.diff.chef-f RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/output.diff RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/output.diff.bin1 RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/output.diff.bin1-c RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/output.diff.bin1-e RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/output.diff.bin1-f RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/output.diff.bin1-u RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/output.diff.chef RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/output.diff.chef2 RENAMED
File without changes
/data/{spec → test}/fixtures/ldiff/output.diff.chef2-d RENAMED
File without changes
/data/{spec → test}/fixtures/new-chef RENAMED
File without changes
/data/{spec → test}/fixtures/new-chef2 RENAMED
File without changes
/data/{spec → test}/fixtures/old-chef RENAMED
File without changes
/data/{spec → test}/fixtures/old-chef2 RENAMED
File without changes