Skip to content

Upgrade upstream difftastic to v0.67.0 #34

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.

Sign up for GitHub

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

Merged
marcoroth merged 1 commit into from
Dec 19, 2025
Merged

Upgrade upstream difftastic to v0.67.0 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/difftastic/upstream.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module Difftastic
module Upstream
VERSION = "0.62.0"
VERSION = "0.67.0"

NATIVE_PLATFORMS = {
"arm64-darwin" => "difft-aarch64-apple-darwin.tar.gz",
Expand Down
8 changes: 4 additions & 4 deletions test/diff_files_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class DiffFilesTest < Minitest::Spec
output = differ.diff_files(a_path, b_path)

begin
assert_equal "1 A 1 B", output
assert_equal "1 A 1 B", output
ensure
FileUtils.rm(a_path)
FileUtils.rm(b_path)
Expand All @@ -42,7 +42,7 @@ class DiffFilesTest < Minitest::Spec
output = differ.diff_files(a, b)

begin
assert_equal "1 A 1 B", output
assert_equal "1 A 1 B", output
ensure
FileUtils.rm(a_path)
FileUtils.rm(b_path)
Expand All @@ -66,7 +66,7 @@ class DiffFilesTest < Minitest::Spec
output = differ.diff_files(a, b)

begin
assert_equal "1 A 1 B", output
assert_equal "1 A 1 B", output
ensure
a.close
b.close
Expand All @@ -90,7 +90,7 @@ class DiffFilesTest < Minitest::Spec
output = differ.diff_files(a, b)

begin
assert_equal "1 A 1 B", output
assert_equal "1 A 1 B", output
ensure
a.unlink
b.unlink
Expand Down
12 changes: 6 additions & 6 deletions test/difftastic_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class DifftasticTest < Minitest::Spec
[3, 2, 1]
)

assert_equal "\e[91;1m1 \e[0m[\e[91m1\e[0m, 2, \e[91m3\e[0m] \e[92;1m1 \e[0m[\e[92m3\e[0m, 2, \e[92m1\e[0m]", output
assert_equal "\e[91;1m1 \e[0m[\e[91m1\e[0m, 2, \e[91m3\e[0m] \e[92;1m1 \e[0m[\e[92m3\e[0m, 2, \e[92m1\e[0m]", output
end

it "empty set" do
Expand All @@ -18,7 +18,7 @@ class DifftasticTest < Minitest::Spec
Set.new([1, 2, 3])
)

assert_equal %(1 Set[] 1 Set[1, 2, 3]), output
assert_equal %(1 Set[] 1 Set[1, 2, 3]), output
end

it "empty array" do
Expand All @@ -27,7 +27,7 @@ class DifftasticTest < Minitest::Spec
[3, 2, 1]
)

assert_equal "1 [] 1 [3, 2, 1]", output
assert_equal "1 [] 1 [3, 2, 1]", output
end

it "empty string" do
Expand All @@ -36,7 +36,7 @@ class DifftasticTest < Minitest::Spec
"String",
)

assert_equal %(1 "" 1 "String"), output
assert_equal %(1 "" 1 "String"), output
end

it "empty symbol" do
Expand All @@ -45,7 +45,7 @@ class DifftasticTest < Minitest::Spec
:Symbol
)

assert_equal %(1 :"" 1 :Symbol), output
assert_equal %(1 :"" 1 :Symbol), output
end

it "html" do
Expand All @@ -54,6 +54,6 @@ class DifftasticTest < Minitest::Spec

output = Difftastic::Differ.new(color: :always, tab_width: 2).diff_html(a, b)

