summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix some issues with 1.4 on older Rubiesfix-ruby-1.8-supportAustin Ziegler2020-06-286-11/+40
| | | | | - Required to fully support rspec. - Resolves #63.
* Merge pull request #61 from halostatue/fix-issue-60v1.4.2Austin Ziegler2020-06-239-20/+92
|\ | | | | Change when max_diff_size is applied
| * Fix filename substitutionAustin Ziegler2020-06-231-7/+8
| |
| * Test fix for timestamp issueAustin Ziegler2020-06-231-2/+2
| |
| * Change when max_diff_size is appliedAustin Ziegler2020-06-239-14/+85
| | | | | | | | | | | | | | - This appears to satisfy the issues found in #60 as well as providing the additional fixes required to properly test ldiff. Resolves #60
* | Merge pull request #59 from CamilleDrapier/camille/fix_rubocop_typoAustin Ziegler2020-06-231-1/+1
|\ \ | |/ |/| Fix Styel/NumericPredicate has the wrong namespace - should be Style
| * Fix typo for rubocop cop namspacecamille2020-06-241-1/+1
|/
* Merge pull request #58 from halostatue/fix-issue-57v1.4.1Austin Ziegler2020-06-237-27/+25
|\ | | | | Fix an issue with negative hunk max_size
| * Change test runnerAustin Ziegler2020-06-231-1/+1
| |
| * Fix windows test failuresAustin Ziegler2020-06-231-6/+8
| |
| * Fix an issue with negative hunk max_sizeAustin Ziegler2020-06-235-20/+16
|/ | | | | | | Resolves #57. - The `diff_size` should be an absolute value. - Added a test to ensure that the issue does not introduce a regression.
* Merge pull request #55 from halostatue/release-v14v1.4Austin Ziegler2020-06-225-36/+21
|\ | | | | Prepare for 1.4 release
| * Finalize 1.4 releaseAustin Ziegler2020-06-225-36/+21
|/ | | | | | | | - Use GitHub Actions - Exclude windows code from non-windows tests - Exclude unsupported windows tests and allow windows failures for now because of line-ending differences - Remove Travis configuration
* Try GitHub Actions for diff-lcs CIAustin Ziegler2020-06-221-0/+48
|
* Merge pull request #54 from halostatue/hoe-3-18-supportAustin Ziegler2020-06-226-308/+304
|\ | | | | Various updates for v 1.4
| * Various updates for v 1.4Austin Ziegler2020-06-226-308/+304
|/ | | | | - Support hoe >= 3.18 - Various bug fixes and updates
* Merge pull request #52 from bjfish/add-truffleruby-to-ciAustin Ziegler2020-06-221-0/+1
|\ | | | | Add truffleruby to travis CI
| * Add truffleruby to travis CIBrandon Fish2020-01-071-0/+1
|/
* Resolve multiple issues for 1.4Austin Ziegler2019-02-0415-48/+148
| | | | | | | | | | | | | - Resolve ldiff output issues: Resolves #5 and #6 by adding system-output comparison calls to `bin/ldiff` compared against some pre-generated output. There is some timestamp manipulation involved with the output comparison, as the timestamps are unstable because of the way that git clone works. - Resolved a problem with bin/ldiff --context output. - Resolved a Numeric/Integer OptParse issue: later versions of Ruby had problems working with an `OptParse` option specification of `Numeric`; this has been changed to `Integer`.
* Update documentationAustin Ziegler2019-02-012-3/+3
|
* Reintroduce Diff::LCS::Change#to_aryAustin Ziegler2019-02-018-62/+116
| | | | | | | | | | | - This required some level of code remediation in the main library, but all tests now pass: - Patchsets are now internally flattened one level explicitly, rather than using Array#flatten. This ensures that only the outer patchset array is flattened. Fixes #48.
* Applied Rubocop rules that I likeAustin Ziegler2019-01-2736-818/+1002
| | | | | - Other linting configuration also applied. - Soft-deprecating versions older than 2.3.
* Revert PR#47 "Add #to_ary to Diff::LCS::Change…"Austin Ziegler2019-01-273-42/+0
| | | | | | | | | | This reverts commits 01e0cae and 3b4d2be because they introduce fatally breaking changes in the tests that were hidden by broken CI. * 01e0cae: Add #to_ary to Diff::LCS::Change and Diff::LCS::ContextChange [Akinori MUSHA] * 3b4d2be: Mention in rdoc that Diff::LCS::ContextChange can be converted to an array [Akinori MUSHA]
* Make travis test the right things...Austin Ziegler2019-01-261-4/+1
|
* Mention in rdoc that Diff::LCS::ContextChange can be converted to an arrayAkinori MUSHA2019-01-261-0/+14
|
* Add #to_ary to Diff::LCS::Change and Diff::LCS::ContextChangeAkinori MUSHA2019-01-262-0/+28
| | | | | | | | | | | | | | | | | It would be quite handy if you could write as follows: ```ruby Diff::LCS.sdiff(a, b).each do |action, (old_position, old_element), (new_position, new_element)| case action when '!' # replace when '-' # delete when '+' # insert end end ```
* Merge pull request #42 from nicolasleger/patch-1Austin Ziegler2018-02-121-4/+5
|\
| * [CI] Test against Ruby 2.5Nicolas Leger2018-02-121-4/+5
|/
* Small README fixAustin Ziegler2017-01-181-4/+0
|
* Using SPDX license descriptions for releasev1.3Austin Ziegler2017-01-182-2/+2
|
* Fix Ruby 1.8 build issuesAustin Ziegler2017-01-181-1/+2
|
* Merge pull request #39 from halostatue/spec-cleanupAustin Ziegler2017-01-1831-772/+1028
|\ | | | | Various diff-lcs Fixes
| * diff-lcs 1.3Austin Ziegler2017-01-1831-743/+1007
| | | | | | | | | | | | | | | | | | | | | | - Updated testing and gem infrastructure. - Cleaning up documentation. - Modernizing specs. - Silence Ruby 2.4 Fixnum deprecation warnings. Fixes #36, #38. - Ensure test dependencies are loaded. Fixes #33, #34 so that specs can be run independently. - Fix issue #1 with incorrect intuition of patch direction. Tentative fix, but the failure cases pass now.
| * Fixing Coveralls for testing.Austin Ziegler2017-01-113-32/+24
|/
* Merge pull request #31 from apuratepp/udpate-url-in-gemspecAustin Ziegler2015-01-291-1/+1
|\ | | | | Update Homepage URL in gemspec file
| * Update Homepage URL in gemspec fileJosep2015-01-291-1/+1
|/
* Fixing travis execution.Austin Ziegler2014-04-261-1/+2
|
* Bumping version in preparation for next release.Austin Ziegler2014-04-263-15/+21
|
* Fix travis builds.Austin Ziegler2014-04-261-10/+23
|
* Merge pull request #29 from GoBoundless/fix_compareAustin Ziegler2014-04-261-0/+2
|\ | | | | update Change and ContextChange's '==' methods to compare against the other object's class
| * update Diff::LCS::Change and Diff::LCS::ContextChange's '==' methods to ↵Kevin Mook2014-04-231-0/+2
| | | | | | | | compare against the other object's class
* | Point to the GitHub repo as home.Austin Ziegler2014-04-261-1/+1
| | | | | | | | | | | | | | - Until I can work up a better page. Fixes #26. Fixes #28.
* | Fixing a banner bug with bin/ldiffAustin Ziegler2014-04-261-1/+1
| | | | | | | | Fixes #21.
* | Enabling code coverage.Austin Ziegler2014-04-263-6/+64
| |
* | Final changes for release 1.25.Austin Ziegler2014-04-266-16/+22
|/
* Merge pull request #25 from hubrix/patch-1Austin Ziegler2013-12-311-2/+2
|\ | | | | Update htmldiff.rb
| * Update htmldiff.rbMark Friedgan2013-12-221-2/+2
|/ | | expand tabs is broken otherwise and the code is inconsistent anyway
* Release 1.25: Bugfix for pull request #23.Austin Ziegler2013-11-074-9/+28
|
* Merge pull request #23 from joshbronson/masterAustin Ziegler2013-11-051-1/+1
|\ | | | | fixing for Diff::LCS::Change.from_a
| * fixing for Diff::LCS::Change.from_ajoshbronson2013-11-051-1/+1
|/ | | | | | | | | | | | | flatten should only go one level deep to avoid problems when diffing arrays of arrays, e.g.: Diff::LCS.sdiff([[1,2]], []) RuntimeError: Invalid change array format provided. from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/change.rb:50:in `from_a' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/change.rb:137:in `from_a' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/change.rb:158:in `simplify' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/callbacks.rb:312:in `discard_a' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs.rb:633:in `traverse_balanced' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs/internals.rb:10:in `diff_traversal' from /Users/joshbronson/homebase/jbro-homebase/bundle/ruby/1.9.1/gems/diff-lcs-1.2.4/lib/diff/lcs.rb:266:in `sdiff'