mirror of
https://github.com/zplug/zplug
synced 2024-06-01 20:36:09 +02:00
Fix test and improve performance
This commit is contained in:
b4b4r07
parent
f79b3847a2
commit
897af91f2f
|
|
@ -47,59 +47,37 @@ __zplug::job::handle::state()
|
|||
message="Updated!"
|
||||
;;
|
||||
esac
|
||||
__zplug::job::message::green \
|
||||
--message "$message" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::green "$repo" "$message"
|
||||
;;
|
||||
$_zplug_status[up_to_date])
|
||||
__zplug::job::message::terminated \
|
||||
--message "Up-to-date" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::terminated "$repo" "Up-to-date"
|
||||
;;
|
||||
$_zplug_status[skip_local])
|
||||
__zplug::job::message::yellow \
|
||||
--message "Skip local repo" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::yellow "$repo" "Skip local repo"
|
||||
;;
|
||||
$_zplug_status[skip_frozen])
|
||||
__zplug::job::message::yellow \
|
||||
--message "Skip frozen repo" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::yellow "$repo" "Skip frozen repo"
|
||||
;;
|
||||
$_zplug_status[skip_if])
|
||||
__zplug::job::message::yellow \
|
||||
--message "Skip due to if" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::yellow "$repo" "Skip due to if"
|
||||
;;
|
||||
$_zplug_status[failure])
|
||||
__zplug::job::message::red \
|
||||
--message "Failed to $caller" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::red "$repo" "Failed to $caller"
|
||||
;;
|
||||
$_zplug_status[out_of_date])
|
||||
__zplug::job::message::red \
|
||||
--message "Local out of date" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::red "$repo" "Local out of date"
|
||||
;;
|
||||
$_zplug_status[not_on_branch])
|
||||
__zplug::job::message::red \
|
||||
--message "Not on any branch" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::red "$repo" "Not on any branch"
|
||||
;;
|
||||
$_zplug_status[not_git_repo])
|
||||
__zplug::job::message::red \
|
||||
--message "Not git repo" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::red "$repo" "Not git repo"
|
||||
;;
|
||||
$_zplug_status[repo_not_found])
|
||||
__zplug::job::message::red \
|
||||
--message "Repo not found" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::red "$repo" "Repo not found"
|
||||
;;
|
||||
$_zplug_status[unknown] | *)
|
||||
__zplug::job::message::red \
|
||||
--message "Unknown error" \
|
||||
--repo "$repo"
|
||||
__zplug::job::message::red "$repo" "Unknown error"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
|
@ -188,16 +166,7 @@ __zplug::job::handle::running()
|
|||
;;
|
||||
esac
|
||||
|
||||
# __zplug::job::message::running \
|
||||
# --spinner "$spinners[$spinner_idx]" \
|
||||
# --message "$message" \
|
||||
# --repo "$repo"
|
||||
|
||||
# TODO:
|
||||
builtin printf " $fg[white]%s$reset_color %s %s\n" \
|
||||
"$spinners[$spinner_idx]" \
|
||||
${(r,20,):-"$message"} \
|
||||
"$repo"
|
||||
__zplug::job::message::running "$repo" "$message" "$spinners[$spinner_idx]"
|
||||
}
|
||||
|
||||
__zplug::job::handle::hook()
|
||||
|
|
@ -259,26 +228,17 @@ __zplug::job::handle::hook()
|
|||
__zplug::utils::ansi::erace_current_line
|
||||
if __zplug::job::state::running "$hook_pids[$repo]"; then
|
||||
__zplug::job::message::green \
|
||||
--spinner "$spinners[$spinner_idx]" \
|
||||
--message "$message" \
|
||||
--repo "$repo" \
|
||||
--hook "$sub_spinners[$sub_spinner_idx]"
|
||||
"$repo" "$message" "$spinners[$spinner_idx]" "$sub_spinners[$sub_spinner_idx]"
|
||||
else
|
||||
if __zplug::job::hook::build_failure "$repo"; then
|
||||
__zplug::job::message::green \
|
||||
--message "$message" \
|
||||
--repo "$repo" \
|
||||
--hook=failure
|
||||
"$repo" "$message" "" "failure"
|
||||
elif __zplug::job::hook::build_timeout "$repo"; then
|
||||
__zplug::job::message::green \
|
||||
--message "$message" \
|
||||
--repo "$repo" \
|
||||
--hook=timeout
|
||||
"$repo" "$message" "" "timeout"
|
||||
else
|
||||
__zplug::job::message::green \
|
||||
--message "$message" \
|
||||
--repo "$repo" \
|
||||
--hook=success
|
||||
"$repo" "$message" "" "success"
|
||||
fi
|
||||
proc_states[$repo]="terminated"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,47 +1,6 @@
|
|||
__zplug::job::message::parser()
|
||||
{
|
||||
__zplug::utils::shell::getopts "$argv[@]" \
|
||||
| while read key value; \
|
||||
do
|
||||
case "$key" in
|
||||
_)
|
||||
;;
|
||||
spinner)
|
||||
spinner="$value"
|
||||
;;
|
||||
repo)
|
||||
repo="$value"
|
||||
;;
|
||||
message)
|
||||
message="$value"
|
||||
;;
|
||||
hook)
|
||||
hook="$value"
|
||||
case "$hook" in
|
||||
failure)
|
||||
color="red"
|
||||
;;
|
||||
success)
|
||||
color="green"
|
||||
;;
|
||||
timeout)
|
||||
color="yellow"
|
||||
;;
|
||||
cancel)
|
||||
color="red"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
__zplug::job::message::running()
|
||||
{
|
||||
local key value
|
||||
local spinner repo message hook color="white"
|
||||
__zplug::job::message::parser "$argv[@]"
|
||||
|
||||
local repo="$1" message="$2" spinner="$3"
|
||||
builtin printf " $fg[white]%s$reset_color %s %s\n" \
|
||||
"$spinner" \
|
||||
${(r,20,):-"$message"} \
|
||||
|
|
@ -50,9 +9,15 @@ __zplug::job::message::running()
|
|||
|
||||
__zplug::job::message::green()
|
||||
{
|
||||
local key value
|
||||
local spinner repo message hook color="white"
|
||||
__zplug::job::message::parser "$argv[@]"
|
||||
local repo="$1" message="$2" spinner="$3" hook="$4"
|
||||
local color=white
|
||||
|
||||
case "$hook" in
|
||||
success) color=green ;;
|
||||
failure) color=red ;;
|
||||
timeout) color=yellow ;;
|
||||
cancel) color=red ;;
|
||||
esac
|
||||
|
||||
builtin printf " $fg_bold[white]${spinner:-\U2714}$reset_color $fg[green]%s$reset_color %s" \
|
||||
${(r,20,):-"$message"} \
|
||||
|
|
@ -67,10 +32,7 @@ __zplug::job::message::green()
|
|||
|
||||
__zplug::job::message::terminated()
|
||||
{
|
||||
local key value
|
||||
local spinner repo message hook color="white"
|
||||
__zplug::job::message::parser "$argv[@]"
|
||||
|
||||
local repo="$1" message="$2"
|
||||
builtin printf " $fg[white]\U2714$reset_color %s %s\n" \
|
||||
${(r,20,):-"$message"} \
|
||||
"$repo"
|
||||
|
|
@ -78,10 +40,7 @@ __zplug::job::message::terminated()
|
|||
|
||||
__zplug::job::message::red()
|
||||
{
|
||||
local key value
|
||||
local spinner repo message hook color="white"
|
||||
__zplug::job::message::parser "$argv[@]"
|
||||
|
||||
local repo="$1" message="$2"
|
||||
printf " $fg_bold[red]\U2718$reset_color $fg[red]%s$reset_color %s\n" \
|
||||
${(r,20,):-"$message"} \
|
||||
"$repo"
|
||||
|
|
@ -89,10 +48,7 @@ __zplug::job::message::red()
|
|||
|
||||
__zplug::job::message::yellow()
|
||||
{
|
||||
local key value
|
||||
local spinner repo message hook color="white"
|
||||
__zplug::job::message::parser "$argv[@]"
|
||||
|
||||
local repo="$1" message="$2"
|
||||
printf " $fg_bold[yellow]\U279C$reset_color $fg[yellow]%s$reset_color %s\n" \
|
||||
${(r,20,):-"$message"} \
|
||||
"$repo"
|
||||
|
|
|
|||
|
|
@ -212,6 +212,9 @@ __zplug::utils::shell::eval()
|
|||
|
||||
__zplug::utils::shell::json_escape()
|
||||
{
|
||||
python -c 'import json,sys; print json.dumps(sys.stdin.read())'
|
||||
return $status
|
||||
|
||||
#| perl -pe 's/\//\\\//g' \
|
||||
if [[ -z $1 ]]; then
|
||||
cat <&0
|
||||
|
|
|
|||
14
misc/zshrc
14
misc/zshrc
|
|
@ -137,14 +137,14 @@ zplug clear
|
|||
|
||||
# if
|
||||
{
|
||||
zplug "tj/n", \
|
||||
as:command, \
|
||||
use:"bin/n", \
|
||||
if:'(( $+commands[node] ))'
|
||||
# zplug "tj/n", \
|
||||
# as:command, \
|
||||
# use:"bin/n", \
|
||||
# if:'(( $+commands[node] ))'
|
||||
|
||||
tests+=(
|
||||
'[[ -x $ZPLUG_HOME/bin/n ]]'
|
||||
)
|
||||
# tests+=(
|
||||
# '[[ -x $ZPLUG_HOME/bin/n ]]'
|
||||
# )
|
||||
}
|
||||
|
||||
# ignore
|
||||
|
|
|
|||
Loading…
Reference in New Issue