adding dotfile sub-file variables _dotfile_sub_abs_src and _dotfile_sub_abs_dst

dotdrop/installer.py

@@ -251,6 +251,12 @@ class Installer:
         self.log.sub('linked {} to {}'.format(dst, src))
         return True, None
 
+    def _get_tmp_file_vars(self, src, dst):
+        tmp = {}
+        tmp['_dotfile_sub_abs_src'] = src
+        tmp['_dotfile_sub_abs_dst'] = dst
+        return tmp
+
     def _handle_file(self, templater, src, dst,
                      actionexec=None, noempty=False):
         """install src to dst when is a file"""
@@ -261,7 +267,9 @@ class Installer:
             # symlink loop
             err = 'dotfile points to itself: {}'.format(dst)
             return False, err
+        saved = templater.add_tmp_vars(self._get_tmp_file_vars(src, dst))
         content = templater.generate(src)
+        templater.restore_vars(saved)
         if noempty and utils.content_empty(content):
             self.log.dbg('ignoring empty template: {}'.format(src))
             return False, None

tests-ng/dotfile-sub-variables.sh

@@ -0,0 +1,105 @@
+#!/usr/bin/env bash
+# author: deadc0de6 (https://github.com/deadc0de6)
+# Copyright (c) 2017, deadc0de6
+#
+# test dotfile sub file specific variables
+# 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
+################################################################
+
+# the dotfile source
+tmps=`mktemp -d --suffix='-dotdrop-tests'`
+mkdir -p ${tmps}/dotfiles
+# the dotfile destination
+tmpd=`mktemp -d --suffix='-dotdrop-tests'`
+
+# create the config file
+cfg="${tmps}/config.yaml"
+
+cat > ${cfg} << _EOF
+config:
+  backup: true
+  create: true
+  dotpath: dotfiles
+dotfiles:
+  d_abc:
+    dst: ${tmpd}/abc
+    src: abc
+profiles:
+  p1:
+    dotfiles:
+    - d_abc
+_EOF
+#cat ${cfg}
+
+# create the dotfile
+mkdir -p ${tmps}/dotfiles/abc
+# file1
+echo 'src:{{@@ _dotfile_sub_abs_src @@}}' > ${tmps}/dotfiles/abc/file1
+echo 'dst:{{@@ _dotfile_sub_abs_dst @@}}' >> ${tmps}/dotfiles/abc/file1
+
+# file2
+mkdir -p ${tmps}/dotfiles/abc/subdir
+echo 'src:{{@@ _dotfile_sub_abs_src @@}}' > ${tmps}/dotfiles/abc/subdir/file2
+echo 'dst:{{@@ _dotfile_sub_abs_dst @@}}' >> ${tmps}/dotfiles/abc/subdir/file2
+
+# install
+cd ${ddpath} | ${bin} install -f -c ${cfg} -p p1 -V
+
+# checks
+[ ! -d ${tmpd}/abc ] && echo 'dotfile not installed' && exit 1
+[ ! -e ${tmpd}/abc/file1 ] && echo 'dotfile sub src not installed' && exit 1
+[ ! -e ${tmpd}/abc/subdir/file2 ] && echo 'dotfile sub dst not installed' && exit 1
+
+cat ${tmpd}/abc/file1
+cat ${tmpd}/abc/subdir/file2
+
+grep "src:${tmps}/dotfiles/abc/file1" ${tmpd}/abc/file1 >/dev/null
+grep "dst:${tmpd}/abc/file1" ${tmpd}/abc/file1>/dev/null
+
+grep "src:${tmps}/dotfiles/abc/subdir/file2" ${tmpd}/abc/subdir/file2 >/dev/null
+grep "dst:${tmpd}/abc/subdir/file2" ${tmpd}/abc/subdir/file2 >/dev/null
+
+## CLEANING
+rm -rf ${tmps} ${tmpd}
+
+echo "OK"
+exit 0