Skip to content

Commit

Permalink
chore: Prepare for next release
Browse files Browse the repository at this point in the history
  • Loading branch information
halostatue committed Feb 13, 2025
1 parent 0b0f794 commit 7f37423
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 7 deletions.
34 changes: 32 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
# Changelog

## NEXT / 2025-MM-DD
## 1.6.0 / 2025-02-13

- Baptiste Courtois (@annih) has done significant work on making `bin/ldiff`
work better, contributing a number of issues and pull requests. These include:

- Separation of command parsing from diff-generation in `Diff::LCS::Ldiff`
code extraction making it easier to use separately from the `bin/ldiff`
command in [#103][pull-103]. This partially resolves [#46][issue-46].

- Improvement of binary and empty file detection and tests in [#104][pull-104]
and [#105][pull-105]. This resolves issues [#100][issue-100],
[#102][issue-102].

- Various ldiff fixes for output [#101][pull-101] resolves issues
[#106][issue-106] (ldiff ed scripts are inverted), [#107][issue-107] (ldiff
hunk ranges are incorrect; regression or incorrect fix for [#60][issue-60]),
and [#95][issue-95].

- Patrick Linnane fixed various minor typos. [#93][pull-93]

- Mark Young added a Changelog link to the RubyGems metadata. [#92][pull-92]
This has been modified to incorporate it into the README.

- Updated the documentation on `Diff::LCS#lcs` to be clearer about the
requirements for object equality comparison. This resolves [#70][issue-70].

- Governance:

Changes described here are effective 2024-12-31.
Expand Down Expand Up @@ -55,7 +74,7 @@
That is, `LCS(s2, s1)` should produce a sequence that is transitive with
`LCS(s1, s2)` on traversal, and applying the diff computed from those
results would result in equivalent changes that could be played forward or
backward as appropriate. [#71][pull-], [#75][pull-75]
backward as appropriate. [#71][pull-71], [#75][pull-75]

- The above fix resulted in a changed order of the longest common subsequence
when callbacks were applied. After analysis, it was determined that the
Expand Down Expand Up @@ -413,13 +432,20 @@
[issue-38]: https://github.com/halostatue/diff-lcs/issues/38
[issue-43]: https://github.com/halostatue/diff-lcs/issues/43
[issue-44]: https://github.com/halostatue/diff-lcs/issues/44
[issue-46]: https://github.com/halostatue/diff-lcs/issues/46
[issue-48]: https://github.com/halostatue/diff-lcs/issues/48
[issue-53]: https://github.com/halostatue/diff-lcs/issues/53
[issue-57]: https://github.com/halostatue/diff-lcs/issues/57
[issue-60]: https://github.com/halostatue/diff-lcs/issues/60
[issue-63]: https://github.com/halostatue/diff-lcs/issues/63
[issue-65]: https://github.com/halostatue/diff-lcs/issues/65
[issue-70]: https://github.com/halostatue/diff-lcs/issues/70
[issue-91]: https://github.com/halostatue/diff-lcs/issues/91
[issue-95]: https://github.com/halostatue/diff-lcs/issues/95
[issue-100]: https://github.com/halostatue/diff-lcs/issues/100
[issue-102]: https://github.com/halostatue/diff-lcs/issues/102
[issue-106]: https://github.com/halostatue/diff-lcs/issues/106
[issue-107]: https://github.com/halostatue/diff-lcs/issues/107
[pull-08]: https://github.com/halostatue/diff-lcs/pull/8
[pull-09]: https://github.com/halostatue/diff-lcs/pull/9
[pull-10]: https://github.com/halostatue/diff-lcs/pull/10
Expand Down Expand Up @@ -451,6 +477,10 @@
[pull-90]: https://github.com/halostatue/diff-lcs/pull/90
[pull-92]: https://github.com/halostatue/diff-lcs/pull/92
[pull-93]: https://github.com/halostatue/diff-lcs/pull/93
[pull-101]: https://github.com/halostatue/diff-lcs/pull/101
[pull-103]: https://github.com/halostatue/diff-lcs/pull/103
[pull-104]: https://github.com/halostatue/diff-lcs/pull/104
[pull-105]: https://github.com/halostatue/diff-lcs/pull/105
[rspec-expectations#200]: https://github.com/rspec/rspec-expectations/pull/200
[rspec-expectations#219]: https://github.com/rspec/rspec-expectations/issues/219
[rspec-expectations#238]: https://github.com/rspec/rspec-expectations/issues/238
Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributors

- Austin Ziegler created diff-lcs.
- Austin Ziegler (@halostatue) created diff-lcs.

Thanks to everyone else who has contributed to diff-lcs over the years:

Expand All @@ -11,6 +11,7 @@ Thanks to everyone else who has contributed to diff-lcs over the years:
- Akinori Musha
- Artem Ignatyev
- Brandon Fish
- Baptiste Courtois (@annih)
- Camille Drapier
- Cédric Boutillier
- Gregg Kellogg
Expand Down
6 changes: 3 additions & 3 deletions diff-lcs.gemspec
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# -*- encoding: utf-8 -*-
# stub: diff-lcs 1.5.1 ruby lib
# stub: diff-lcs 1.6.0 ruby lib

Gem::Specification.new do |s|
s.name = "diff-lcs".freeze
s.version = "1.5.1".freeze
s.version = "1.6.0".freeze

s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
s.metadata = { "changelog_uri" => "https://github.com/halostatue/diff-lcs/blob/main/CHANGELOG.md", "rubygems_mfa_required" => "true" } if s.respond_to? :metadata=
s.require_paths = ["lib".freeze]
s.authors = ["Austin Ziegler".freeze]
s.date = "2025-02-02"
s.date = "2025-02-13"
s.description = "Diff::LCS computes the difference between two Enumerable sequences using the\nMcIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities\nto create a simple HTML diff output format and a standard diff-like tool.\n\nThis is release 1.4.3, providing a simple extension that allows for\nDiff::LCS::Change objects to be treated implicitly as arrays and fixes a number\nof formatting issues.\n\nRuby versions below 2.5 are soft-deprecated, which means that older versions are\nno longer part of the CI test suite. If any changes have been introduced that\nbreak those versions, bug reports and patches will be accepted, but it will be\nup to the reporter to verify any fixes prior to release. The next major release\nwill completely break compatibility.".freeze
s.email = ["halostatue@gmail.com".freeze]
s.executables = ["htmldiff".freeze, "ldiff".freeze]
Expand Down
2 changes: 1 addition & 1 deletion lib/diff/lcs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ module Diff; end unless defined? Diff
# a x b y c z p d q
# a b c a x b y c z
module Diff::LCS
VERSION = "1.5.1"
VERSION = "1.6.0"
end

require "diff/lcs/callbacks"
Expand Down

0 comments on commit 7f37423

Please sign in to comment.