From de04969251ac1e6c9e4714a4534045e2bb7d9580 Mon Sep 17 00:00:00 2001 From: Tyler Witt Date: Wed, 12 Feb 2025 23:22:19 +0900 Subject: [PATCH 1/3] Bump deps --- .tool-versions | 4 ++-- mix.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.tool-versions b/.tool-versions index 0574c4b..bb51a93 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -erlang 26.1.2 -elixir 1.16.0-rc.0-otp-26 +erlang 27.2 +elixir 1.18.1-otp-27 diff --git a/mix.lock b/mix.lock index a3d5414..d5aa993 100644 --- a/mix.lock +++ b/mix.lock @@ -1,8 +1,8 @@ %{ - "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"}, - "ex_doc": {:hex, :ex_doc, "0.30.9", "d691453495c47434c0f2052b08dd91cc32bc4e1a218f86884563448ee2502dd2", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"}, - "makeup": {:hex, :makeup, "1.1.1", "fa0bc768698053b2b3869fa8a62616501ff9d11a562f3ce39580d60860c3a55e", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"}, - "makeup_elixir": {:hex, :makeup_elixir, "0.16.1", "cc9e3ca312f1cfeccc572b37a09980287e243648108384b97ff2b76e505c3555", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"}, - "makeup_erlang": {:hex, :makeup_erlang, "0.1.3", "d684f4bac8690e70b06eb52dad65d26de2eefa44cd19d64a8095e1417df7c8fd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9"}, - "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"}, + "earmark_parser": {:hex, :earmark_parser, "1.4.43", "34b2f401fe473080e39ff2b90feb8ddfeef7639f8ee0bbf71bb41911831d77c5", [:mix], [], "hexpm", "970a3cd19503f5e8e527a190662be2cee5d98eed1ff72ed9b3d1a3d466692de8"}, + "ex_doc": {:hex, :ex_doc, "0.37.1", "65ca30d242082b95aa852b3b73c9d9914279fff56db5dc7b3859be5504417980", [:mix], [{:earmark_parser, "~> 1.4.42", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "6774f75477733ea88ce861476db031f9399c110640752ca2b400dbbb50491224"}, + "makeup": {:hex, :makeup, "1.2.1", "e90ac1c65589ef354378def3ba19d401e739ee7ee06fb47f94c687016e3713d1", [:mix], [{:nimble_parsec, "~> 1.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "d36484867b0bae0fea568d10131197a4c2e47056a6fbe84922bf6ba71c8d17ce"}, + "makeup_elixir": {:hex, :makeup_elixir, "1.0.1", "e928a4f984e795e41e3abd27bfc09f51db16ab8ba1aebdba2b3a575437efafc2", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "7284900d412a3e5cfd97fdaed4f5ed389b8f2b4cb49efc0eb3bd10e2febf9507"}, + "makeup_erlang": {:hex, :makeup_erlang, "1.0.2", "03e1804074b3aa64d5fad7aa64601ed0fb395337b982d9bcf04029d68d51b6a7", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "af33ff7ef368d5893e4a267933e7744e46ce3cf1f61e2dccf53a111ed3aa3727"}, + "nimble_parsec": {:hex, :nimble_parsec, "1.4.2", "8efba0122db06df95bfaa78f791344a89352ba04baedd3849593bfce4d0dc1c6", [:mix], [], "hexpm", "4b21398942dda052b403bbe1da991ccd03a053668d147d53fb8c4e0efe09c973"}, } From 7b7b54fa22e33663e2e8d97201327251f71115a8 Mon Sep 17 00:00:00 2001 From: Tyler Witt Date: Wed, 12 Feb 2025 23:22:53 +0900 Subject: [PATCH 2/3] Fix deprecations --- script/colors.exs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/script/colors.exs b/script/colors.exs index 0c10494..31338b5 100644 --- a/script/colors.exs +++ b/script/colors.exs @@ -1,4 +1,4 @@ -Bunt.puts([:bright, :white, "# BACKGROUNDS" |> String.ljust(80)]) +Bunt.puts([:bright, :white, "# BACKGROUNDS" |> String.pad_trailing(80)]) Bunt.puts() Bunt.puts("Use as a background color like this:") Bunt.puts() @@ -16,7 +16,7 @@ Bunt.ANSI.color_tuples() [ :"#{color}_background", :black, - "#{color}" |> String.ljust(14) + "#{color}" |> String.pad_trailing(14) ] ] @@ -31,7 +31,7 @@ Bunt.ANSI.color_tuples() end) Bunt.puts() -Bunt.puts([:bright, :white, "# COLORS" |> String.ljust(80)]) +Bunt.puts([:bright, :white, "# COLORS" |> String.pad_trailing(80)]) Bunt.puts() Bunt.puts("Use as a color like this:") Bunt.puts() @@ -48,7 +48,7 @@ Bunt.ANSI.color_tuples() [ [ :"#{color}", - "#{color}" |> String.ljust(14) + "#{color}" |> String.pad_trailing(14) ] ] @@ -63,7 +63,7 @@ Bunt.ANSI.color_tuples() end) Bunt.puts() -Bunt.puts([:bright, :white, "# ALIAS COLORS" |> String.ljust(80)]) +Bunt.puts([:bright, :white, "# ALIAS COLORS" |> String.pad_trailing(80)]) Bunt.puts() Bunt.puts("Since these names are hard to remember, you can alias them in your config.exs:") Bunt.puts() @@ -78,7 +78,7 @@ Bunt.puts("Use this to give your colors semantics. They get easier to change lat Bunt.puts() Bunt.puts() -Bunt.puts([:bright, :white, "# COLORS WITH NAMES" |> String.ljust(80)]) +Bunt.puts([:bright, :white, "# COLORS WITH NAMES" |> String.pad_trailing(80)]) Bunt.puts() Bunt.puts( @@ -100,7 +100,7 @@ Bunt.ANSI.color_tuples() [ [ :"#{color}", - "#{name}" |> String.ljust(14) + "#{name}" |> String.pad_trailing(14) ] ] end From 1a618ca1b47b986aa91c079a65c6690cb4431dba Mon Sep 17 00:00:00 2001 From: Tyler Witt Date: Wed, 12 Feb 2025 23:27:24 +0900 Subject: [PATCH 3/3] Fix script/colors.exs color tuple display The acc was being lost so the script would say `Replace `:gold` with any of these values:` and then have nothing after. --- script/colors.exs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/script/colors.exs b/script/colors.exs index 31338b5..279e65a 100644 --- a/script/colors.exs +++ b/script/colors.exs @@ -94,8 +94,8 @@ Bunt.puts() Bunt.ANSI.color_tuples() |> Enum.reduce([], fn {name, color, _code, _rgb_tuple}, acc -> - if name do - acc = + acc = + if name do acc ++ [ [ @@ -103,7 +103,9 @@ Bunt.ANSI.color_tuples() "#{name}" |> String.pad_trailing(14) ] ] - end + else + acc + end case rem(acc |> Enum.count(), 6) do 5 ->