fix action usage variable expansion

dotdrop/action.py

@@ -86,18 +86,22 @@ class Action(Cmd):
     def __repr__(self):
         return 'action({})'.format(self.__str__())
 
-    def execute(self, templater=None):
+    def execute(self, templater=None, debug=False):
         """execute the action in the shell"""
         ret = 1
         action = self.action
         if templater:
             action = templater.generate_string(self.action)
+            if debug:
+                self.log.dbg('action \"{}\" -> \"{}\"'.format(self.action,
+                                                              action))
         cmd = action
+        args = [templater.generate_string(a) for a in self.args]
         try:
-            cmd = action.format(*self.args)
+            cmd = action.format(*args)
         except IndexError:
             err = 'bad action: \"{}\"'.format(action)
-            err += ' with \"{}\"'.format(self.args)
+            err += ' with \"{}\"'.format(args)
             self.log.warn(err)
             return False
         self.log.sub('executing \"{}\"'.format(cmd))

dotdrop/dotdrop.py

@@ -46,7 +46,7 @@ def action_executor(o, actions, defactions, templater, post=False):
                 continue
             if o.debug:
                 LOG.dbg('executing def-{}-action {}'.format(s, action))
-            ret = action.execute(templater=templater)
+            ret = action.execute(templater=templater, debug=o.debug)
             if not ret:
                 err = 'def-{}-action \"{}\" failed'.format(s, action.key)
                 LOG.err(err)
@@ -59,7 +59,7 @@ def action_executor(o, actions, defactions, templater, post=False):
                 continue
             if o.debug:
                 LOG.dbg('executing {}-action {}'.format(s, action))
-            ret = action.execute(templater=templater)
+            ret = action.execute(templater=templater, debug=o.debug)
             if not ret:
                 err = '{}-action \"{}\" failed'.format(s, action.key)
                 LOG.err(err)

tests-ng/actions-args-template.sh

@@ -85,10 +85,10 @@ profiles:
     - profileaction '{{@@ var_profile @@}}'
     - dynaction '{{@@ user_name @@}}'
 variables:
-  var_pre: var_pre
+  var_pre: abc
-  var_post: var_post
+  var_post: def
-  var_naked: var_naked
+  var_naked: ghi
-  var_profile: var_profile
+  var_profile: jkl
 dynvariables:
   user_name: 'echo $USER'
 _EOF
@@ -106,10 +106,15 @@ cd ${ddpath} | ${bin} install -f -c ${cfg} -p p1 -V
 [ ! -e ${tmpa}/naked ] && echo 'naked action not executed'  && exit 1
 [ ! -e ${tmpa}/profile ] && echo 'profile action not executed'  && exit 1
 [ ! -e ${tmpa}/dyn ] && echo 'dynamic acton action not executed'  && exit 1
-grep var_pre ${tmpa}/pre >/dev/null
+cat ${tmpa}/pre
-grep var_post ${tmpa}/post >/dev/null
+grep abc ${tmpa}/pre >/dev/null
-grep var_naked ${tmpa}/naked >/dev/null
+cat ${tmpa}/post
-grep var_profile ${tmpa}/profile >/dev/null
+grep def ${tmpa}/post >/dev/null
+cat ${tmpa}/naked
+grep ghi ${tmpa}/naked >/dev/null
+cat ${tmpa}/profile
+grep jkl ${tmpa}/profile >/dev/null
+cat ${tmpa}/dyn
 grep "$USER" ${tmpa}/dyn >/dev/null
 
 ## CLEANING