Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump diff-lcs from 1.3 to 1.4.4 #3

Merged
merged 1 commit into from Mar 14, 2021

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 14, 2021

Bumps diff-lcs from 1.3 to 1.4.4.

Changelog

Sourced from diff-lcs's changelog.

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[].

... (truncated)

Commits
  • 381ad11 Merge pull request #66 from halostatue/misplaced-chunk-issue-65
  • b75e0bd diff-lcs 1.4.4 - Fix broken formatting
  • 60613d2 # This is a combination of 9 commits.
  • 99f65fd Release v1.4.3
  • 83bfe1b Merge pull request #64 from halostatue/fix-ruby-1.8-support
  • 2a9a662 Fix some issues with 1.4 on older Rubies
  • 20ea8f2 Merge pull request #61 from halostatue/fix-issue-60
  • caeca62 Fix filename substitution
  • c032222 Test fix for timestamp issue
  • 9aabe2f Change when max_diff_size is applied
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file ruby Pull requests that update Ruby code labels Mar 14, 2021
@dependabot dependabot bot force-pushed the dependabot/bundler/diff-lcs-1.4.4 branch from 3c360ea to 4c04634 Compare March 14, 2021 13:05
Bumps [diff-lcs](https://github.com/halostatue/diff-lcs) from 1.3 to 1.4.4.
- [Release notes](https://github.com/halostatue/diff-lcs/releases)
- [Changelog](https://github.com/halostatue/diff-lcs/blob/master/History.md)
- [Commits](halostatue/diff-lcs@v1.3...v1.4.4)

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot force-pushed the dependabot/bundler/diff-lcs-1.4.4 branch from 4c04634 to b17f69c Compare March 14, 2021 13:05
@jeppester jeppester merged commit e06bd13 into main Mar 14, 2021
@jeppester jeppester deleted the dependabot/bundler/diff-lcs-1.4.4 branch March 14, 2021 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file ruby Pull requests that update Ruby code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ruby version isn't limited in gemspec.
1 participant