From e8bc9f06550c043ef9be98e39a110fa3da38e6b4 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 20 Dec 2021 20:51:18 -0800 Subject: [PATCH] Make colors work! --- examples | 39 +++++++++++++++++++++++++++++++++++++++ test/test-sugar | 35 +++++++++++++++++++++++++++++++++++ ⚡️ | 10 +++++++++- 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 test/test-sugar diff --git a/examples b/examples index 1ba516b..fffd98c 100755 --- a/examples +++ b/examples @@ -5,4 +5,43 @@ echo Hello, world! } +⚡️build() { + _help-line "Build an incredible script" "$@" + echo "echo hi" > .generated/potato + chmod +x .generated/potato +} + +⚡️run() { + _help-line "Run the script" "$@" + ⚡️build + .generated/potato "$@" +} + +⚡️check() { + _help-line "Verify the script passes shellcheck" "$@" + ⚡️build + shellcheck .generated/potato +} + +⚡️test() { + _help-line "Test output of the script" "$@" + ⚡️build + [ "$(.generated/potato)" == "hi" ] +} + +⚡️clean() { + _help-line "Delete generated GARBAGE" "$@" + rm -rf .generated +} + +⚡️good() { + _help-line "Show a nice message for something nice happening" "$@" + _good-message + Good Message +} + +⚡️bad() { + _help-line "Show a bad message for something bad happening" "$@" + _bad-message - Bad Message +} + source ⚡️ diff --git a/test/test-sugar b/test/test-sugar new file mode 100644 index 0000000..895892b --- /dev/null +++ b/test/test-sugar @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +testGoodMessageShouldBeGreen() { + echo ' + #!/usr/bin/env bash + + ⚡️hello() { + _good-message "hello" + } + ' > go + + echo "source $REPO_ROOT/⚡️" >> go + chmod +x go + + try ./go hello + assertEquals "hello" "$STDOUT" +} + +testBadMessageShouldBeRed() { + echo ' + #!/usr/bin/env bash + + ⚡️hello() { + _bad-message "hello" + } + ' > go + + echo "source $REPO_ROOT/⚡️" >> go + chmod +x go + + try ./go hello + assertEquals "hello" "$STDOUT" +} + +source $(dirname $0)/runner diff --git a/⚡️ b/⚡️ index 966d206..fa52aaa 100644 --- a/⚡️ +++ b/⚡️ @@ -17,7 +17,7 @@ main() { if [[ $(type ⚡️$subcommand) =~ _help-line ]]; then printf "\t%-20s - %s\n" "$subcommand" "$(⚡️$subcommand help-line)" else - printf "\t%-20s" $subcommand + printf "\t%-20s\n" $subcommand fi done } @@ -32,4 +32,12 @@ _help-line() { fi } +_good-message() { + echo -e "\e[32m$@\e[0m" +} + +_bad-message() { + echo -e "\e[31m$@\e[0m" +} + main "$@"