Applies workspace substitution to the restart command. (#219)

Fixes #217 

* Sub in the new restart command.

* Addition of restart workspaces to sub.

* Fix for WORKSPACE substitutions into restart.

* Correction to override restart instead of cmd.

maestrowf/datastructures/core/executiongraph.py

@@ -48,6 +48,7 @@ def __init__(self, workspace, step, **kwargs):
         """
         self.workspace = Variable("WORKSPACE", workspace)
         step.run["cmd"] = self.workspace.substitute(step.run["cmd"])
+        step.run["restart"] = self.workspace.substitute(step.run["restart"])
 
         self.jobid = kwargs.get("jobid", [])
         self.script = kwargs.get("script", "")

maestrowf/datastructures/core/study.py

@@ -500,7 +500,8 @@ def _stage(self, dag):
             # Search for workspace matches. These affect the expansion of a
             # node because they may use parameters. These are likely to cause
             # a node to fall into the 'Parameter Dependent' case.
-            used_spaces = re.findall(WSREGEX, node.run["cmd"])
+            used_spaces = re.findall(
+                WSREGEX, "{} {}".format(node.run["cmd"], node.run["restart"]))
             for ws in used_spaces:
                 if ws not in self.used_params:
                     msg = "Workspace for '{}' is being used before it would" \
@@ -571,6 +572,7 @@ def _stage(self, dag):
                 # here, it's reflected in the ExecutionGraph.
                 node = copy.deepcopy(node)
                 node.run["cmd"] = cmd
+                node.run["restart"] = r_cmd
                 logger.debug("New cmd = %s", cmd)
                 logger.debug("New restart = %s", r_cmd)