support multi-part cellstr commands

Author: benjamin-heasly

matlab/jobs/mjsRunJob.m

@@ -52,8 +52,7 @@ function doCommand(command, name)
     eval(command);
     printTimestamp('...did %s command', name);
 elseif iscell(command)
-    commandString = strtrim(evalc('disp(command)'));
-    printTimestamp('...doing %s command <%s>', name, commandString);
-    feval(command{:});
-    printTimestamp('...did %s command', name);
-end
+    for cc = 1:numel(command)
+        doCommand(command{cc}, name);
+    end
+end

matlab/jobs/mjsSaveJob.m

@@ -19,25 +19,10 @@
 jobFile = parser.Results.jobFile;
 
 
-%% Can't serialize function handles to json.
-job.setupCommand = commandFunctionToString(job.setupCommand);
-job.toolboxCommand = commandFunctionToString(job.toolboxCommand);
-job.jobCommand = commandFunctionToString(job.jobCommand);
-job.cleanupCommand = commandFunctionToString(job.cleanupCommand);
-
-
 %% Make sure target dir exists.
 jobDir = fileparts(jobFile);
 if ~isempty(jobDir) && 7 ~= exist(jobDir, 'dir')
     mkdir(jobDir);
 end
 
 jobJson = savejson('', job, jobFile);
-
-
-%% Try to convert function_handle command to equivalent strings.
-function command = commandFunctionToString(command)
-
-if iscell(command) && ~isempty(command) && isa(command{1}, 'function_handle')
-    command{1} = func2str(command{1});
-end

matlab/test/MjsLocalJobTests.m

@@ -25,9 +25,20 @@ function freshTempDir(testCase)
                 'jobCommand', command);
         end
 
+        function [job, intValue, outputFile] = multiPartCommandJob(testCase)
+            intValue = randi(1e9);
+            outputFile = fullfile(testCase.tempDir, 'integerSaverJob.mat');
+            command = { ...
+                sprintf('evalin(''base'', ''intValue=%d'');', intValue), ...
+                sprintf('evalin(''base'', ''save(''''%s'''')'', ''intValue'');', outputFile)};
+            job = mjsJob( ...
+                'name', 'multiPartCommandJob', ...
+                'jobCommand', command);
+        end
+        
         function [job, errorMessage] = errorJob(testCase)
             errorMessage = 'This is a test error.';
-            command = {@error, errorMessage};
+            command = sprintf('error(''%s'')', errorMessage);
             job = mjsJob( ...
                 'name', 'errorJob', ...
                 'jobCommand', command);
@@ -55,6 +66,16 @@ function testInDockerSuccess(testCase)
             testCase.assertEqual(jobOutput.intValue, intValue);
         end
 
+        function testMultiPartCommandSuccess(testCase)
+            [job, intValue, outputFile] = testCase.multiPartCommandJob();
+            mjsExecuteLocal(job, ...
+                'scriptFile', fullfile(testCase.tempDir, 'scripts', [job.name '.sh']), ...
+                'outputDir', testCase.tempDir);
+            testCase.assertEqual(exist(outputFile, 'file'), 2);
+            jobOutput = load(outputFile);
+            testCase.assertEqual(jobOutput.intValue, intValue);
+        end
+        
         function testInMatlabError(testCase)
             errorMessage = 'no error';
             [job, expectedMessage] = testCase.errorJob();
@@ -91,7 +112,7 @@ function testInDockerInputFolderPathError(testCase)
             % "forget" to add the input folder that contains the function
             job = mjsJob( ...
                 'name', 'forgotInputDir', ...
-                'jobCommand', {@deepTestFunction});
+                'jobCommand', 'deepTestFunction');
             status = mjsExecuteLocal(job, ...
                 'scriptFile', fullfile(testCase.tempDir, 'scripts', [job.name '.sh']), ...
                 'outputDir', testCase.tempDir);
@@ -113,7 +134,7 @@ function testInDockerInputFolderPathSuccess(testCase)
             % "remember" to add the input folder that contains the function
             job = mjsJob( ...
                 'name', 'rememberedInputDir', ...
-                'jobCommand', {@deepTestFunction});
+                'jobCommand', 'deepTestFunction');
             [status, result] = mjsExecuteLocal(job, ...
                 'scriptFile', fullfile(testCase.tempDir, 'scripts', [job.name '.sh']), ...
                 'inputDir', inputDir, ...
@@ -155,7 +176,7 @@ function testInDockerWithCommonToolbox(testCase)
 
             % make a job that uses the same toolbox
             job = testCase.integerSaverJob();
-            job.toolboxCommand = {@tbUse, 'sample-repo'};
+            job.toolboxCommand = 'tbUse(''sample-repo'')';
 
             % run the job with the shared toolbox folder mapped in
             [status, result] = mjsExecuteLocal(job, ...
@@ -179,7 +200,7 @@ function testOutputOwner(testCase)
                 'outputDir', testCase.tempDir, ...
                 'outputOwner', 'current');
             testCase.assertEqual(status, 0);
-
+            
             % output file should contain expected data
             testCase.assertEqual(exist(outputFile, 'file'), 2);
             jobOutput = load(outputFile);