@suffolklitlab/alkiln 5.4.1-feat-github-server-16 → 5.4.1-feat-github-server-18

package/.github/workflows/github_server.yml

@@ -79,7 +79,7 @@ jobs:
           DOCASSEMBLE_DEVELOPER_API_KEY: "${{ steps.github_server.outputs.DOCASSEMBLE_DEVELOPER_API_KEY }}"
           INSTALL_METHOD: "server"
           # TODO: See what happens if this is an empty string
-          ALKILN_VERSION: "5.4.1-feat-github-server-16"
+          ALKILN_VERSION: "server"
           ALKILN_TAG_EXPRESSION: "@al1"
       - run: echo "Finished running ALKiln tests"
 

package/lib/docassemble/server_install.js

@@ -2,8 +2,6 @@
 
 const session_vars = require('../utils/session_vars');
 const log = require('../utils/log');
-// const path = require('path');
-// const fs = require('fs');
 const fg = require('fast-glob');
 
 const server_install = async () => {
@@ -18,23 +16,25 @@ const server_install = async () => {
       onlyDirectories: true
     }
   );
-  console.log(`\n===========\n${dirs}\n===========\n`);
 
-  let chosen_dir = dirs[0];
-  if ( dirs.length === 0 ) {
+  let folders = dirs.map(function (dir) { return dir.split('/').pop(); })
+
+  let chosen_folder = folders[0];
+  if ( folders.length === 0 ) {
     let msg = `There are 0 folders at ${path}. Tests won't run.`;
     log.error({ type: `setup`, data: msg })
     throw new ReferenceError( msg );
   }
 
-  if ( dirs.length > 1 ) {
+  if ( folders.length > 1 ) {
     log.warn({
       type: `setup`,
-      data: `There are ${dirs.length} folders at ${path}: "${dirs.join('", ')}". ALKiln chose to use the folder "${chosen_dir}".`
+      data: `There are ${folders.length} folders at ${path}: "${folders.join('", "')}". ALKiln chose to use the folder "${chosen_folder}".`
     })
   }
 
-  session_vars.save_repo_folder_name( chosen_dir );
+  console.log(`\n===========\nchosen_folder: ${chosen_folder}\n===========\n`);
+  session_vars.save_repo_folder_name( chosen_folder );
 };  // Ends server_install();
 
 server_install();

package/lib/utils/session_vars.js

@@ -253,7 +253,7 @@ session_vars.save_repo_folder_name = function (repo_folder_name) {
 
   // Get the json, changing it, and re-write the file from scratch
   let json = JSON.parse( fs.readFileSync( runtime_config_path ) );
-  json[ da_repo_folder_name ] = repo_folder_name;
+  json[ repo_folder_key ] = repo_folder_name;
   let file = fs.writeFileSync( runtime_config_path, JSON.stringify( json, null, 2 ) );
 
   return file;
@@ -263,7 +263,7 @@ session_vars.get_repo_folder_name = function () {
   /** Get the name of the main folder in the repository. */
   try {
     let json = JSON.parse( fs.readFileSync( runtime_config_path ));
-    let name = json[ da_repo_folder_name ];
+    let name = json[ repo_folder_key ];
 
     return name;
   } catch ( error ) {
@@ -303,7 +303,7 @@ session_vars.set_sources_paths = function ( paths ) {
   // Warn about missing paths
   if ( missing_paths.length > 0 ) {
     console.warn(
-      `ALKiln WARNING: ALKiln can't find folders at "${ paths.join(", ") }".`
+      `ALKiln WARNING: ALKiln can't find folders at "${ paths.join('", "') }".`
     );
   }
 
@@ -313,6 +313,10 @@ session_vars.set_sources_paths = function ( paths ) {
     return false;
   }
 
+  console.info(
+    `ALKiln info: Did find "sources" folder(s) at "${ existing_paths.join('", "') }".`
+  )
+
   // Otherwise, store valid paths
   session_vars._sources_paths = existing_paths;
   return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suffolklitlab/alkiln",
-  "version": "5.4.1-feat-github-server-16",
+  "version": "5.4.1-feat-github-server-18",
   "description": "Integrated automated end-to-end testing with docassemble, puppeteer, and cucumber.",
   "main": "lib/index.js",
   "scripts": {