Merge pull request #690 from satra/fix/inputtemplate

fix: allow for template specification in at the input level

Author: satra

nipype/interfaces/base.py

@@ -1450,10 +1450,13 @@ def _format_arg(self, name, trait_spec, value):
     def _filename_from_source(self, name):
         trait_spec = self.inputs.trait(name)
         retval = getattr(self.inputs, name)
-        if not isdefined(retval):
+        if not isdefined(retval) or "%s" in retval:
             if not trait_spec.name_source:
                 return retval
-            name_template = trait_spec.name_template
+            if isdefined(retval) and "%s" in retval:
+                name_template = retval
+            else:
+                name_template = trait_spec.name_template
             if not name_template:
                 name_template = "%s_generated"
             if isinstance(trait_spec.name_source, list):

nipype/interfaces/tests/test_base.py

@@ -8,6 +8,7 @@
                         assert_true, assert_false, with_setup, package_check,
                         skipif)
 import nipype.interfaces.base as nib
+from nipype.utils.filemanip import split_filename
 from nipype.interfaces.base import Undefined, config
 from traits.testing.nose_tools import skip
 
@@ -171,6 +172,26 @@ class DeprecationSpec3(nib.TraitedSpec):
     yield assert_equal, spec_instance.foo, Undefined
     yield assert_equal, spec_instance.bar, 1
 
+def test_namesource():
+    tmp_infile = setup_file()
+    tmpd, nme, ext = split_filename(tmp_infile)
+    pwd = os.getcwd()
+    os.chdir(tmpd)
+    class spec2(nib.CommandLineInputSpec):
+        moo = nib.File(name_source=['doo'], hash_files=False, argstr="%s",
+                       position=2)
+        doo = nib.File(exists=True, argstr="%s", position=1)
+    class TestName(nib.CommandLine):
+        _cmd = "mycommand"
+        input_spec = spec2
+    testobj = TestName()
+    testobj.inputs.doo = tmp_infile
+    yield assert_true, '%s_generated' % nme in testobj.cmdline
+    testobj.inputs.moo = "my_%s_template"
+    yield assert_true, 'my_%s_template' % nme in testobj.cmdline
+    os.chdir(pwd)
+    teardown_file(tmpd)
+
 def checknose():
     """check version of nose for known incompatability"""
     mod = __import__('nose')