From 120104e410edb932af4aa4be97796b57a3447c6d Mon Sep 17 00:00:00 2001 From: taca Date: Mon, 14 Sep 2020 14:26:02 +0000 Subject: [PATCH] textproc/ruby-diff-lcs: update to 1.4.4 Update ruby-diff-lcs to 1.4.4. ## 1.4.4 / 2020-07-01 - Fixed an issue reported by Jun Aruga in the Diff::LCS::Ldiff binary text detection. [#44][] - Fixed a theoretical issue reported by Jun Aruga in Diff::LCS::Hunk to raise a more useful exception. [#43][] - Added documentation that should address custom object issues as reported in [#35][]. - Fixed more diff errors, in part reported in [#65][]. - The use of `Numeric#abs` is incorrect in `Diff::LCS::Block#diff_size`. The diff size _must_ be accurate for correct change placement. - When selecting @max_diff_size in Diff::LCS::Hunk, choose it based on `block.diff_size.abs`. - Made a number of changes that will, unfortunately, increase allocations at the cost of being safe with frozen strings. - Add some knowledge that when `Diff::LCS::Hunk#diff` is called, that we are processing the _last_ hunk, so some changes will be made to how the output is generated. - `old`, `ed`, and `reverse_ed` formats have no differences. - `unified` format will report `\ No newline at end of file` given the correct conditions, at most once. Unified range reporting also differs for the last hunk such that the `length` of the range is reduced by one. - `context` format will report `\No newline at end of file` given the correct conditions, up to once per "file". Context range reporting also differs for the last hunk such that the `end` part of the range is reduced by one to a minimum of one. - Added a bunch more tests for the cases above, and fixed `hunk_spec.rb` so that the phrase being compared isn't nonsense French. - Updated formatting. - Added a Rake task to assist with manual testing on Ruby 1.8. ## 1.4.3 / 2020-06-29 - Fixed several issues with the 1.4 on Rubies older than 2.0. Some of this was providing useful shim functions to Hoe 3.x (which dropped these older Rubies a while ago). Specifically: - Removed Array#lazy from a method in Diff::LCS::Hunk. - Changed some unit tests to use old-style Symbol-keyed hashes. - Changed some unit test helper functions to no longer use keyword parameters, but only a trailing options hash. - Made the use of `psych` dependent on `RUBY_VERSION >= 1.9`. Resolves [#63][]. ## 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 part of the CI process any longer. - Akinora MUSHA (knu) added the ability for Diff::LCS::Change objects to be implicitly treated arrays. Originally provided as pull request [#47][], but it introduced a number of test failures as documented in [#48][], and remediation of Diff::LCS itself was introduced in [#49][]. - Resolved [#5][] with some tests comparing output from `system` calls to `bin/ldiff` with some pre-generated output. Resolved [#6][] with these tests. - Resolved a previously undetected `bin/ldiff` issue with `--context` output not matching `diff --context` output. - Resolved an issue with later versions of Ruby not working with an `OptParse` specification of `Numeric`; this has been changed to `Integer`. - Brandon Fish added truffleruby in [#52][]. - Fixed two missing classes as reported in [#53] --- textproc/ruby-diff-lcs/Makefile | 4 ++-- textproc/ruby-diff-lcs/PLIST | 10 +++++++++- textproc/ruby-diff-lcs/distinfo | 10 +++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/textproc/ruby-diff-lcs/Makefile b/textproc/ruby-diff-lcs/Makefile index f35a9abf2114..9c8a24baad84 100644 --- a/textproc/ruby-diff-lcs/Makefile +++ b/textproc/ruby-diff-lcs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2017/09/04 18:01:02 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2020/09/14 14:26:02 taca Exp $ -DISTNAME= diff-lcs-1.3 +DISTNAME= diff-lcs-1.4.4 CATEGORIES= textproc MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/textproc/ruby-diff-lcs/PLIST b/textproc/ruby-diff-lcs/PLIST index 4d3b614da924..cdc1cdd99dd9 100644 --- a/textproc/ruby-diff-lcs/PLIST +++ b/textproc/ruby-diff-lcs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2017/03/20 15:26:04 taca Exp $ +@comment $NetBSD: PLIST,v 1.8 2020/09/14 14:26:02 taca Exp $ bin/htmldiff${RUBY_SUFFIX} bin/ldiff${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem @@ -18,6 +18,7 @@ ${GEM_LIBDIR}/docs/artistic.txt ${GEM_LIBDIR}/lib/diff-lcs.rb ${GEM_LIBDIR}/lib/diff/lcs.rb ${GEM_LIBDIR}/lib/diff/lcs/array.rb +${GEM_LIBDIR}/lib/diff/lcs/backports.rb ${GEM_LIBDIR}/lib/diff/lcs/block.rb ${GEM_LIBDIR}/lib/diff/lcs/callbacks.rb ${GEM_LIBDIR}/lib/diff/lcs/change.rb @@ -28,8 +29,15 @@ ${GEM_LIBDIR}/lib/diff/lcs/ldiff.rb ${GEM_LIBDIR}/lib/diff/lcs/string.rb ${GEM_LIBDIR}/spec/change_spec.rb ${GEM_LIBDIR}/spec/diff_spec.rb +${GEM_LIBDIR}/spec/fixtures/aX +${GEM_LIBDIR}/spec/fixtures/bXaX ${GEM_LIBDIR}/spec/fixtures/ds1.csv ${GEM_LIBDIR}/spec/fixtures/ds2.csv +${GEM_LIBDIR}/spec/fixtures/ldiff/output.diff +${GEM_LIBDIR}/spec/fixtures/ldiff/output.diff-c +${GEM_LIBDIR}/spec/fixtures/ldiff/output.diff-e +${GEM_LIBDIR}/spec/fixtures/ldiff/output.diff-f +${GEM_LIBDIR}/spec/fixtures/ldiff/output.diff-u ${GEM_LIBDIR}/spec/hunk_spec.rb ${GEM_LIBDIR}/spec/issues_spec.rb ${GEM_LIBDIR}/spec/lcs_spec.rb diff --git a/textproc/ruby-diff-lcs/distinfo b/textproc/ruby-diff-lcs/distinfo index 14b10919911b..e6df577b3b4d 100644 --- a/textproc/ruby-diff-lcs/distinfo +++ b/textproc/ruby-diff-lcs/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2017/03/20 15:26:04 taca Exp $ +$NetBSD: distinfo,v 1.8 2020/09/14 14:26:02 taca Exp $ -SHA1 (diff-lcs-1.3.gem) = 8be462a44988891d3f4350085e965cd75dfc9d62 -RMD160 (diff-lcs-1.3.gem) = fe13bf98d501323dab8d4953a817ff93c531b376 -SHA512 (diff-lcs-1.3.gem) = b82de390d22e0c1337ddca923621b1cc842f583a93953ef07a303b428fe3a389f8a4a1a63617a58136c8d6215aff025a3bbec2a2f618e9ea81f471964f93b078 -Size (diff-lcs-1.3.gem) = 46080 bytes +SHA1 (diff-lcs-1.4.4.gem) = f3d8692458e983e77ce282e6d3481b5dca9c3817 +RMD160 (diff-lcs-1.4.4.gem) = 93a54bba68b26ca49cbd676735ef3a4f109b213b +SHA512 (diff-lcs-1.4.4.gem) = fcc6c86f392697c4b3690827f7c20d50fe68e367626b85a56446356d7bb21b4020bdb2bc5c2faf4e82807cd9f3049d71c94d166c85a1a4231f0fd9fc032f41c7 +Size (diff-lcs-1.4.4.gem) = 50688 bytes