assert_equal "\e[2m1 \e[0m<\e[1mhtml\e[0m> \e[2m1 \e[0m<\e[1mhtml\e[0m>\n\e[2m2 \e[0m <\e[1mbody\e[0m> \e[2m2 \e[0m <\e[1mbody\e[0m>\n\e[91;1m3 \e[0m <\e[1mh1\e[0m>\e[91;1;4mHello\e[0m\e[91m,\e[0m\e[91m \e[0m\e[91mworld\e[0m\e[91m!\e[0m</\e[1mh1\e[0m> \e[92;1m3 \e[0m <\e[1mh1\e[0m>\e[92;1;4mGoodbye\e[0m\e[92m,\e[0m\e[92m \e[0m\e[92mworld\e[0m\e[92m!\e[0m</\e[1mh1\e[0m>\n\e[2m4 \e[0m </\e[1mbody\e[0m> \e[2m4 \e[0m </\e[1mbody\e[0m>\n\e[2m5 \e[0m</\e[1mhtml\e[0m> \e[2m5 \e[0m</\e[1mhtml\e[0m>", output
assert_equal "\e[2m1 \e[0m<\e[1mhtml\e[0m> \e[2m1 \e[0m<\e[1mhtml\e[0m>\n\e[2m2 \e[0m <\e[1mbody\e[0m> \e[2m2 \e[0m <\e[1mbody\e[0m>\n\e[91;1m3 \e[0m <\e[1mh1\e[0m>\e[91;1;4mHello\e[0m\e[91m, world!\e[0m</\e[1mh1\e[0m> \e[92;1m3 \e[0m <\e[1mh1\e[0m>\e[92;1;4mGoodbye\e[0m\e[92m, world!\e[0m</\e[1mh\e[0m\n\e[91;1m\e[2m. \e[0m\e[0m \e[92;1m\e[2m. \e[0m\e[0m\e[1m1\e[0m>\n\e[2m4 \e[0m </\e[1mbody\e[0m> \e[2m4 \e[0m </\e[1mbody\e[0m>\n\e[2m5 \e[0m</\e[1mhtml\e[0m> \e[2m5 \e[0m</\e[1mhtml\e[0m>", output
end
end
6 changes: 3 additions & 3 deletions test/display_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ class DisplayTest < Minitest::Spec
it "display default" do
output = Difftastic::Differ.new(color: :never).diff_objects([], [1, 2, 3])

assert_equal "1 [] 1 [1, 2, 3]", output
assert_equal "1 [] 1 [1, 2, 3]", output
end

it "display side-by-side-show-both" do
output = Difftastic::Differ.new(color: :never, display: "side-by-side-show-both").diff_objects([], [1, 2, 3])

assert_equal "1 [] 1 [1, 2, 3]", output
assert_equal "1 [] 1 [1, 2, 3]", output
end

it "display side-by-side" do
Expand All @@ -24,7 +24,7 @@ class DisplayTest < Minitest::Spec
it "display side-by-side with left side change" do
output = Difftastic::Differ.new(color: :never, display: "side-by-side").diff_objects([3, 2, 1], [1, 2, 3])

assert_equal "1 [3, 2, 1] 1 [1, 2, 3]", output
assert_equal "1 [3, 2, 1] 1 [1, 2, 3]", output
end

it "display inline" do
Expand Down
12 changes: 6 additions & 6 deletions test/labels_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ class LabelsTest < Minitest::Spec
"123",
"456"
)
assert_equal "\e[91;1mLeft \e[92;1mRight\e[0m\n\e[91;1m1 \e[0m\e[91m\"123\"\e[0m \e[92;1m1 \e[0m\e[92m\"456\"\e[0m", output
assert_equal "\e[91;1mLeft \e[92;1mRight\e[0m\n\e[91;1m1 \e[0m\e[91m\"123\"\e[0m \e[92;1m1 \e[0m\e[92m\"456\"\e[0m", output
end

it "labels only left" do
output = Difftastic::Differ.new(color: :always, tab_width: 2, left_label: "Left").diff_objects(
"123",
"456"
)
assert_equal "\e[91;1mLeft \e[0m\n\e[91;1m1 \e[0m\e[91m\"123\"\e[0m \e[92;1m1 \e[0m\e[92m\"456\"\e[0m", output
assert_equal "\e[91;1mLeft \e[0m\n\e[91;1m1 \e[0m\e[91m\"123\"\e[0m \e[92;1m1 \e[0m\e[92m\"456\"\e[0m", output
end

it "labels only right" do
output = Difftastic::Differ.new(color: :always, tab_width: 2, right_label: "Right").diff_objects(
"123",
"456"
)
assert_equal " \e[92;1mRight\e[0m\n\e[91;1m1 \e[0m\e[91m\"123\"\e[0m \e[92;1m1 \e[0m\e[92m\"456\"\e[0m", output
assert_equal " \e[92;1mRight\e[0m\n\e[91;1m1 \e[0m\e[91m\"123\"\e[0m \e[92;1m1 \e[0m\e[92m\"456\"\e[0m", output
end

it "labels long line diff with color" do
Expand All @@ -33,7 +33,7 @@ class LabelsTest < Minitest::Spec
"this is a super long diff to demonstrate that the labels get positioned correctly",
)

