mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-11 17:13:59 +00:00
Code Activity

refactoring

Browse Source
This commit is contained in:
deadc0de6
2023-05-02 23:19:37 +02:00
committed by deadc0de
parent ca393e7708
commit 19b97a9dc2
5 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests-ng/global-compare-negative-ignore.sh → tests-ng/compare-global-negative-ignore.sh vendored
View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# author: jtt9340 (https://github.com/jtt9340) # author: jtt9340 (https://github.com/jtt9340)
# author: deadc0de6
# #
# test install cmpignore with negative ignores globally # test install cmpignore with negative ignores globally
# returns 1 in case of error # returns 1 in case of error

43
tests-ng/compare-negative-ignore-relative.sh vendored
View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# author: jtt9340 (https://github.com/jtt9340) # author: jtt9340 (https://github.com/jtt9340)
# author: deadc0de6
# #
# test compare negative ignore relative # test compare negative ignore relative
# returns 1 in case of error # returns 1 in case of error
@@ -37,9 +38,9 @@ clear_on_exit "${tmpd}"
# some files # some files
mkdir -p "${tmpd}"/program/ignore_me mkdir -p "${tmpd}"/program/ignore_me
echo "some data" > "${tmpd}"/program/a echo "some data1" > "${tmpd}"/program/a
echo "some data" > "${tmpd}"/program/ignore_me/b echo "some data2" > "${tmpd}"/program/ignore_me/b
echo "some data" > "${tmpd}"/program/ignore_me/c echo "some data3" > "${tmpd}"/program/ignore_me/c
# create the config file # create the config file
cfg="${basedir}/config.yaml" cfg="${basedir}/config.yaml"
@@ -50,33 +51,35 @@ echo "[+] import"
cd "${ddpath}" | ${bin} import -f -c "${cfg}" "${tmpd}"/program cd "${ddpath}" | ${bin} import -f -c "${cfg}" "${tmpd}"/program
# make some changes to generate a diff # make some changes to generate a diff
echo "some other data" > "${tmpd}"/program/a echo "changed1" > "${tmpd}"/program/a
echo "some other data" > "${tmpd}"/program/ignore_me/b echo "changed2" > "${tmpd}"/program/ignore_me/b
echo "some other data" > "${tmpd}"/program/ignore_me/c echo "changed3" > "${tmpd}"/program/ignore_me/c
# expects two diffs (no need to test comparing normal - 3 diffs, as that is taken care of in compare-negative-ignore.sh) # expects two diffs (no need to test comparing normal - 3 diffs, as that is taken care of in compare-negative-ignore.sh)
patt0="ignore_me/*" patt0="ignore_me/*"
patt1="!ignore_me/c" patt1="!ignore_me/c"
echo "[+] comparing with ignore (patterns: ${patt0} and ${patt1}) - 2 diffs" echo "[+] comparing with ignore (patterns: ${patt0} and ${patt1}) - expect 2 diffs"
set +e set +e
cd "${ddpath}" | ${bin} compare -c "${cfg}" --verbose --ignore="${patt0}" --ignore=${patt1} cd "${ddpath}" | ${bin} compare -c "${cfg}" --verbose --ignore="${patt0}" --ignore=${patt1}
[ "$?" = "0" ] && exit 1 [ "$?" = "0" ] && exit 1
cnt=$(cd "${ddpath}" | ${bin} compare -c "${cfg}" --ignore="${patt0}" --ignore=${patt1} | grep '^=> diff' | wc -l)
set -e set -e
[ "${cnt}" != "2" ] && echo "bad number of diffs: ${cnt}/2" && exit 1
######################################## ########################################
# Test ignores specified in config.yaml # Test ignores specified in config.yaml
######################################## ########################################
# add some files # add some files
mkdir -p "${tmpd}"/.zsh mkdir -p "${tmpd}/.zsh/plugins"
echo "some data" > "${tmpd}"/.zsh/somefile echo "data1" > "${tmpd}"/.zsh/somefile
mkdir -p "${tmpd}"/.zsh/plugins echo "data2" > "${tmpd}"/.zsh/plugins/someplugin
echo "some data" > "${tmpd}"/.zsh/plugins/someplugin
echo "[+] import .zsh" echo "[+] import .zsh"
cd "${ddpath}" | ${bin} import -f -c "${cfg}" "${tmpd}"/.zsh cd "${ddpath}" | ${bin} import -f -c "${cfg}" "${tmpd}"/.zsh
touch "${tmpd}"/.zsh/plugins/ignore-1.zsh echo "init1" > "${tmpd}"/.zsh/plugins/ignore-1.zsh
touch "${tmpd}"/.zsh/plugins/ignore-2.zsh echo "init2" > "${tmpd}"/.zsh/plugins/ignore-2.zsh
# adding ignore in config.yaml # adding ignore in config.yaml
cfg2="${basedir}/config2.yaml" cfg2="${basedir}/config2.yaml"
@@ -89,19 +92,23 @@ sed '/d_zsh:/a\
# expects one diff # expects one diff
patt0="plugins/ignore-?.zsh" patt0="plugins/ignore-?.zsh"
patt1="!plugins/ignore-2.zsh" patt1="!plugins/ignore-2.zsh"
echo "[+] comparing with ignore (patterns: ${patt0} and ${patt1}) - 1 diff" echo "[+] comparing with ignore (patterns: ${patt0} and ${patt1}) - expect 1 diff"
set +e set +e
cd "${ddpath}" | ${bin} compare -c "${cfg}" --verbose -C "${tmpd}"/.zsh --ignore="${patt0}" --ignore=${patt1} cd "${ddpath}" | ${bin} compare -c "${cfg}" --verbose -C "${tmpd}"/.zsh --ignore="${patt0}" --ignore=${patt1}
[ "$?" = "0" ] && exit 1 [ "$?" = "0" ] && exit 1
cnt=$(cd "${ddpath}" | ${bin} compare -c "${cfg}" -C "${tmpd}"/.zsh --ignore="${patt0}" --ignore=${patt1} | grep 'does not exist in dotdrop$' | wc -l)
set -e set -e
[ "${cnt}" != "1" ] && echo "bad number of diffs: ${cnt}/1" && exit 1
# expects one diff # expects one diff
echo "[+] comparing .zsh with ignore in dotfile - 1 diff expected" echo "[+] comparing .zsh with ignore in dotfile - expect 1 diff"
set +e set +e
cd "${ddpath}" | ${bin} compare -c "${cfg2}" --verbose -C "${tmpd}"/.zsh cd "${ddpath}" | ${bin} compare -c "${cfg2}" --verbose -C "${tmpd}"/.zsh
ret="$?" [ "${?}" = "0" ] && exit 1
echo ${ret} cnt=$(cd "${ddpath}" | ${bin} compare -c "${cfg2}" -C "${tmpd}"/.zsh | grep 'does not exist in dotdrop$' | wc -l)
[ "${ret}" = "0" ] && exit 1
set -e set -e
[ "${cnt}" != "1" ] && echo "bad number of diffs: ${cnt}/1" && exit 1
echo "OK" echo "OK"

