testilo 5.0.0 → 6.1.0

package/README.md

@@ -25,9 +25,40 @@ The reason for Testilo being an independent package, rather than part of Testaro
 
 ## Utilities
 
+### `aim`
+
+The `aim` function allows you to _aim_ a script at a host. That means modifying the script so that it performs its operations on the specified host. The modifications are:
+- Modify the value of the `id` property of the script by:
+   - Prefixing the value with a time stamp.
+   - Suffixing the value with the value of the `id` property of the host.
+- Modify each `url` command of the script by changing the values of its `which`, `what`, and `id` properties to the values of those properties of the host.
+- Add a `source` property to the script, identifying the script, the host, and the requester.
+
+Execution by a module:
+
+```javaScript
+const host = {
+  which: https://w3c.org/,
+  what: 'World Wide Web Consortium',
+  id: w3c
+};
+const fs = require('fs/promises');
+const {aim} = require('testilo/aim');
+const aimedScript = aim('tp25', host, 'developer@w3c.org');
+fs.writeFile(process.env.JOBDIR, JSON.stringify(aimedScript, null, 2));
+```
+
+Execution by a user:
+
+```bash
+node call aim tp25 https://w3.org/ 'World Wide Web Consortium' w3c developer@w3c.org
+```
+
+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.
+
 ### `merge`
 
-The `merge` utility is useful when you want Testaro to perform the same set of operations on multiple hosts. For example, you may want the same tests run on multiple web pages. You would have a single script, and you would want multiple jobs created from it. Each job would target one host, and, for that purpose, any `url` command in the script would be modified so that its properties are those of that host. The `merge` utility (similar to mail merge in office applications) does this. It creates Testaro jobs out of a script and a _batch_.
+The `merge` function is similar to the `aim` function, but it aims a script at multiple hosts, not only one. The hosts are identified in a _batch_, a file in the `BATCHDIR` directory. The output of `merge` is multiple script files, one per host, saved in the `JOBDIR` directory.
 
 A batch is a JSON-format file representing a `batch` object, which contains an array of _hosts_.
 
@@ -52,84 +83,92 @@ Here is an example of a batch:
 }
 ```
 
-The `merge` utility finds all the `url` commands in a script (telling the browser what to visit), replaces them with one of the hosts in the batch, and outputs the modified script as a job. It then does the same with each of the other hosts in the batch.
+Execution by a module:
 
-To execute `merge`, you need to have three environment variables defined to tell `merge` where files are located. You can define the environment variables in the `.env` file. Here is an example:
-
-```
-SCRIPTDIR=../testing/scripts
-BATCHDIR=../testing/batches
-JOBDIR=../testing/jobs
+```javaScript
+const {merge} = require('testilo/merge');
+merge('tp25', 'weborgs')
+.then(() => {
+  console.log('Merger complete');
+});
 ```
 
-In this example, the script, batch, and job files are located in directories named `scripts`, `batches`, and `jobs` within `testing`, which is a sibling directory of the Testilo project directory.
-
-The syntax of the `merge` statement is documented in `merge.js`.
+Execution by a user:
 
-Suppose that:
-- The environment variables are defined as in the above example.
-- There is a script file named `testall.json`.
-- The above batch example is in a file named `usFedExec1.json`.
-
-The statement `node merge testall usFedExec1 allFedExec` would tell Testilo to merge the batch `../testing/batches/usFedExec1.json` and the script `../testing/scripts/testall.json` into two job files and save those files in the directory `../testing/jobs/allFedExec`. Testilo will create any directories necessary to save the files there.
+```bash
+node call merge tp25 weborgs
+```
 
 ### `score`
 
 Testaro performs tests and produces reports of test results. Testilo can add scores to those reports. In this way, each report can not only detail successes and failures of individual tests but also assign scores to those results and combine the partial scores into total scores.
 
-The `score` utility performs scoring. It depends on score procs to define the scoring rules. Some score procs are in the Testilo package (in the `procs/score` directory), and you can create more score procs to implement different rules.
+The `score` function performs scoring. It depends on _score procs_ to define the scoring rules. Some score procs are in the Testilo package (in the `procs/score` directory), and you can create more score procs to implement different rules.
 
-You can score multiple reports with a single invocation of `score`.
+Execution by a module:
 