assert_equal "\e[91;1mLeft \e[92;1mRight\e[0m\n\e[91;1m1 \e[0m\e[91m\"\e[0m\e[91mthis\e[0m\e[91m \e[0m\e[91mis\e[0m\e[91m \e[0m\e[91ma\e[0m\e[91m \e[0m\e[91msuper\e[0m\e[91m \e[0m\e[91mlong\e[0m\e[91m \e[0m\e[91mdiff\e[0m\e[91m \e[0m\e[91mto\e[0m\e[91m \e[0m\e[91mdemonst\e[0m \e[92;1m1 \e[0m\e[92m\"\e[0m\e[92mthis\e[0m\e[92m \e[0m\e[92mis\e[0m\e[92m \e[0m\e[92ma\e[0m\e[92m \e[0m\e[92msuper\e[0m\e[92m \e[0m\e[92mlong\e[0m\e[92m \e[0m\e[92mdiff\e[0m\e[92m \e[0m\e[92mto\e[0m\e[92m \e[0m\e[92mdemonst\e[0m\n\e[91;1m\e[2m. \e[0m\e[0m\e[91mrate\e[0m\e[91m \e[0m\e[91mthat\e[0m\e[91m \e[0m\e[91mthe\e[0m\e[91m \e[0m\e[91mlabels\e[0m\e[91m \e[0m\e[91mget\e[0m\e[91m \e[0m\e[91mpositioned\e[0m\e[91m \e[0m\e[91;1;4mi\e[0m \e[92;1m\e[2m. \e[0m\e[0m\e[92mrate\e[0m\e[92m \e[0m\e[92mthat\e[0m\e[92m \e[0m\e[92mthe\e[0m\e[92m \e[0m\e[92mlabels\e[0m\e[92m \e[0m\e[92mget\e[0m\e[92m \e[0m\e[92mpositioned\e[0m\e[92m \e[0m\e[92;1;4mc\e[0m\n\e[91;1m\e[2m. \e[0m\e[0m\e[91;1;4mncorrectly\e[0m\e[91m\"\e[0m \e[92;1m\e[2m. \e[0m\e[0m\e[92;1;4morrectly\e[0m\e[92m\"\e[0m", output
assert_equal "\e[91;1mLeft \e[92;1mRight\e[0m\n\e[91;1m1 \e[0m\e[91m\"this is a super long diff to demonst\e[0m \e[92;1m1 \e[0m\e[92m\"this is a super long diff to demonst\e[0m\n\e[91;1m\e[2m. \e[0m\e[0m\e[91mrate that the labels get positioned \e[0m\e[91;1;4mi\e[0m \e[92;1m\e[2m. \e[0m\e[0m\e[92mrate that the labels get positioned \e[0m\e[92;1;4mc\e[0m\n\e[91;1m\e[2m. \e[0m\e[0m\e[91;1;4mncorrectly\e[0m\e[91m\"\e[0m \e[92;1m\e[2m. \e[0m\e[0m\e[92;1;4morrectly\e[0m\e[92m\"\e[0m", output
end

it "labels long line diff width=80" do
Expand Down Expand Up @@ -69,7 +69,7 @@ class LabelsTest < Minitest::Spec
"this is a super long diff to demonstrate that the labels get positioned correctly",
)

assert_equal "\e[91;1mLeft \e[92;1mRight\e[0m\n1 \"this is a super long diff to demonstrate that the labels get positioned incorrectly\" 1 \"this is a super long diff to demonstrate that the labels get positioned correctly\"", output
assert_equal "\e[91;1mLeft \e[92;1mRight\e[0m\n1 \"this is a super long diff to demonstrate that the labels get positioned incorrectly\" 1 \"this is a super long diff to demonstrate that the labels get positioned correctly\"", output
end

it "labels with no tab_width" do
Expand All @@ -78,6 +78,6 @@ class LabelsTest < Minitest::Spec
"Right"
)

assert_equal "\e[91;1mLeft \e[92;1mRight\e[0m\n\e[91;1m1 \e[0m\e[91m\"Left\"\e[0m \e[92;1m1 \e[0m\e[92m\"Right\"\e[0m", output
assert_equal "\e[91;1mLeft \e[92;1mRight\e[0m\n\e[91;1m1 \e[0m\e[91m\"Left\"\e[0m \e[92;1m1 \e[0m\e[92m\"Right\"\e[0m", output
end
end
2 changes: 1 addition & 1 deletion test/width_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ class WidthTest < Minitest::Spec
it "no width" do
output = Difftastic::Differ.new(color: :never).diff_strings("123 456", "123 456 789")

assert_equal "1 123 456 1 123 456 789", output
assert_equal "1 123 456 1 123 456 789", output
end
end