diff-lcs 1.3 → 1.5.1

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 (56) hide show
  1. checksums.yaml +5 -5
  2. data/Contributing.md +86 -48
  3. data/History.md +370 -159
  4. data/License.md +6 -4
  5. data/Manifest.txt +23 -1
  6. data/README.rdoc +10 -10
  7. data/Rakefile +109 -36
  8. data/bin/htmldiff +9 -6
  9. data/bin/ldiff +4 -1
  10. data/lib/diff/lcs/array.rb +2 -2
  11. data/lib/diff/lcs/backports.rb +9 -0
  12. data/lib/diff/lcs/block.rb +5 -5
  13. data/lib/diff/lcs/callbacks.rb +22 -17
  14. data/lib/diff/lcs/change.rb +42 -49
  15. data/lib/diff/lcs/htmldiff.rb +21 -12
  16. data/lib/diff/lcs/hunk.rb +160 -73
  17. data/lib/diff/lcs/internals.rb +57 -56
  18. data/lib/diff/lcs/ldiff.rb +63 -57
  19. data/lib/diff/lcs/string.rb +1 -1
  20. data/lib/diff/lcs.rb +226 -210
  21. data/lib/diff-lcs.rb +2 -2
  22. data/spec/change_spec.rb +58 -34
  23. data/spec/diff_spec.rb +13 -9
  24. data/spec/fixtures/aX +1 -0
  25. data/spec/fixtures/bXaX +1 -0
  26. data/spec/fixtures/ldiff/output.diff +4 -0
  27. data/spec/fixtures/ldiff/output.diff-c +7 -0
  28. data/spec/fixtures/ldiff/output.diff-e +3 -0
  29. data/spec/fixtures/ldiff/output.diff-f +3 -0
  30. data/spec/fixtures/ldiff/output.diff-u +5 -0
  31. data/spec/fixtures/ldiff/output.diff.chef +4 -0
  32. data/spec/fixtures/ldiff/output.diff.chef-c +15 -0
  33. data/spec/fixtures/ldiff/output.diff.chef-e +3 -0
  34. data/spec/fixtures/ldiff/output.diff.chef-f +3 -0
  35. data/spec/fixtures/ldiff/output.diff.chef-u +9 -0
  36. data/spec/fixtures/ldiff/output.diff.chef2 +7 -0
  37. data/spec/fixtures/ldiff/output.diff.chef2-c +20 -0
  38. data/spec/fixtures/ldiff/output.diff.chef2-d +7 -0
  39. data/spec/fixtures/ldiff/output.diff.chef2-e +7 -0
  40. data/spec/fixtures/ldiff/output.diff.chef2-f +7 -0
  41. data/spec/fixtures/ldiff/output.diff.chef2-u +16 -0
  42. data/spec/fixtures/new-chef +4 -0
  43. data/spec/fixtures/new-chef2 +17 -0
  44. data/spec/fixtures/old-chef +4 -0
  45. data/spec/fixtures/old-chef2 +14 -0
  46. data/spec/hunk_spec.rb +48 -37
  47. data/spec/issues_spec.rb +132 -21
  48. data/spec/lcs_spec.rb +3 -3
  49. data/spec/ldiff_spec.rb +74 -32
  50. data/spec/patch_spec.rb +14 -20
  51. data/spec/sdiff_spec.rb +83 -81
  52. data/spec/spec_helper.rb +146 -91
  53. data/spec/traverse_balanced_spec.rb +138 -136
  54. data/spec/traverse_sequences_spec.rb +7 -9
  55. metadata +76 -48
  56. data/autotest/discover.rb +0 -1
