diff --git a/lib/difftastic/upstream.rb b/lib/difftastic/upstream.rb index 1d527e4..f4d4bd1 100644 --- a/lib/difftastic/upstream.rb +++ b/lib/difftastic/upstream.rb @@ -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", diff --git a/test/diff_files_test.rb b/test/diff_files_test.rb index 4a1d29b..d128f46 100644 --- a/test/diff_files_test.rb +++ b/test/diff_files_test.rb @@ -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) @@ -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) @@ -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 @@ -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 diff --git a/test/difftastic_test.rb b/test/difftastic_test.rb index 796c3b9..6ec96a9 100644 --- a/test/difftastic_test.rb +++ b/test/difftastic_test.rb @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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[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\n\e[2m4 \e[0m \e[2m4 \e[0m \n\e[2m5 \e[0m \e[2m5 \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[92;1m3 \e[0m <\e[1mh1\e[0m>\e[92;1;4mGoodbye\e[0m\e[92m, world!\e[0m\n\e[2m4 \e[0m \e[2m4 \e[0m \n\e[2m5 \e[0m \e[2m5 \e[0m", output end end diff --git a/test/display_test.rb b/test/display_test.rb index 94dd5a2..888d330 100644 --- a/test/display_test.rb +++ b/test/display_test.rb @@ -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 @@ -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 diff --git a/test/labels_test.rb b/test/labels_test.rb index 0233c41..89ed906 100644 --- a/test/labels_test.rb +++ b/test/labels_test.rb @@ -8,7 +8,7 @@ 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 @@ -16,7 +16,7 @@ class LabelsTest < Minitest::Spec "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 @@ -24,7 +24,7 @@ class LabelsTest < Minitest::Spec "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 @@ -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 @@ -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 @@ -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 diff --git a/test/width_test.rb b/test/width_test.rb index 7cff51c..bf3d79d 100644 --- a/test/width_test.rb +++ b/test/width_test.rb @@ -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