testilo 7.0.2 → 7.0.4

package/README.md

@@ -74,7 +74,7 @@ node call aim tp25 https://w3.org/ 'World Wide Web Consortium' w3c developer@w3c
 
 In these examples, a copy of the script file named `tp25.json` in the `SCRIPTDIR` directory is aimed at the World Wide Web Consortium and then saved in the `JOBDIR` directory.
 
-The `aim` function neither reads nor writes files. Its arguments are a script object, a host object, and a requester-email-address string, and it returns the script object, aimed at the host.
+The `aim` function neither reads nor writes files. Its arguments are a script object, a host object, and a requester-email-address string, and it returns a job object, aimed at the host.
 
 ### `merge`
 

package/aim.js

@@ -5,10 +5,14 @@
 
 // ########## FUNCTIONS
 
-// Returns a script, aimed at a host.
+// Returns a string representing the date and time.
+const nowString = () => (new Date()).toISOString().slice(0, 19);
+// Returns a script, aimed at a host, as a job.
 exports.aim = (script, host, requester) => {
+  // Initialize a job based on the script.
+  const job = JSON.parse(JSON.stringify(script));
   // Make all url commands in the script visit the host.
-  script.commands.forEach(command => {
+  job.commands.forEach(command => {
     if (command.type === 'url') {
       command.id = host.id;
       command.which = host.which;
@@ -16,15 +20,19 @@ exports.aim = (script, host, requester) => {
     }
   });
   // Add source information to the script.
-  script.source = {
+  job.sources = {
     script: script.id,
     host,
     requester
   }
   // Create a job-creation time stamp.
   const timeStamp = Math.floor((Date.now() - Date.UTC(2022, 1)) / 2000).toString(36);
-  // Add a job-ID property to the script, including the time stamp, the script ID, and the host ID.
-  script.jobID = `${timeStamp}-${script.id}-${host.id}`;
-  // Return the host-specific script.
-  return script;
+  // Change the script ID to a job ID.
+  job.id = `${timeStamp}-${script.id}-${host.id}`;
+  // Add the job-creation time to the script.
+  job.jobCreationTime = nowString();
+  // Add the time stamp to the job.
+  job.timeStamp = timeStamp;
+  // Return the job.
+  return job;
 };

package/call.js

@@ -56,7 +56,7 @@ const fnArgs = process.argv.slice(3);
 const callAim = async (scriptName, hostURL, hostName, hostID, requester) => {
   const scriptJSON = await fs.readFile(`${scriptDir}/${scriptName}.json`, 'utf8');
   const script = JSON.parse(scriptJSON);
-  const aimedScript = aim(
+  const job = aim(
     script,
     {
       id: hostID,
@@ -65,9 +65,10 @@ const callAim = async (scriptName, hostURL, hostName, hostID, requester) => {
     }, 
     requester
   );
-  const aimedScriptID = aimedScript.id;
-  await fs.writeFile(`${jobDir}/${aimedScriptID}.json`, JSON.stringify(aimedScript, null, 2));
-  console.log(`Script ${aimedScriptID}.json has been aimed at ${hostName} and saved in ${jobDir}`);
+  const scriptID = job.sources.script;
+  const jobID = job.id;
+  await fs.writeFile(`${jobDir}/${jobID}.json`, `${JSON.stringify(job, null, 2)}\n`);
+  console.log(`Script ${scriptID} aimed at ${hostName} saved as job ${jobID}.json in ${jobDir}`);
 };
 // Fulfills a merger request.
 const callMerge = async (scriptName, batchName) => {

package/merge.js

@@ -56,7 +56,7 @@ exports.merge = async (scriptName, batchName) => {
     }
     // Add the job-creation time to the script.
     newScript.jobCreationTime = nowString();
-    // Change the script id property to include the time stamp and the host ID.
+    // Change the script ID to a job ID.
     newScript.id = `${timeStamp}-${newScript.id}-${host.id}`;
     // Return the host-specific script.
     return newScript;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "7.0.2",
+  "version": "7.0.4",
   "description": "Client that scores and digests Testaro reports",
   "main": "aim.js",
   "scripts": {