-To execute `score`, you need to have two environment variables defined to tell `score` where files are located. You can define the environment variables in the `.env` file. Here is an example:
-
-```
-REPORTDIR_RAW=../testing/reports/raw
-REPORTDIR_SCORED=../testing/reports/scored
+```javaScript
+const {score} = require('testilo/score');
+score('sp25a', '756mr')
+.then(hostCount => {
+  console.log(`Scoring complete. Count of reports scored: ${hostCount}`);
+});
 ```
 
-The named directories must already exist.
+Execution by a user:
 
-The syntax of the `score` statement is documented in `score.js`.
+```bash
+node call score sp25a 756mr
+```
 
-A scored report file is identical to the file it was created from, except that the scored report has new properties named `score` and `scoreProcID`. The `score` property contains the scores.
+The first argument to `score` names the score proc to be used. The second argument is optional. If it is present, then only reports whose names begin with the value of that argument will be scored. Otherwise all reports in the `REPORTDIR_RAW` directory will be scored. The scored reports will be written in the `REPORTDIR_SCORED` directory.
 
 ### `digest`
 
-Testaro reports, both originally and after they are scored, are JSON files. That format is basically designed for machine tractability.
+Testaro reports, both originally and after they are scored, are JSON files. That format is human-readable, but it is basically designed for machine tractability.
 
-The `digest` utility converts scored reports into HTML documents with explanatory content. Thus, it converts machine-oriented reports into human-oriented reports, called _digests_. It depends on digest procs to define the digesting rules. Some digest procs are in the Testilo package (in the `procs/digest` directory), and you can create more digest procs to implement different rules.
+The `digest` function converts scored reports into HTML documents with explanatory content. Thus, it converts machine-oriented reports into human-oriented reports, called _digests_. It depends on _digest procs_ to define the digesting rules. Some digest procs are in the Testilo package (in the `procs/digest` directory), and you can create more digest procs to implement different rules.
 
-You can digest multiple scored reports with a single invocation of `digest`.
+Execution by a module:
 
-To execute  `digest`, you need to have two environment variables defined to tell `digest` where files are located. You can define the environment variables in the `.env` file. Here is an example:
-
-```
-REPORTDIR_SCORED=../testing/reports/scored
-REPORTDIR_DIGESTED=../testing/reports/digested
+```javaScript
+const {digest} = require('testilo/digest');
+digest('dp25a', '756mr')
+.then(hostCount => {
+  console.log(`Digesting complete. Count of reports digested: ${hostCount}.`);
+});
 ```
 
-The named directories must already exist.
+Execution by a user:
 
-The syntax of the `digest` statement is documented in `digest.js`.
+```bash
+node call digest sp25a 756mr
+```
 
-The digests created by `digest` are HTML files, and they expect a `style.css` file to exist in their directory. The `reports/digested/style.css` file in Testilo is an appropriate stylesheet to be copied into `process.env.REPORTDIR_DIGESTED`.
+The first argument to `digest` names the digest proc to be used. The second argument is optional. If it is present, then only reports whose names begin with the value of that argument will be digested. Otherwise all reports in the `REPORTDIR_SCORED` directory will be digested. The digested reports will be written in the `REPORTDIR_DIGESTED` directory.
 
-### `compare`
+The digests created by `digest` are HTML files, and they expect a `style.css` file to exist in their directory. The `reports/digested/style.css` file in Testilo is an appropriate stylesheet to be copied into the `REPORTDIR_DIGESTED` directory.
 
-You can summarize the results of a multi-host job by producing a document comparing the scores received by the hosts. The `compare` utility does this.
+### `compare`
 
-The `compare` utility gathers scores from a set of scored reports and produces an HTML document comparing the scores. It depends on compare procs to define the rules for making and showing the comparative scores. Some compare procs are in the Testilo package (in the `procs/compare` directory), and you can create more compare procs to implement different rules.
+You can summarize the results of a multi-host job by producing a document comparing the scores received by the hosts. The `compare` function does this. It gathers scores from a set of scored reports and produces an HTML document comparing the scores. It depends on _comparison procs_ to define the rules for making and showing the comparative scores. Some compare procs are in the Testilo package (in the `procs/compare` directory), and you can create more compare procs to implement different rules.
 
