From 222925dd29979ca846b2e744128cb7145f3faf0b Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sat, 27 Apr 2019 14:34:34 +0200 Subject: [PATCH 1/3] allow to have dynamic dotfile actions for #120 --- dotdrop/config.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dotdrop/config.py b/dotdrop/config.py index 165e31a..9cf4747 100644 --- a/dotdrop/config.py +++ b/dotdrop/config.py @@ -306,7 +306,12 @@ class Cfg: # parse actions itsactions = v[self.key_dotfiles_actions] if \ self.key_dotfiles_actions in v else [] - actions = self._parse_actions(itsactions) + actions = self._parse_actions(itsactions, profile=profile) + if self.debug: + self.log.dbg('action for {}'.format(k)) + for t in [self.key_actions_pre, self.key_actions_post]: + for action in actions[t]: + self.log.dbg('- {}: {}'.format(t, action)) # parse read transformation itstrans_r = v[self.key_dotfiles_trans_r] if \ @@ -540,19 +545,25 @@ class Cfg: dotfiles.extend(self.prodots[other]) return True, dotfiles - def _parse_actions(self, entries): + def _parse_actions(self, entries, profile=None): """parse actions specified for an element where entries are the ones defined for this dotfile""" res = { self.key_actions_pre: [], self.key_actions_post: [], } + vars = self.get_variables(profile, debug=self.debug) + t = Templategen(variables=vars) for line in entries: fields = shlex.split(line) entry = fields[0] args = [] if len(fields) > 1: - args = fields[1:] + tmpargs = fields[1:] + args = [] + # template args + for arg in tmpargs: + args.append(t.generate_string(arg)) action = None if self.key_actions_pre in self.actions and \ entry in self.actions[self.key_actions_pre]: From 0d46ca66ea9d066743368931abcdbc923130b362 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sat, 27 Apr 2019 15:55:59 +0200 Subject: [PATCH 2/3] refactor usage for --force --- dotdrop/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotdrop/options.py b/dotdrop/options.py index e1beb98..6e5d95f 100644 --- a/dotdrop/options.py +++ b/dotdrop/options.py @@ -73,7 +73,7 @@ Options: -T --template Only template dotfiles. -D --showdiff Show a diff before overwriting. -P --show-patch Provide a one-liner to manually patch template. - -f --force Do not warn if exists. + -f --force Do not ask user confirmation for anything. -k --key Treat as a dotfile key. -V --verbose Be verbose. -d --dry Dry run. From c451baacf5c0f60adfca4d58349ecdebbc9c5984 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 28 Apr 2019 17:52:11 +0200 Subject: [PATCH 3/3] implement global upignore/cmpignore for #122 --- dotdrop/config.py | 17 +++++ tests-ng/global-compare-ignore.sh | 111 ++++++++++++++++++++++++++++++ tests-ng/global-update-ignore.sh | 107 ++++++++++++++++++++++++++++ 3 files changed, 235 insertions(+) create mode 100755 tests-ng/global-compare-ignore.sh create mode 100755 tests-ng/global-update-ignore.sh diff --git a/dotdrop/config.py b/dotdrop/config.py index 9cf4747..4df8a4d 100644 --- a/dotdrop/config.py +++ b/dotdrop/config.py @@ -36,6 +36,8 @@ class Cfg: key_workdir = 'workdir' key_import_vars = 'import_variables' key_import_actions = 'import_actions' + key_cmpignore = 'cmpignore' + key_upignore = 'upignore' # actions keys key_actions = 'actions' @@ -138,6 +140,11 @@ class Cfg: self.ext_variables = {} self.ext_dynvariables = {} + # cmpignore patterns + self.cmpignores = [] + # upignore patterns + self.upignores = [] + if not self._load_config(profile=profile): raise ValueError('config is not valid') @@ -242,6 +249,14 @@ class Cfg: paths = self.lnk_settings[self.key_import_vars] self._load_ext_variables(paths, profile=profile) + # load global upignore + if self.key_upignore in self.lnk_settings: + self.upignores = self.lnk_settings[self.key_upignore] or [] + + # load global cmpignore + if self.key_cmpignore in self.lnk_settings: + self.cmpignores = self.lnk_settings[self.key_cmpignore] or [] + # parse external actions if self.key_import_actions in self.lnk_settings: for path in self.lnk_settings[self.key_import_actions]: @@ -360,10 +375,12 @@ class Cfg: # parse cmpignore pattern cmpignores = v[self.key_dotfiles_cmpignore] if \ self.key_dotfiles_cmpignore in v else [] + cmpignores.extend(self.cmpignores) # parse upignore pattern upignores = v[self.key_dotfiles_upignore] if \ self.key_dotfiles_upignore in v else [] + upignores.extend(self.upignores) # create new dotfile self.dotfiles[k] = Dotfile(k, dst, src, diff --git a/tests-ng/global-compare-ignore.sh b/tests-ng/global-compare-ignore.sh new file mode 100755 index 0000000..4d0b356 --- /dev/null +++ b/tests-ng/global-compare-ignore.sh @@ -0,0 +1,111 @@ +#!/usr/bin/env bash +# author: deadc0de6 (https://github.com/deadc0de6) +# Copyright (c) 2017, deadc0de6 +# +# test cmpignore +# returns 1 in case of error +# + +# exit on first error +#set -e + +# all this crap to get current path +rl="readlink -f" +if ! ${rl} "${0}" >/dev/null 2>&1; then + rl="realpath" + + if ! hash ${rl}; then + echo "\"${rl}\" not found !" && exit 1 + fi +fi +cur=$(dirname "$(${rl} "${0}")") + +#hash dotdrop >/dev/null 2>&1 +#[ "$?" != "0" ] && echo "install dotdrop to run tests" && exit 1 + +#echo "called with ${1}" + +# dotdrop path can be pass as argument +ddpath="${cur}/../" +[ "${1}" != "" ] && ddpath="${1}" +[ ! -d ${ddpath} ] && echo "ddpath \"${ddpath}\" is not a directory" && exit 1 + +export PYTHONPATH="${ddpath}:${PYTHONPATH}" +bin="python3 -m dotdrop.dotdrop" + +echo "dotdrop path: ${ddpath}" +echo "pythonpath: ${PYTHONPATH}" + +# get the helpers +source ${cur}/helpers + +echo -e "\e[96m\e[1m==> RUNNING $(basename $BASH_SOURCE) <==\e[0m" + +################################################################ +# this is the test +################################################################ + +# dotdrop directory +basedir=`mktemp -d --suffix='-dotdrop-tests'` +echo "[+] dotdrop dir: ${basedir}" +echo "[+] dotpath dir: ${basedir}/dotfiles" + +# the dotfile to be imported +tmpd=`mktemp -d --suffix='-dotdrop-tests'` + +# some files +mkdir -p ${tmpd}/{program,config} +touch ${tmpd}/program/a +touch ${tmpd}/config/a + +# create the config file +cfg="${basedir}/config.yaml" +cat > ${cfg} << _EOF +config: + backup: true + create: true + dotpath: dotfiles +dotfiles: +profiles: +_EOF + +# import +echo "[+] import" +cd ${ddpath} | ${bin} import -c ${cfg} ${tmpd}/program +cd ${ddpath} | ${bin} import -c ${cfg} ${tmpd}/config + +# add files +echo "[+] add files" +touch ${tmpd}/program/b +touch ${tmpd}/config/b + +# adding ignore in dotfile +cfg2="${basedir}/config2.yaml" +sed '/dotpath: dotfiles/a \ \ cmpignore:\n\ \ \ \ - "*/config/b"' ${cfg} > ${cfg2} +cat ${cfg2} + +# expects one diff +echo "[+] comparing with ignore in dotfile - 1 diff" +set +e +cd ${ddpath} | ${bin} compare -c ${cfg2} --verbose +[ "$?" = "0" ] && exit 1 +set -e + +# adding ignore in dotfile +cfg2="${basedir}/config2.yaml" +sed '/dotpath: dotfiles/a \ \ cmpignore:\n\ \ \ \ - "*b"' ${cfg} > ${cfg2} +cat ${cfg2} + +# expects no diff +patt="*b" +echo "[+] comparing with ignore in dotfile - 0 diff" +set +e +cd ${ddpath} | ${bin} compare -c ${cfg2} --verbose +[ "$?" != "0" ] && exit 1 +set -e + +## CLEANING +rm -rf ${basedir} ${tmpd} + +echo "OK" +exit 0 diff --git a/tests-ng/global-update-ignore.sh b/tests-ng/global-update-ignore.sh new file mode 100755 index 0000000..2e08c52 --- /dev/null +++ b/tests-ng/global-update-ignore.sh @@ -0,0 +1,107 @@ +#!/usr/bin/env bash +# author: deadc0de6 (https://github.com/deadc0de6) +# Copyright (c) 2017, deadc0de6 +# +# test global ignore update +# returns 1 in case of error +# + +# exit on first error +#set -e + +# all this crap to get current path +rl="readlink -f" +if ! ${rl} "${0}" >/dev/null 2>&1; then + rl="realpath" + + if ! hash ${rl}; then + echo "\"${rl}\" not found !" && exit 1 + fi +fi +cur=$(dirname "$(${rl} "${0}")") + +#hash dotdrop >/dev/null 2>&1 +#[ "$?" != "0" ] && echo "install dotdrop to run tests" && exit 1 + +#echo "called with ${1}" + +# dotdrop path can be pass as argument +ddpath="${cur}/../" +[ "${1}" != "" ] && ddpath="${1}" +[ ! -d ${ddpath} ] && echo "ddpath \"${ddpath}\" is not a directory" && exit 1 + +export PYTHONPATH="${ddpath}:${PYTHONPATH}" +bin="python3 -m dotdrop.dotdrop" + +echo "dotdrop path: ${ddpath}" +echo "pythonpath: ${PYTHONPATH}" + +# get the helpers +source ${cur}/helpers + +echo -e "\e[96m\e[1m==> RUNNING $(basename $BASH_SOURCE) <==\e[0m" + +################################################################ +# this is the test +################################################################ + +# dotdrop directory +tmps=`mktemp -d --suffix='-dotdrop-tests'` +dt="${tmps}/dotfiles" +mkdir -p ${dt} +mkdir -p ${dt}/a/{b,c} +echo 'a' > ${dt}/a/b/abfile +echo 'a' > ${dt}/a/c/acfile + +# fs dotfiles +tmpd=`mktemp -d --suffix='-dotdrop-tests'` +cp -r ${dt}/a ${tmpd}/ + +# create the config file +cfg="${tmps}/config.yaml" +cat > ${cfg} << _EOF +config: + backup: false + create: true + dotpath: dotfiles + upignore: + - "*/cfile" + - "*/newfile" + - "*/newdir" +dotfiles: + f_abc: + dst: ${tmpd}/a + src: a +profiles: + p1: + dotfiles: + - f_abc +_EOF +#cat ${cfg} + +#tree ${dt} + +# edit/add files +echo "[+] edit/add files" +touch ${tmpd}/a/newfile +echo 'b' > ${tmpd}/a/c/acfile +mkdir -p ${tmpd}/a/newdir/b +touch ${tmpd}/a/newdir/b/c + +#tree ${tmpd}/a + +# update +echo "[+] update" +cd ${ddpath} | ${bin} update -f -c ${cfg} --verbose --profile=p1 --key f_abc + +#tree ${dt} + +# check files haven't been updated +grep 'b' ${dt}/a/c/acfile >/dev/null +[ -e ${dt}/a/newfile ] && exit 1 + +## CLEANING +rm -rf ${tmps} ${tmpd} + +echo "OK" +exit 0