data/History.md CHANGED
@@ -1,220 +1,431 @@
1
+ # History
2
+
3
+ ## 1.5.1 / 2024-01-31
4
+
5
+ - Peter Goldstein updated CI configuration to add Ruby 3.1 and Masato Nakamura
6
+ added Ruby 3.2 and 3.3. [#82][], [#89][]
7
+
8
+ - Updated the CI configuration, resolving [#82][] to add Ruby 3.1. Masato
9
+
10
+ - Switched to [standard ruby][] formatting.
11
+
12
+ - Justin Steele converted the licence file to Markdown. [#84][]
13
+
14
+ - Updated the gem SPDX identifier for GPL 2.0 or later, resolving [#86][] by Vit
15
+ Ondruch.
16
+
17
+ - Resolve a potential security issue with `ldiff` in its use of `IO.read`
18
+ instead of `File.read`. [#91][]
19
+
20
+ - Added MFA authentication requirement for release to RubyGems. [#90][]
21
+
22
+ - Added dependabot management for actions and gems. [#90][]
23
+
24
+ - Updated CodeQL coniguration. [#90][]
25
+
26
+ ## 1.5.0 / 2021-12-23
27
+
28
+ - Updated the CI configuration and monkey-patch Hoe.
29
+
30
+ - Kenichi Kamiya fixed a test configuration deprecation in SimpleCov. [#69][]
31
+
32
+ - Tien introduced several corrections and code improvements:
33
+
34
+ - Removed an off-by-one error when calculating an index value by embracing
35
+ Ruby iteration properly. This had a side-effect of fixing a long-standing
36
+ bug in `#traverse_sequences` where the traversal would not be transitive.
37
+ That is, `LCS(s2, s1)` should produce a sequence that is transitive with
38
+ `LCS(s1, s2)` on traversal, and applying the diff computed from those
39
+ results would result in equivalent changes that could be played forward or
40
+ backward as appropriate. [#71][], [#75][]
41
+
42
+ - The above fix resulted in a changed order of the longest common subsequence
43
+ when callbacks were applied. After analysis, it was determined that the
44
+ computed subsequence was _equivalent_ to the prior version, so the test was
45
+ updated. This also resulted in the clarification of documentation when
46
+ traversing the subsequences. [#79][]
47
+
48
+ - An infinite loop case in the case where Diff::LCS would be included into an
49
+ enumerable class has been fixed. [#73][]
50
+
51
+ - Clarified the purpose of a threshold test in calculation of LCS. [#72][],
52
+ [#80][]
53
+
54
+ - Removed autotest directory
55
+
56
+ ## 1.4.4 / 2020-07-01
57
+
58
+ - Fixed an issue reported by Jun Aruga in the Diff::LCS::Ldiff binary text
59
+ detection. [#44][]
60
+
61
+ - Fixed a theoretical issue reported by Jun Aruga in Diff::LCS::Hunk to raise
62
+ a more useful exception. [#43][]
63
+
64
+ - Added documentation that should address custom object issues as reported in
65
+ [#35][].
66
+
67
+ - Fixed more diff errors, in part reported in [#65][].
68
+
69
+ - The use of `Numeric#abs` is incorrect in `Diff::LCS::Block#diff_size`. The
70
+ diff size _must_ be accurate for correct change placement.
71
+
72
+ - When selecting @max_diff_size in Diff::LCS::Hunk, choose it based on
73
+ `block.diff_size.abs`.
74
+
75
+ - Made a number of changes that will, unfortunately, increase allocations at
76
+ the cost of being safe with frozen strings.
77
+
78
+ - Add some knowledge that when `Diff::LCS::Hunk#diff` is called, that we are
79
+ processing the _last_ hunk, so some changes will be made to how the output
80
+ is generated.
81
+
82
+ - `old`, `ed`, and `reverse_ed` formats have no differences.
83
+
84
+ - `unified` format will report `` given the
85
+ correct conditions, at most once. Unified range reporting also differs for
86
+ the last hunk such that the `length` of the range is reduced by one.
87
+
88
+ - `context` format will report `\No newline at end of file` given the
89
+ correct conditions, up to once per "file". Context range reporting also
90
+ differs for the last hunk such that the `end` part of the range is reduced
91
+ by one to a minimum of one.
92
+
93
+ - Added a bunch more tests for the cases above, and fixed `hunk_spec.rb` so that
94
+ the phrase being compared isn't nonsense French.
95
+
96
+ - Updated formatting.
97
+
98
+ - Added a Rake task to assist with manual testing on Ruby 1.8.
99
+
100
+ ## 1.4.3 / 2020-06-29
101
+
102
+ - Fixed several issues with the 1.4 on Rubies older than 2.0. Some of this was
103
+ providing useful shim functions to Hoe 3.x (which dropped these older Rubies
104
+ a while ago). Specifically:
105
+
106
+ - Removed Array#lazy from a method in Diff::LCS::Hunk.
107
+
108
+ - Changed some unit tests to use old-style Symbol-keyed hashes.
109
+
110
+ - Changed some unit test helper functions to no longer use keyword parameters,
111
+ but only a trailing options hash.
112
+
113
+ - Made the use of `psych` dependent on `RUBY_VERSION >= 1.9`.
114
+
115
+ Resolves [#63][].
116
+
117
+ ## 1.4.2 / 2020-06-23
118
+
119
+ - Camille Drapier fixed a small issue with RuboCop configuration. [#59][]
120
+
121
+ - Applied another fix (and unit test) to fix an issue for the Chef team.
122
+ [#60][], [#61][]
123
+
124
+ ## 1.4.1 / 2020-06-23
125
+
126
+ - Fix an issue where diff sizes could be negative, and they should be. [#57][],
127
+ [#58][]
128
+
129
+ ## 1.4 / 2020-06-23
130
+
131
+ - Ruby versions lower than 2.4 are soft-deprecated and will not be run as part
132
+ of the CI process any longer.
133
+
134
+ - Akinora MUSHA (knu) added the ability for Diff::LCS::Change objects to be
135
+ implicitly treated arrays. Originally provided as pull request [#47][], but it
136
+ introduced a number of test failures as documented in [#48][], and remediation
137
+ of Diff::LCS itself was introduced in [#49][].
138
+
139
+ - Resolved [#5][] with some tests comparing output from `system` calls to
140
+ `bin/ldiff` with some pre-generated output. Resolved [#6][] with these tests.
141
+
142
+ - Resolved a previously undetected `bin/ldiff` issue with `--context` output not
143
+ matching `diff --context` output.
144
+
145
+ - Resolved an issue with later versions of Ruby not working with an `OptParse`
146
+ specification of `Numeric`; this has been changed to `Integer`.
147
+
148
+ - Brandon Fish added truffleruby in [#52][].
149
+
150
+ - Fixed two missing classes as reported in [#53][].
151
+
1
152
  ## 1.3 / 2017-01-18
2
153
 
3
- * Bugs fixed:
154
+ - Bugs fixed:
155
+
156
+ - Fixed an error for bin/ldiff --version. Fixes issue [#21][].
157
+
158
+ - Force Diff::LCS::Change and Diff::LCS::ContextChange to only perform
159
+ equality comparisons against themselves. Provided by Kevin Mook in pull
160
+ request [#29][].
161
+
162
+ - Fix tab expansion in htmldiff, provided by Mark Friedgan in pull request
163
+ [#25][].
164
+
165
+ - Silence Ruby 2.4 Fixnum deprecation warnings. Fixes issue [#38][] and pull
166
+ request [#36][].
4
167
 
5
- * Fixed an error for bin/ldiff --version. Fixes [issue #21][].
6
- * Force Diff::LCS::Change and Diff::LCS::ContextChange to only perform
7
- equality comparisons against themselves. Provided by Kevin Mook in
8
- [pull request #29][].
9
- * Fix tab expansion in htmldiff, provided by Mark Friedgan in
10
- [pull request #25][].
11
- * Silence Ruby 2.4 Fixnum deprecation warnings. Fixxues [issue #38][] and
12
- [pull request#36][].
13
- * Ensure that test dependencies are loaded properly. Fixes [issue #33][]
14
- and [pull request #34][].
15
- * Fix [issue #1][] with incorrect intuition of patch direction. Tentative
16
- fix, but the previous failure cases pass now.
168
+ - Ensure that test dependencies are loaded properly. Fixes issue [#33][] and
169
+ pull request [#34][].
17
170
 
18
- * Tooling changes:
171
+ - Fix issue [#1][] with incorrect intuition of patch direction. Tentative fix,
172
+ but the previous failure cases pass now.
19
173
 
20
- * Added SimpleCov and Coveralls support.
21
- * Change the homepage (temporarily) to the GitHub repo.
22
- * Updated testing and gem infrastructure.
23
- * Modernized the specs.
174
+ - Tooling changes:
24
175
 
25
- * Cleaned up documentation.
176
+ - Added SimpleCov and Coveralls support.
26
177
 
27
- * Added a Code of Conduct.
178
+ - Change the homepage (temporarily) to the GitHub repo.
179
+
180
+ - Updated testing and gem infrastructure.
181
+
182
+ - Modernized the specs.
183
+
184
+ - Cleaned up documentation.
185
+
186
+ - Added a Code of Conduct.
28
187
 
29
188
  ## 1.2.5 / 2013-11-08
30
189
 
31
- * Bugs fixed:
190
+ - Bugs fixed:
32
191
 
33
- * Comparing arrays flattened them too far, especially with
34
- Diff::LCS.sdiff. Fixed by Josh Bronson in [pull request #23][].
192
+ - Comparing arrays flattened them too far, especially with Diff::LCS.sdiff.
193
+ Fixed by Josh Bronson in pull request [#23][].
35
194
 
36
195
  ## 1.2.4 / 2013-04-20
37
196
 
38
- * Bugs fixed:
197
+ - Bugs fixed:
39
198
 
40
- * A bug was introduced after 1.1.3 when pruning common sequences at the
41
- start of comparison. Paul Kunysch (@pck) fixed this in
42
- [pull request #18][]. Thanks!
199
+ - A bug was introduced after 1.1.3 when pruning common sequences at the start
200
+ of comparison. Paul Kunysch (@pck) fixed this in pull request [#18][].
201
+ Thanks!
43
202
 
44
- * The Rubinius (1.9 mode) bug in [rubinius/rubinius#2268][] has been
45
- fixed by the Rubinius team two days after it was filed. Thanks for
46
- fixing this so quickly!
203
+ - The Rubinius (1.9 mode) bug in [rubinius/rubinius#2268][] has been fixed by
204
+ the Rubinius team two days after it was filed. Thanks for fixing this so
205
+ quickly!
47
206
 
48
- * Switching to Raggi's hoe-gemspec2 for gemspec generation.
207
+ - Switching to Raggi's hoe-gemspec2 for gemspec generation.
49
208
 
50
209
  ## 1.2.3 / 2013-04-11
51
210
 
52
- * Bugs Fixed:
211
+ - Bugs Fixed:
212
+
213
+ - The new encoding detection for diff output generation (added in 1.2.2)
214
+ introduced a bug if the left side of the comparison was the empty set.
215
+ Originally found in [rspec/rspec-expectations#238][] and
216
+ [rspec/rspec-expectations#239][]. Jon Rowe developed a reasonable heuristic
217
+ (left side, right side, empty string literal) to avoid this bug.
53
218
 
54
- * The new encoding detection for diff output generation (added in 1.2.2)
55
- introduced a bug if the left side of the comparison was the empty set.
56
- Originally found in [rspec/rspec-expectations#238][] and
57
- [rspec/rspec-expectations#239][]. Jon Rowe developed a reasonable
58
- heuristic (left side, right side, empty string literal) to avoid this
59
- bug.
60
- * There is a known issue with Rubinius in 1.9 mode reported in
61
- [rubinius/rubinius#2268][] and demonstrated in the Travis CI builds.
62
- For all other tested platforms, diff-lcs is considered stable. As soon
63
- as a suitably small test-case can be created for the Rubinius team to
64
- examine, this will be added to the Rubinius issue around this.
219
+ - There is a known issue with Rubinius in 1.9 mode reported in
220
+ [rubinius/rubinius#2268][] and demonstrated in the Travis CI builds. For all
221
+ other tested platforms, diff-lcs is considered stable. As soon as a suitably
222
+ small test-case can be created for the Rubinius team to examine, this will
223
+ be added to the Rubinius issue around this.
65
224
 
66
225
  ## 1.2.2 / 2013-03-30
67
226
 
68
- * Bugs Fixed:
227
+ - Bugs Fixed:
228
+
229
+ - Diff::LCS::Hunk could not properly generate a difference for comparison sets
230
+ that are not US-ASCII-compatible because of the use of literal regular
231
+ expressions and strings. Jon Rowe found this in
232
+ [rspec/rspec-expectations#219][] and provided a first pass implementation in
233
+ pull request [#15][]. I've reworked it because of test failures in Rubinius
234
+ when running in Ruby 1.9 mode. This coerces the added values to the encoding
235
+ of the old dataset (as determined by the first piece of the old dataset).
69
236
 
70
- * Diff::LCS::Hunk could not properly generate a difference for comparison
71
- sets that are not US-ASCII-compatible because of the use of literal
72
- regular expressions and strings. Jon Rowe found this in
73
- [rspec/rspec-expectations#219][] and provided a first pass
74
- implementation in [pull request #15][]. I've reworked it because of
75
- test failures in Rubinius when running in Ruby 1.9 mode. This coerces
76
- the added values to the encoding of the old dataset (as determined by
77
- the first piece of the old dataset).
78
- * Adding Travis CI testing for Ruby 2.0.
237
+ - Adding Travis CI testing for Ruby 2.0.
79
238
 
80
239
  ## 1.2.1 / 2013-02-09
81
240
 
82
- * Bugs Fixed:
241
+ - Bugs Fixed:
83
242
 
84
- * As seen in [rspec/rspec-expectations#200][], the release of
85
- Diff::LCS 1.2 introduced an unnecessary public API change to
86
- Diff::LCS::Hunk (see the change at
87
- [rspec/rspec-expectations@3d6fc82c][] for details). The new method name
88
- (and behaviour) is more correct, but I should not have renamed the
89
- function or should have at least provided an alias. This release
90
- restores Diff::LCS::Hunk#unshift as an alias to #merge. Note that the
91
- old #unshift behaviour was incorrect and will not be restored.
243
+ - As seen in [rspec/rspec-expectations#200][], the release of Diff::LCS 1.2
244
+ introduced an unnecessary public API change to Diff::LCS::Hunk (see the
245
+ change at [rspec/rspec-expectations@3d6fc82c][] for details). The new method
246
+ name (and behaviour) is more correct, but I should not have renamed the
247
+ function or should have at least provided an alias. This release restores
248
+ Diff::LCS::Hunk#unshift as an alias to #merge. Note that the old #unshift
249
+ behaviour was incorrect and will not be restored.
92
250
 
93
251
  ## 1.2.0 / 2013-01-21
94
252
 
95
- * Minor Enhancements:
96
-
97
- * Added special case handling for Diff::LCS.patch so that it handles
98
- patches that are empty or contain no changes.
99
- * Added two new methods (#patch\_me and #unpatch\_me) to the includable
100
- module.
101
-
102
- * Bugs Fixed:
103
-
104
- * Fixed [issue #1][] patch direction detection.
105
- * Resolved [issue #2][] by handling `string[string.size, 1]` properly (it
106
- returns `""` not `nil`).
107
- * Michael Granger (ged) fixed an implementation error in
108
- Diff::LCS::Change and added specs in [pull request #8][]. Thanks!
109
- * Made the code auto-testable.
110
- * Vít Ondruch (voxik) provided the latest version of the GPL2 license
111
- file in [pull request #10][]. Thanks!
112
- * Fixed a documentation issue with the includable versions of #patch! and
113
- #unpatch! where they implied that they would replace the original
114
- value. Given that Diff::LCS.patch always returns a copy, the
115
- documentation was incorrect and has been corrected. To provide the
116
- behaviour that was originally documented, two new methods were added to
117
- provide this behaviour. Found by scooter-dangle in [issue #12][].
118
- Thanks!
119
-
120
- * Code Style Changes:
121
-
122
- * Removed trailing spaces.
123
- * Calling class methods using `.` instead of `::`.
124
- * Vít Ondruch (voxik) removed unnecessary shebangs in [pull request #9][].
125
- Thanks!
126
- * Kenichi Kamiya (kachick) removed some warnings of an unused variable in
127
- lucky [pull request #13][]. Thanks!
128
- * Embarked on a major refactoring to make the files a little more
129
- manageable and understand the code on a deeper level.
130
- * Adding to http://travis-ci.org.
253
+ - Minor Enhancements:
254
+
255
+ - Added special case handling for Diff::LCS.patch so that it handles patches
256
+ that are empty or contain no changes.
257
+
258
+ - Added two new methods (#patch_me and #unpatch_me) to the includable module.
259
+
260
+ - Bugs Fixed:
261
+
262
+ - Fixed issue [#1][] patch direction detection.
263
+
264
+ - Resolved issue [#2][] by handling `string[string.size, 1]` properly (it
265
+ returns `""` not `nil`).
266
+
267
+ - Michael Granger (ged) fixed an implementation error in Diff::LCS::Change and
268
+ added specs in pull request [#8][]. Thanks!
269
+
270
+ - Made the code auto-testable.
271
+
272
+ - Vít Ondruch (voxik) provided the latest version of the GPL2 license file in
273
+ pull request [#10][]. Thanks!
274
+
275
+ - Fixed a documentation issue with the includable versions of #patch! and
276
+ #unpatch! where they implied that they would replace the original value.
277
+ Given that Diff::LCS.patch always returns a copy, the documentation was
278
+ incorrect and has been corrected. To provide the behaviour that was
279
+ originally documented, two new methods were added to provide this behaviour.
280
+ Found by scooter-dangle in issue [#12][]. Thanks!
281
+
282
+ - Code Style Changes:
283
+
284
+ - Removed trailing spaces.
285
+
286
+ - Calling class methods using `.` instead of `::`.
287
+
288
+ - Vít Ondruch (voxik) removed unnecessary shebangs in pull request [#9][].
289
+ Thanks!
290
+
291
+ - Kenichi Kamiya (kachick) removed some warnings of an unused variable in
292
+ lucky pull request [#13][]. Thanks!
293
+
294
+ - Embarked on a major refactoring to make the files a little more manageable
295
+ and understand the code on a deeper level.
296
+
297
+ - Adding to http://travis-ci.org.
131
298
 
132
299
  ## 1.1.3 / 2011-08-27
133
300
 
134
- * Converted to 'hoe' for release.
135
- * Converted tests to RSpec 2.
136
- * Extracted the body of htmldiff into a class available from
137
- diff/lcs/htmldiff.
138
- * Migrated development and issue tracking to GitHub.
139
- * Bugs fixed:
301
+ - Converted to 'hoe' for release.
302
+
303
+ - Converted tests to RSpec 2.
304
+
305
+ - Extracted the body of htmldiff into a class available from diff/lcs/htmldiff.
306
+
307
+ - Migrated development and issue tracking to GitHub.
308
+
309
+ - Bugs fixed:
140
310
 
141
- * Eliminated the explicit use of RubyGems in both bin/htmldiff and
142
- bin/ldiff. Resolves [issue #4][].
143
- * Eliminated Ruby warnings. Resolves [issue #3][].
311
+ - Eliminated the explicit use of RubyGems in both bin/htmldiff and bin/ldiff.
312
+ Resolves issue [#4][].
313
+
314
+ - Eliminated Ruby warnings. Resolves issue [#3][].
144
315
 
145
316
  ## 1.1.2 / 2004-10-20
146
317
 
147
- * Fixed a problem reported by Mauricio Fernandez in htmldiff.
318
+ - Fixed a problem reported by Mauricio Fernandez in htmldiff.
148
319
 
149
320
  ## 1.1.1 / 2004-09-25
150
321
 
151
- * Fixed bug #891 (Set returned from patch command does not contain last equal
152
- part).
153
- * Fixed a problem with callback initialisation code (it assumed that all
154
- callbacks passed as classes can be initialised; now, it rescues
155
- NoMethodError in the event of private :new being called).
156
- * Modified the non-initialisable callbacks to have a private #new method.
157
- * Moved ldiff core code to Diff::LCS::Ldiff (diff/lcs/ldiff.rb).
322
+ - Fixed bug #891 (Set returned from patch command does not contain last equal
323
+ part).
324
+
325
+ - Fixed a problem with callback initialisation code (it assumed that all
326
+ callbacks passed as classes can be initialised; now, it rescues NoMethodError
327
+ in the event of private :new being called).
328
+
329
+ - Modified the non-initialisable callbacks to have a private #new method.
330
+
331
+ - Moved ldiff core code to Diff::LCS::Ldiff (diff/lcs/ldiff.rb).
332
+
333
+ ## 1.1.0
334
+
335
+ - Eliminated the need for Diff::LCS::Event and removed it.
158
336
 
159
- ## 1.1.0 / -
337
+ - Added a contextual diff callback, Diff::LCS::ContextDiffCallback.
160
338
 
161
- * Eliminated the need for Diff::LCS::Event and removed it.
162
- * Added a contextual diff callback, Diff::LCS::ContextDiffCallback.
163
- * Implemented patching/unpatching for standard Diff callback output formats
164
- with both #diff and #sdiff.
165
- * Extensive documentation changes.
339
+ - Implemented patching/unpatching for standard Diff callback output formats with
340
+ both #diff and #sdiff.
341
+
342
+ - Extensive documentation changes.
166
343
 
167
344
  ## 1.0.4
168
345
 
169
- * Fixed a problem with bin/ldiff output, especially for unified format.
170
- Newlines that should have been present weren't.
171
- * Changed the .tar.gz installer to generate Windows batch files if ones do
172
- not exist already. Removed the existing batch files as they didn't work.
346
+ - Fixed a problem with bin/ldiff output, especially for unified format. Newlines
347
+ that should have been present weren't.
348
+
349
+ - Changed the .tar.gz installer to generate Windows batch files if ones do not
350
+ exist already. Removed the existing batch files as they didn't work.
173
351
 
174
352
  ## 1.0.3
175
353
 
176
- * Fixed a problem with #traverse\_sequences where the first difference from
177
- the left sequence might not be appropriately captured.
354
+ - Fixed a problem with #traverse_sequences where the first difference from the
355
+ left sequence might not be appropriately captured.
178
356
 
179
357
  ## 1.0.2
180
358
 
181
- * Fixed an issue with ldiff not working because actions were changed from
182
- symbols to strings.
359
+ - Fixed an issue with ldiff not working because actions were changed from
360
+ symbols to strings.
183
361
 
184
362
  ## 1.0.1
185
363
 
186
- * Minor modifications to the gemspec, the README.
187
- * Renamed the diff program to ldiff (as well as the companion batch file) so
188
- as to not collide with the standard diff program.
189
- * Fixed issues with RubyGems. Requires RubyGems > 0.6.1 or >= 0.6.1 with the
190
- latest CVS version.
364
+ - Minor modifications to the gemspec, the README.
191
365
 
192
- ## 1.0
366
+ - Renamed the diff program to ldiff (as well as the companion batch file) so as
367
+ to not collide with the standard diff program.
193
368
 
194
- * Initial release based mostly on Perl's Algorithm::Diff.
369
+ - Fixed issues with RubyGems. Requires RubyGems > 0.6.1 or >= 0.6.1 with the
370
+ latest CVS version.
195
371
 
196
- [rubinius/rubinius#2268]: https://github.com/rubinius/rubinius/issues/2268
197
- [rspec/rspec-expectations#239]: https://github.com/rspec/rspec-expectations/issues/239
198
- [rspec/rspec-expectations#238]: https://github.com/rspec/rspec-expectations/issues/238
372
+ ## 1.0
373
+
374
+ - Initial release based mostly on Perl's Algorithm::Diff.
375
+
376
+ [#1]: https://github.com/halostatue/diff-lcs/issues/1
377
+ [#2]: https://github.com/halostatue/diff-lcs/issues/2
378
+ [#3]: https://github.com/halostatue/diff-lcs/issues/3
379
+ [#4]: https://github.com/halostatue/diff-lcs/issues/4
380
+ [#5]: https://github.com/halostatue/diff-lcs/issues/5
381
+ [#6]: https://github.com/halostatue/diff-lcs/issues/6
382
+ [#8]: https://github.com/halostatue/diff-lcs/pull/8
383
+ [#9]: https://github.com/halostatue/diff-lcs/pull/9
384
+ [#10]: https://github.com/halostatue/diff-lcs/pull/10
385
+ [#12]: https://github.com/halostatue/diff-lcs/issues/12
386
+ [#13]: https://github.com/halostatue/diff-lcs/pull/13
387
+ [#15]: https://github.com/halostatue/diff-lcs/pull/15
388
+ [#18]: https://github.com/halostatue/diff-lcs/pull/18
389
+ [#21]: https://github.com/halostatue/diff-lcs/issues/21
390
+ [#23]: https://github.com/halostatue/diff-lcs/pull/23
391
+ [#25]: https://github.com/halostatue/diff-lcs/pull/25
392
+ [#29]: https://github.com/halostatue/diff-lcs/pull/29
393
+ [#33]: https://github.com/halostatue/diff-lcs/issues/33
394
+ [#34]: https://github.com/halostatue/diff-lcs/pull/34
395
+ [#35]: https://github.com/halostatue/diff-lcs/issues/35
396
+ [#36]: https://github.com/halostatue/diff-lcs/pull/36
397
+ [#38]: https://github.com/halostatue/diff-lcs/issues/38
398
+ [#43]: https://github.com/halostatue/diff-lcs/issues/43
399
+ [#44]: https://github.com/halostatue/diff-lcs/issues/44
400
+ [#47]: https://github.com/halostatue/diff-lcs/pull/47
401
+ [#48]: https://github.com/halostatue/diff-lcs/issues/48
402
+ [#49]: https://github.com/halostatue/diff-lcs/pull/49
403
+ [#52]: https://github.com/halostatue/diff-lcs/pull/52
404
+ [#53]: https://github.com/halostatue/diff-lcs/issues/53
405
+ [#57]: https://github.com/halostatue/diff-lcs/issues/57
406
+ [#58]: https://github.com/halostatue/diff-lcs/pull/58
407
+ [#59]: https://github.com/halostatue/diff-lcs/pull/59
408
+ [#60]: https://github.com/halostatue/diff-lcs/issues/60
409
+ [#61]: https://github.com/halostatue/diff-lcs/pull/61
410
+ [#63]: https://github.com/halostatue/diff-lcs/issues/63
411
+ [#65]: https://github.com/halostatue/diff-lcs/issues/65
412
+ [#69]: https://github.com/halostatue/diff-lcs/issues/69
413
+ [#71]: https://github.com/halostatue/diff-lcs/issues/71
414
+ [#72]: https://github.com/halostatue/diff-lcs/issues/72
415
+ [#73]: https://github.com/halostatue/diff-lcs/issues/73
416
+ [#75]: https://github.com/halostatue/diff-lcs/issues/75
417
+ [#79]: https://github.com/halostatue/diff-lcs/issues/79
418
+ [#80]: https://github.com/halostatue/diff-lcs/issues/80
419
+ [#82]: https://github.com/halostatue/diff-lcs/pull/82
420
+ [#84]: https://github.com/halostatue/diff-lcs/pull/84
421
+ [#86]: https://github.com/halostatue/diff-lcs/pull/86
422
+ [#89]: https://github.com/halostatue/diff-lcs/pull/89
423
+ [#90]: https://github.com/halostatue/diff-lcs/pull/90
424
+ [#91]: https://github.com/halostatue/diff-lcs/issues/91
425
+ [rspec/rspec-expectations#200]: https://github.com/rspec/rspec-expectations/pull/200
199
426
  [rspec/rspec-expectations#219]: https://github.com/rspec/rspec-expectations/issues/219
427
+ [rspec/rspec-expectations#238]: https://github.com/rspec/rspec-expectations/issues/238
428
+ [rspec/rspec-expectations#239]: https://github.com/rspec/rspec-expectations/issues/239
200
429
  [rspec/rspec-expectations@3d6fc82c]: https://github.com/rspec/rspec-expectations/commit/3d6fc82c
201
- [rspec/rspec-expectations#200]: https://github.com/rspec/rspec-expectations/pull/200
202
- [pull request #36]: https://github.com/halostatue/diff-lcs/pull/36
203
- [pull request #34]: https://github.com/halostatue/diff-lcs/pull/34
204
- [pull request #29]: https://github.com/halostatue/diff-lcs/pull/29
205
- [pull request #25]: https://github.com/halostatue/diff-lcs/pull/25
206
- [pull request #23]: https://github.com/halostatue/diff-lcs/pull/23
207
- [pull request #18]: https://github.com/halostatue/diff-lcs/pull/18
208
- [pull request #15]: https://github.com/halostatue/diff-lcs/pull/15
209
- [pull request #13]: https://github.com/halostatue/diff-lcs/pull/13
210
- [pull request #10]: https://github.com/halostatue/diff-lcs/pull/10
211
- [pull request #9]: https://github.com/halostatue/diff-lcs/pull/9
212
- [pull request #8]: https://github.com/halostatue/diff-lcs/pull/8
213
- [issue #38]: https://github.com/halostatue/diff-lcs/issues/38
214
- [issue #33]: https://github.com/halostatue/diff-lcs/issues/33
215
- [issue #21]: https://github.com/halostatue/diff-lcs/issues/21
216
- [issue #12]: https://github.com/halostatue/diff-lcs/issues/12
217
- [issue #4]: https://github.com/halostatue/diff-lcs/issues/4
218
- [issue #3]: https://github.com/halostatue/diff-lcs/issues/3
219
- [issue #2]: https://github.com/halostatue/diff-lcs/issues/2
220
- [issue #1]: https://github.com/halostatue/diff-lcs/issues/1
430
+ [rubinius/rubinius#2268]: https://github.com/rubinius/rubinius/issues/2268
431
+ [standard ruby]: https://github.com/standardrb/standard
data/License.md CHANGED
@@ -1,4 +1,4 @@
1
- == License
1
+ # License
2
2
 
3
3
  This software is available under three licenses: the GNU GPL version 2 (or at
4
4
  your option, a later version), the Perl Artistic license, or the MIT license.
@@ -12,7 +12,7 @@ licensing terms.
12
12
  * Adapted from Algorithm::Diff (Perl) by Ned Konz and a Smalltalk version by
13
13
  Mario I. Wolczko.
14
14
 
15
- === MIT License
15
+ ## MIT License
16
16
 
17
17
  Permission is hereby granted, free of charge, to any person obtaining a copy of
18
18
  this software and associated documentation files (the "Software"), to deal in
@@ -32,8 +32,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
32
32
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
33
33
  SOFTWARE.
34
34
 
35
- === Perl Artistic License (version 2)
35
+ ## Perl Artistic License
36
+
36
37
  See the file docs/artistic.txt in the main distribution.
37
38
 
38
- === GNU GPL version 2
39
+ ## GNU GPL version 2
40
+
39
41
  See the file docs/COPYING.txt in the main distribution.