-To execute  `compare`, you need to have two environment variables defined to tell `digest` where files are located. You can define the environment variables in the `.env` file. Here is an example:
+Execution by a module:
 
-```
-REPORTDIR_SCORED=../testing/reports/scored
-COMPARISONDIR=../testing/reports/compared
+```javaScript
+const {compare} = require('testilo/compare');
+compare('cp25a', 'legislators')
+.then(() => {
+  console.log(`Comparison complete`);
+});
 ```
 
-The named directories must already exist.
+Execution by a user:
+
+```bash
+node call compare cp25a legislators
+```
 
-The syntax of the `compare` statement is documented in `compare.js`.
+The first argument to `compare` names the comparison proc to be used. The second argument specifies a base of the name of the comparative report that will be produced. The scores in all reports in the `REPORTDIR_SCORED` directory will be compared. The comparative report will be written in the `COMPARISONDIR` directory.
 
-The comparisons created by `compare` are HTML files, and they expect a `style.css` file to exist in their directory. The `reports/comparative/style.css` file in Testilo is an appropriate stylesheet to be copied into `process.env.COMPARISONDIR`.
+The digests created by `compare` are HTML files, and they expect a `style.css` file to exist in their directory. The `reports/comparative/style.css` file in Testilo is an appropriate stylesheet to be copied into the `COMPARISONDIR` directory.

package/aim.js

@@ -1,14 +1,6 @@
 /*
   aim.js
-  Returns a script aimed at a host.
-  Arguments:
-    0. base of name of script located in process.env.SCRIPTDIR.
-    1. ID of the host.
-    2. URL of the host.
-    3. Name of the host.
-    4. ID of the requester.
-  Usage example:
-    node aim tp18 w3c https://www.w3.org/ 'World Wide Web Consortium' 
+  Module for aiming a script at a host.
 */
 
 // ########## IMPORTS

package/call.js

@@ -0,0 +1,119 @@
+/*
+  do.js
+  Invokes Testilo modules with arguments.
+  This is the universal module for use of Testilo from a command line.
+  Arguments:
+    0. function to execute.
+    1+. arguments to pass to the function.
+  Usage examples:
+    node call aim script454 https://www.w3c.org/ 'World Wide Web Consortium' w3c
+    node call merge script454 webOrgs
+    node call score sp25a (to score all reports in REPORTDIR_RAW)
+    node call score sp25a 8ep9f- (same, but only if names start with 8ep9f-)
+    node call digest dp25a (to digest all reports in REPORTDIR_SCORED)
+    node call digest dp25a 8ep9f- (same, but only if names start with 8ep9f-)
+    node call compare cp25a weborgs (to write weborgs.html, comparing all reports in REPORTDIR_SCORED)
+*/
+
+// ########## IMPORTS
+
+// Module to keep secrets.
+require('dotenv').config();
+// Function to process a script aiming.
+const {aim} = require('./aim');
+// Function to process a script-batch merger.
+const {merge} = require('./merge');
+// Function to score reports.
+const {score} = require('./score');
+// Function to digest reports.
+const {digest} = require('./digest');
+// Function to compare scores.
+const {compare} = require('./compare');
+
+// ########## CONSTANTS
+
+const jobDir = process.env.JOBDIR;
+const scoredDir = process.env.REPORTDIR_SCORED;
+const digestedDir = process.env.REPORTDIR_DIGESTED;
+const comparisonDir = process.env.COMPARISONDIR;
+const fn = process.argv[2];
+const fnArgs = process.argv.slice(3);
+
+// ########## FUNCTIONS
+
+// Fulfills an aiming request.
+const callAim = async (scriptName, hostURL, hostName, hostID, notifyee) => {
+  await aim(
+    scriptName,
+    {
+      id: hostID,
+      which: hostURL,
+      what: hostName
+    }, 
+    notifyee
+  );
+  console.log(`Script ${scriptID}.json has been aimed at ${hostName}`);
+};
+// Fulfills a merger request.
+const callMerge = async (scriptName, batchName) => {
+  await merge(scriptName, batchName);
+  console.log(`Batch ${batchName}.json merged into script ${scriptName} in ${jobDir}`);
+};
+// Fulfills a scoring request.
+const callScore = async (scoreProcID, reportIDStart) => {
+  const reportCount = await score(scoreProcID, reportIDStart);
+  console.log(
+    `Scoring completed. Score proc: ${scoreProcID}. Report count: ${reportCount}. Directory: ${scoredDir}`
+  );
+};
+// Fulfills a digesting request.
+const callDigest = async (digestProcID, reportIDStart) => {
+  const reportCount = await digest(digestProcID, reportIDStart);
+  console.log(
+    `Digesting completed. Digest proc: ${digestProcID}. Report count: ${reportCount}. Directory: ${digestedDir}`
+  );
+};
+// Fulfills a comparison request.
+const callCompare = async (compareProcID, comparisonNameBase) => {
+  await compare(compareProcID, comparisonNameBase);
+  console.log(
+    `Comparison completed. Comparison proc: ${compareProcID}. Directory: ${comparisonDir}`
+  );
+};
+
+// ########## OPERATION
+
+// Execute the requested function.
+if (fn === 'aim' && fnArgs.length === 5) {
+  callAim(... fnArgs)
+  .then(() => {
+    console.log('Execution completed');
+  });
+}
+else if (fn === 'merge' && fnArgs.length === 2) {
+  callMerge(... fnArgs)
+  .then(() => {
+    console.log('Execution completed');
+  });
+}
+else if (fn === 'score' && fnArgs.length > 0 && fnArgs.length < 3) {
+  callScore(... fnArgs)
+  .then(() => {
+    console.log('Execution completed');
+  });
+}
+else if (fn === 'digest' && fnArgs.length > 0 && fnArgs.length < 3) {
+  callDigest(... fnArgs)
+  .then(() => {
+    console.log('Execution completed');
+  });
+}
+else if (fn === 'compare' && fnArgs.length === 2) {
+  callCompare(... fnArgs)
+  .then(() => {
+    console.log('Execution completed');
+  });
+}
+else {
+  console.log('ERROR: Invalid statement');
+}

package/compare.js

@@ -19,8 +19,6 @@ const fs = require('fs/promises');
 // ########## CONSTANTS
 
 const comparisonDir = process.env.COMPARISONDIR || 'reports/comparative';
-const compareProcID = process.argv[2];
-const comparisonNameBase = process.argv[3];
 
 // ########## FUNCTIONS
 
@@ -28,7 +26,7 @@ const comparisonNameBase = process.argv[3];
 const replaceHolders = (content, query) => content
 .replace(/__([a-zA-Z]+)__/g, (ph, qp) => query[qp]);
 // Creates and saves a web page containing a comparative table.
-const compare = async () => {
+exports.compare = async (compareProcID, comparisonNameBase) => {
   const comparisonDirAbs = `${__dirname}/${comparisonDir}`;
   const {getQuery} = require(`./procs/compare/${compareProcID}/index`);
   const query = await getQuery();
@@ -37,7 +35,3 @@ const compare = async () => {
   await fs.writeFile(`${comparisonDirAbs}/${comparisonNameBase}.html`, page);
   console.log(`Page ${comparisonNameBase}.html created and saved`);
 };
-
-// ########## OPERATION
-
-compare();

package/digest.js

@@ -21,8 +21,6 @@ const fs = require('fs/promises');
 
 const reportDirScored = process.env.REPORTDIR_SCORED || 'reports/scored';
 const reportDirDigested = process.env.REPORTDIR_DIGESTED || 'reports/digested';
-const digesterID = process.argv[2];
-const reportIDStart = process.argv[3];
 
 // ########## FUNCTIONS
 
@@ -30,7 +28,7 @@ const reportIDStart = process.argv[3];
 const replaceHolders = (content, query) => content
 .replace(/__([a-zA-Z]+)__/g, (ph, qp) => query[qp]);
 // Creates digests.
-const digest = async () => {
+exports.digest = async (digesterID, reportIDStart) => {
   const reportDirScoredAbs = `${__dirname}/${reportDirScored}`;
   let reportFileNames = await fs.readdir(reportDirScoredAbs);
   reportFileNames = reportFileNames.filter(fileName => fileName.endsWith('.json'));
@@ -51,8 +49,5 @@ const digest = async () => {
     await fs.writeFile(`${__dirname}/${reportDirDigested}/${fileNameBase}.html`, digest);
     console.log(`Report ${fileNameBase} digested and saved`);
   };
+  return reportFileNames.length;
 };
-
-// ########## OPERATION
-
-digest();

package/merge.js

@@ -20,18 +20,20 @@ const fs = require('fs/promises');
 
 const scriptDir = process.env.SCRIPTDIR || 'scripts';
 const batchDir = process.env.BATCHDIR || 'batches';
-const watchDir = process.env.WATCHDIR || 'watch';
-const scriptName = process.argv[2];
-const batchName = process.argv[3];
+const jobDir = process.env.JOBDIR || 'watch';
 
 // ########## FUNCTIONS
 
 // Returns a string representing the date and time.
 const nowString = () => (new Date()).toISOString().slice(0, 19);
 // Merges a batch into a script and writes host-specific scripts.
-const merge = async (script, batch) => {
+exports.merge = async (scriptName, batchName) => {
+  const scriptJSON = await fs.readFile(`${scriptDir}/${scriptName}.json`, 'utf8');
+  const batchJSON = await fs.readFile(`${batchDir}/${batchName}.json`, 'utf8');
+  const script = JSON.parse(scriptJSON);
+  const batch = JSON.parse(batchJSON);
   // Create the watch directory if it does not exist.
-  await fs.mkdir(watchDir, {recursive: true});
+  await fs.mkdir(jobDir, {recursive: true});
   // Create a job-creation time stamp.
   const timeStamp = Math.floor((Date.now() - Date.UTC(2022, 1)) / 2000).toString(36);
   // For each host in the batch:
@@ -52,8 +54,6 @@ const merge = async (script, batch) => {
       script: script.id,
       batch: batch.id
     }
-    // Add a job-creation time stamp to the script.
-    newScript.timeStamp = timeStamp;
     // 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.
@@ -63,19 +63,7 @@ const merge = async (script, batch) => {
   });
   // Write the host-specific scripts.
   for (const newScript of newScripts) {
-    await fs.writeFile(`${watchDir}/${newScript.id}.json`, JSON.stringify(newScript, null, 2));
+    await fs.writeFile(`${jobDir}/${newScript.id}.json`, JSON.stringify(newScript, null, 2));
   };
   console.log(`Merger completed. Script count: ${hosts.length}. Time stamp: ${timeStamp}`);
 };
-
-// ########## OPERATION
-
-fs.readFile(`${scriptDir}/${scriptName}.json`, 'utf8')
-.then(scriptFile => {
-  fs.readFile(`${batchDir}/${batchName}.json`, 'utf8')
-  .then(async batchFile => {
-    const script = JSON.parse(scriptFile);
-    const batch = JSON.parse(batchFile);
-    await merge(script, batch);
-  });
-});

package/package.json

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

package/procs/compare/cp16b/index.js

@@ -19,7 +19,7 @@ const query = {};
 
 // ########## FUNCTIONS
 
-// Returns data on the hosts in the report directory.
+// Returns data on the hosts in the scored-report directory.
 const getData = async () => {
   const reportDirAbs = `${__dirname}/../../../${reportDirScored}`;
   const reportFileNamesAll = await fs.readdir(reportDirAbs);

package/score.js

@@ -21,13 +21,11 @@ const fs = require('fs/promises');
 
 const reportDirRaw = process.env.REPORTDIR_RAW || 'reports/raw';
 const reportDirScored = process.env.REPORTDIR_SCORED || 'reports/scored';
-const scoreProcID = process.argv[2];
-const reportIDStart = process.argv[3];
 
 // ########## FUNCTIONS
 
-// Score the specified reports.
-const score = async () => {
+// Score the specified reports and return their count.
+exports.score = async (scoreProcID, reportIDStart) => {
   // Identify the reports to be scored.
   const reportDirRawAbs = `${__dirname}/${reportDirRaw}`;
   let reportFileNames = await fs.readdir(reportDirRawAbs);
@@ -48,8 +46,5 @@ const score = async () => {
     await fs.writeFile(`${__dirname}/${reportDirScored}/${fileName}`, `${scoredReportJSON}\n`);
     console.log(`Report ${fileName.slice(0, -5)} scored and saved`);
   };
+  return reportFileNames.length;
 };
-
-// ########## OPERATION
-
-score();