From 66802140673d944a428e7cffaba66df101efde33 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 3 May 2021 22:45:12 +0300 Subject: .ci: rename test scripts --- .ci/bin/main.sh | 8 +++--- .ci/bin/mutual_friends.sh | 23 ---------------- .ci/bin/mutuals.sh | 23 ++++++++++++++++ .ci/bin/online_sessions.sh | 69 ---------------------------------------------- .ci/bin/sessions.sh | 69 ++++++++++++++++++++++++++++++++++++++++++++++ .ci/bin/show_status.sh | 22 --------------- .ci/bin/status.sh | 60 ++++++++++++++++++++++++++++++++++++++++ .ci/bin/status_once.sh | 22 +++++++++++++++ .ci/bin/track_status.sh | 60 ---------------------------------------- 9 files changed, 178 insertions(+), 178 deletions(-) delete mode 100755 .ci/bin/mutual_friends.sh create mode 100755 .ci/bin/mutuals.sh delete mode 100755 .ci/bin/online_sessions.sh create mode 100755 .ci/bin/sessions.sh delete mode 100755 .ci/bin/show_status.sh create mode 100755 .ci/bin/status.sh create mode 100755 .ci/bin/status_once.sh delete mode 100755 .ci/bin/track_status.sh diff --git a/.ci/bin/main.sh b/.ci/bin/main.sh index bfe2052..6207677 100755 --- a/.ci/bin/main.sh +++ b/.ci/bin/main.sh @@ -11,9 +11,9 @@ script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" script_dir="$( cd -- "$script_dir" && pwd )" readonly script_dir -"$script_dir/mutual_friends.sh" +"$script_dir/mutuals.sh" -"$script_dir/online_sessions.sh" +"$script_dir/sessions.sh" -"$script_dir/show_status.sh" -"$script_dir/track_status.sh" +"$script_dir/status_once.sh" +"$script_dir/status.sh" diff --git a/.ci/bin/mutual_friends.sh b/.ci/bin/mutual_friends.sh deleted file mode 100755 index 383dbdd..0000000 --- a/.ci/bin/mutual_friends.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2019 Egor Tensin -# This file is part of the "VK scripts" project. -# For details, see https://github.com/egor-tensin/vk-scripts. -# Distributed under the MIT License. - -set -o errexit -o nounset -o pipefail - -script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" -script_dir="$( cd -- "$script_dir" && pwd )" -readonly script_dir - -test_users() { - "$script_dir/../lib/test.sh" vk.mutuals --format csv "$@" - "$script_dir/../lib/test.sh" vk.mutuals --format json "$@" -} - -main() { - test_users kreed58 maxkorzh_official -} - -main diff --git a/.ci/bin/mutuals.sh b/.ci/bin/mutuals.sh new file mode 100755 index 0000000..383dbdd --- /dev/null +++ b/.ci/bin/mutuals.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +# Copyright (c) 2019 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. + +set -o errexit -o nounset -o pipefail + +script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" +script_dir="$( cd -- "$script_dir" && pwd )" +readonly script_dir + +test_users() { + "$script_dir/../lib/test.sh" vk.mutuals --format csv "$@" + "$script_dir/../lib/test.sh" vk.mutuals --format json "$@" +} + +main() { + test_users kreed58 maxkorzh_official +} + +main diff --git a/.ci/bin/online_sessions.sh b/.ci/bin/online_sessions.sh deleted file mode 100755 index 7a01dc3..0000000 --- a/.ci/bin/online_sessions.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2019 Egor Tensin -# This file is part of the "VK scripts" project. -# For details, see https://github.com/egor-tensin/vk-scripts. -# Distributed under the MIT License. - -set -o errexit -o nounset -o pipefail - -script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" -script_dir="$( cd -- "$script_dir" && pwd )" -readonly script_dir -script_name="$( basename -- "${BASH_SOURCE[0]}" )" -readonly script_name - -readonly db_path="$script_dir/../share/test_db.csv" - -dump() { - local msg - for msg; do - echo "$script_name: $msg" - done -} - -test_output() { - local output_path - output_path="$( mktemp --dry-run )" - - local rm_aux_files - rm_aux_files="$( printf -- 'rm -f -- %q' "$output_path" )" - - trap "$rm_aux_files" RETURN - - "$script_dir/../lib/test.sh" vk.tracking.sessions "$@" "$db_path" "$output_path" - - if file --brief --dereference --mime -- "$output_path" | grep --quiet -- 'charset=binary$'; then - dump 'Output is a binary file, not going to show that' - return 0 - fi - - cat "$output_path" -} - -group_by() { - test_output --output-format csv --group-by "$@" - test_output --output-format json --group-by "$@" - test_output --output-format plot --group-by "$@" -} - -online_sessions() { - group_by user - group_by hour - group_by date - group_by weekday -} - -fix_matplotlib() { - # Get rid of: - # tkinter.TclError: no display name and no $DISPLAY environment variable - mkdir -p -- ~/.config/matplotlib - echo 'backend: Agg' > ~/.config/matplotlib/matplotlibrc -} - -main() { - fix_matplotlib - online_sessions -} - -main diff --git a/.ci/bin/sessions.sh b/.ci/bin/sessions.sh new file mode 100755 index 0000000..7a01dc3 --- /dev/null +++ b/.ci/bin/sessions.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env bash + +# Copyright (c) 2019 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. + +set -o errexit -o nounset -o pipefail + +script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" +script_dir="$( cd -- "$script_dir" && pwd )" +readonly script_dir +script_name="$( basename -- "${BASH_SOURCE[0]}" )" +readonly script_name + +readonly db_path="$script_dir/../share/test_db.csv" + +dump() { + local msg + for msg; do + echo "$script_name: $msg" + done +} + +test_output() { + local output_path + output_path="$( mktemp --dry-run )" + + local rm_aux_files + rm_aux_files="$( printf -- 'rm -f -- %q' "$output_path" )" + + trap "$rm_aux_files" RETURN + + "$script_dir/../lib/test.sh" vk.tracking.sessions "$@" "$db_path" "$output_path" + + if file --brief --dereference --mime -- "$output_path" | grep --quiet -- 'charset=binary$'; then + dump 'Output is a binary file, not going to show that' + return 0 + fi + + cat "$output_path" +} + +group_by() { + test_output --output-format csv --group-by "$@" + test_output --output-format json --group-by "$@" + test_output --output-format plot --group-by "$@" +} + +online_sessions() { + group_by user + group_by hour + group_by date + group_by weekday +} + +fix_matplotlib() { + # Get rid of: + # tkinter.TclError: no display name and no $DISPLAY environment variable + mkdir -p -- ~/.config/matplotlib + echo 'backend: Agg' > ~/.config/matplotlib/matplotlibrc +} + +main() { + fix_matplotlib + online_sessions +} + +main diff --git a/.ci/bin/show_status.sh b/.ci/bin/show_status.sh deleted file mode 100755 index 890cc3d..0000000 --- a/.ci/bin/show_status.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2019 Egor Tensin -# This file is part of the "VK scripts" project. -# For details, see https://github.com/egor-tensin/vk-scripts. -# Distributed under the MIT License. - -set -o errexit -o nounset -o pipefail - -script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" -script_dir="$( cd -- "$script_dir" && pwd )" -readonly script_dir - -test_users() { - "$script_dir/../lib/test.sh" vk.tracking.status --only-once "$@" -} - -main() { - test_users egor.tensin -} - -main diff --git a/.ci/bin/status.sh b/.ci/bin/status.sh new file mode 100755 index 0000000..9ff5d6a --- /dev/null +++ b/.ci/bin/status.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env bash + +# Copyright (c) 2019 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. + +set -o errexit -o nounset -o pipefail + +script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" +script_dir="$( cd -- "$script_dir" && pwd )" +readonly script_dir +script_name="$( basename -- "${BASH_SOURCE[0]}" )" +readonly script_name + +dump() { + local msg + for msg; do + echo "$script_name: $msg" + done +} + +test_users() { + local log_path + log_path="$( mktemp )" + local db_path + db_path="$( mktemp --dry-run )" + + local rm_aux_files + rm_aux_files="$( printf -- 'rm -f -- %q %q' "$log_path" "$db_path" )" + trap "$rm_aux_files" RETURN + + "$script_dir/../lib/test.sh" vk.tracking.status "$@" --log "$log_path" --format csv --output "$db_path" & + local pid="$!" + + sleep 3 + dump "Log file path: $log_path" + dump "DB file path: $db_path" + dump "PID: $pid" + + local timeout=10 + dump "Sleeping for $timeout seconds..." + sleep "$timeout" + + dump 'Terminating track_status.py...' + kill "$pid" + dump 'Waiting for track_status.py to terminate...' + wait "$pid" || true + + dump "Log file:" + cat "$log_path" + dump "DB:" + cat "$db_path" +} + +main() { + test_users egor.tensin +} + +main "$@" diff --git a/.ci/bin/status_once.sh b/.ci/bin/status_once.sh new file mode 100755 index 0000000..890cc3d --- /dev/null +++ b/.ci/bin/status_once.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +# Copyright (c) 2019 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. + +set -o errexit -o nounset -o pipefail + +script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" +script_dir="$( cd -- "$script_dir" && pwd )" +readonly script_dir + +test_users() { + "$script_dir/../lib/test.sh" vk.tracking.status --only-once "$@" +} + +main() { + test_users egor.tensin +} + +main diff --git a/.ci/bin/track_status.sh b/.ci/bin/track_status.sh deleted file mode 100755 index 9ff5d6a..0000000 --- a/.ci/bin/track_status.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2019 Egor Tensin -# This file is part of the "VK scripts" project. -# For details, see https://github.com/egor-tensin/vk-scripts. -# Distributed under the MIT License. - -set -o errexit -o nounset -o pipefail - -script_dir="$( dirname -- "${BASH_SOURCE[0]}" )" -script_dir="$( cd -- "$script_dir" && pwd )" -readonly script_dir -script_name="$( basename -- "${BASH_SOURCE[0]}" )" -readonly script_name - -dump() { - local msg - for msg; do - echo "$script_name: $msg" - done -} - -test_users() { - local log_path - log_path="$( mktemp )" - local db_path - db_path="$( mktemp --dry-run )" - - local rm_aux_files - rm_aux_files="$( printf -- 'rm -f -- %q %q' "$log_path" "$db_path" )" - trap "$rm_aux_files" RETURN - - "$script_dir/../lib/test.sh" vk.tracking.status "$@" --log "$log_path" --format csv --output "$db_path" & - local pid="$!" - - sleep 3 - dump "Log file path: $log_path" - dump "DB file path: $db_path" - dump "PID: $pid" - - local timeout=10 - dump "Sleeping for $timeout seconds..." - sleep "$timeout" - - dump 'Terminating track_status.py...' - kill "$pid" - dump 'Waiting for track_status.py to terminate...' - wait "$pid" || true - - dump "Log file:" - cat "$log_path" - dump "DB:" - cat "$db_path" -} - -main() { - test_users egor.tensin -} - -main "$@" -- cgit v1.2.3