29
tests-ng/compare-negative-ignore.sh vendored
View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# author: jtt9340 (https://github.com/jtt9340) # author: jtt9340 (https://github.com/jtt9340)
# author: deadc0de6
# #
# test install negative ignore absolute/relative # test install negative ignore absolute/relative
# returns 1 in case of error # returns 1 in case of error
@@ -44,9 +45,9 @@ clear_on_exit "${tmpd}"
# some files # some files
mkdir -p "${tmpd}"/program/ignore_me mkdir -p "${tmpd}"/program/ignore_me
echo "some data" > "${tmpd}"/program/a echo "data1" > "${tmpd}"/program/a
echo "some data" > "${tmpd}"/program/ignore_me/b echo "data2" > "${tmpd}"/program/ignore_me/b
echo "some data" > "${tmpd}"/program/ignore_me/c echo "data3" > "${tmpd}"/program/ignore_me/c
# create the config file # create the config file
cfg="${basedir}/config.yaml" cfg="${basedir}/config.yaml"
@@ -57,25 +58,32 @@ echo "[+] import"
cd "${ddpath}" | ${bin} import -f -c "${cfg}" "${tmpd}"/program cd "${ddpath}" | ${bin} import -f -c "${cfg}" "${tmpd}"/program
# make some changes to generate a diff # make some changes to generate a diff
echo "some other data" > "${tmpd}"/program/a echo "changed1" > "${tmpd}"/program/a
echo "some other data" > "${tmpd}"/program/ignore_me/b echo "changed1" > "${tmpd}"/program/ignore_me/b
echo "some other data" > "${tmpd}"/program/ignore_me/c echo "changed1" > "${tmpd}"/program/ignore_me/c
echo "[+] comparing normal - 3 diffs" echo "[+] comparing normal - 3 diffs expected"
set +e set +e
cd "${ddpath}" | ${bin} compare -c "${cfg}" --verbose cd "${ddpath}" | ${bin} compare -c "${cfg}" --verbose
[ "$?" = 0 ] && exit 1 # We don't want an exit status of 0 [ "$?" = 0 ] && exit 1 # We don't want an exit status of 0
cnt=$(cd "${ddpath}" | ${bin} compare -c "${cfg}" | grep '^=> diff' | wc -l)
set -e set -e
[ "${cnt}" != "3" ] && echo "bad number of diff: ${cnt}/3" && exit 1
# expects two diffs # expects two diffs
patt0="*/ignore_me/*" patt0="*/ignore_me/*"
patt1="!*/ignore_me/c" patt1="!*/ignore_me/c"
echo "[+] comparing with ignore (patterns: ${patt0} and ${patt1}) - 2 diffs" echo "[+] comparing with ignore (patterns: ${patt0} and ${patt1}) - 2 diffs expected"
set +e set +e
cd "${ddpath}" | ${bin} compare -c "${cfg}" --verbose --ignore="${patt0}" --ignore="${patt1}" cd "${ddpath}" | ${bin} compare -c "${cfg}" --verbose --ignore="${patt0}" --ignore="${patt1}"
[ "$?" = "0" ] && exit 1 [ "$?" = "0" ] && exit 1
cnt=$(cd "${ddpath}" | ${bin} compare -c "${cfg}" --ignore="${patt0}" --ignore="${patt1}" | grep '^=> diff' | wc -l)
set -e set -e
[ "${cnt}" != "2" ] && echo "bad number of diff: ${cnt}/2" && exit 1
# Adding ignore in dotfile # Adding ignore in dotfile
cfg2="${basedir}/config2.yaml" cfg2="${basedir}/config2.yaml"
# shellcheck disable=SC1004 # shellcheck disable=SC1004
@@ -86,11 +94,14 @@ sed '/d_program:/a\
' "${cfg}" > "${cfg2}" ' "${cfg}" > "${cfg2}"
# still expects two diffs # still expects two diffs
echo "[+] comparing with ignore in dotfile - 2 diffs" echo "[+] comparing with ignore in dotfile - 2 diffs expected"
set +e set +e
cd "${ddpath}" | ${bin} compare -c "${cfg2}" --verbose cd "${ddpath}" | ${bin} compare -c "${cfg2}" --verbose
[ "$?" = "0" ] && exit 1 [ "$?" = "0" ] && exit 1
cnt=$(cd "${ddpath}" | ${bin} compare -c "${cfg2}" | grep '^=> diff' | wc -l)
set -e set -e
[ "${cnt}" != "2" ] && echo "bad number of diff: ${cnt}/2" && exit 1
echo "OK" echo "OK"
exit 0 exit 0

1
tests-ng/negative-ignore-no-match.sh → tests-ng/install-negative-ignore-no-match.sh vendored
View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# author: jtt9340 (https://github.com/jtt9340) # author: jtt9340 (https://github.com/jtt9340)
# author: deadc0de6
# #
# test that dotdrop warns when a negative ignore pattern # test that dotdrop warns when a negative ignore pattern
# does not match a file that would be ignored # does not match a file that would be ignored

1
tests-ng/global-update-negative-ignore.sh → tests-ng/update-global-negative-ignore.sh vendored
View File

@@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# author: jtt9340 (https://github.com/jtt9340) # author: jtt9340 (https://github.com/jtt9340)
# author: deadc0de6
# #
# test global negative ignore update # test global negative ignore update
# returns 1 in case of error # returns 1 in case of error