From 44dc7affc62d11a652f822fa7f41bee6c2512b34 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Mon, 24 Sep 2018 13:22:20 +0200 Subject: [PATCH] recursively check for template files for #58 --- dotdrop/templategen.py | 18 ++++++ tests-ng/link-templates-dir.sh | 103 +++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100755 tests-ng/link-templates-dir.sh diff --git a/dotdrop/templategen.py b/dotdrop/templategen.py index 85d1f45..67408eb 100644 --- a/dotdrop/templategen.py +++ b/dotdrop/templategen.py @@ -92,6 +92,24 @@ class Templategen: return data.decode('utf-8', 'replace') def is_template(path): + """recursively check if any file is a template within path""" + if os.path.isfile(path): + # is file + return Templategen._is_template(path) + for entry in os.listdir(path): + fpath = os.path.join(path, entry) + if not os.path.isfile(fpath): + # rec explore dir + if Templategen.is_template(fpath): + return True + else: + # is file a template + if Templategen._is_template(fpath): + return True + return False + + def _is_template(path): + """test if file pointed by path is a template""" if not os.path.isfile(path): return False with open(path, 'r') as f: diff --git a/tests-ng/link-templates-dir.sh b/tests-ng/link-templates-dir.sh new file mode 100755 index 0000000..2a4ab2e --- /dev/null +++ b/tests-ng/link-templates-dir.sh @@ -0,0 +1,103 @@ +#!/usr/bin/env bash +# author: deadc0de6 (https://github.com/deadc0de6) +# Copyright (c) 2017, deadc0de6 +# +# test link of directory containing templates +# 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 "RUNNING $(basename $BASH_SOURCE)" + +################################################################ +# this is the test +################################################################ + +# the dotfile source +tmps=`mktemp -d` +mkdir -p ${tmps}/dotfiles +echo "dotfiles source (dotpath): ${tmps}" +# the dotfile destination +tmpd=`mktemp -d` +echo "dotfiles destination: ${tmpd}" +# the workdir +tmpw=`mktemp -d` +echo "workdir: ${tmpw}" + + +# create the config file +cfg="${tmps}/config.yaml" + +cat > ${cfg} << _EOF +config: + backup: true + create: true + dotpath: dotfiles + workdir: ${tmpw} +dotfiles: + f_abc: + dst: ${tmpd}/abc + src: abc + link: true +profiles: + p1: + dotfiles: + - f_abc +_EOF +cat ${cfg} + +# create the dotfile +mkdir -p ${tmps}/dotfiles/abc +echo "{{@@ profile @@}}" > ${tmps}/dotfiles/abc/template +echo "blabla" >> ${tmps}/dotfiles/abc/template +echo "blabla" > ${tmps}/dotfiles/abc/nottemplate + +# install +cd ${ddpath} | ${bin} install -f -c ${cfg} -p p1 -b -V + +# checks +[ ! -d ${tmpd}/abc ] && echo "[ERROR] dotfile not installed" && exit 1 +[ ! -h ${tmpd}/abc ] && echo "[ERROR] dotfile is not a symlink" && exit 1 +#cat ${tmpd}/abc/template +#tree -a ${tmpd}/abc/ +set +e +grep '{{@@' ${tmpd}/abc/template >/dev/null 2>&1 && echo "[ERROR] template in dir not replace" && exit 1 +set -e + +## CLEANING +rm -rf ${tmps} ${tmpd} ${tmpw} + +echo "OK" +exit 0