Skip to content

Commit

Permalink
added manual script command
Browse files Browse the repository at this point in the history
  • Loading branch information
@timbrinded
timbrinded committed Sep 12, 2023
1 parent cc50a28 commit 48ee0cc
Show file tree
Hide file tree
Showing 3 changed files with 142 additions and 29 deletions.
156 changes: 132 additions & 24 deletions packages/cli/src/cmds/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import { importAsyncConfig } from "../lib/configReader";
import { allReposAsync } from "../lib/repoDefinitions";
import { runNetworkCmd } from "./runNetwork";
import { testCmd } from "./runTests";
import fs from "fs";
import { executeScript } from "../internal/launcherCommon";
import path from "path";

inquirer.registerPrompt("press-to-continue", PressToContinuePrompt);

Expand Down Expand Up @@ -49,12 +52,12 @@ async function mainMenu(config: MoonwallConfig) {
? [
{
name: !configPresent
? "1) Initialise: Generate a new Moonwall Config File."
? "1) Initialise: Generate a new Moonwall Config File"
: chalk.dim("1) Initialise: ✅ CONFIG ALREADY GENERATED"),
value: "init",
},
{
name: "2) Artifact Downloader: Fetch artifacts (x86) from GitHub repos.",
name: "2) Artifact Downloader: Fetch artifacts (x86) from GitHub repos",
value: "download",
},
{
Expand All @@ -64,24 +67,24 @@ async function mainMenu(config: MoonwallConfig) {
]
: [
{
name: configPresent
? `1) Network Launcher & Toolbox: Launch network, access tools: tail logs, interactive tests etc.`
: chalk.dim("2) Network Launcher & Toolbox NO CONFIG FOUND"),
name: `1) Execute Script: Run scripts placed in your config defined script directory`,
value: "exec",
},
{
name: `2) Network Launcher & Toolbox: Launch network, access tools: tail logs, interactive tests etc`,
value: "run",
},
{
name: configPresent
? "2) Test Suite Execution: Run automated tests, start network if needed."
: chalk.dim("3) Test Suite Execution: NO CONFIG FOUND"),
name: "3) Test Suite Execution: Run automated tests, start network if needed",
value: "test",
},

{
name: "3) Artifact Downloader: Fetch artifacts (x86) from GitHub repos.",
name: "4) Artifact Downloader: Fetch artifacts (x86) from GitHub repos",
value: "download",
},
{
name: `4) Quit Application`,
name: `5) Quit Application`,
value: "quit",
},
],
Expand Down Expand Up @@ -123,10 +126,106 @@ async function mainMenu(config: MoonwallConfig) {
}
case "download":
await resolveDownloadChoice();

return false;

case "quit":
return await resolveQuitChoice();

case "exec":
return await resolveExecChoice(config);

default:
throw new Error("Invalid choice");
}
}

async function resolveExecChoice(config: MoonwallConfig) {
const scriptDir = config.scriptsDir;

if (!scriptDir) {
await inquirer.prompt({
name: "test complete",
type: "press-to-continue",
anyKey: true,
pressToContinueMessage: `ℹ️ No scriptDir property defined at ${chalk.bgWhiteBright.black(
"moonwall.config.json"
)}\n Press any key to continue...\n`,
});
return false;
}

if (!fs.existsSync(scriptDir)) {
await inquirer.prompt({
name: "test complete",
type: "press-to-continue",
anyKey: true,
pressToContinueMessage: `ℹ️ No scriptDir found at at ${chalk.bgWhiteBright.black(
path.join(process.cwd(), scriptDir)
)}\n Press any key to continue...\n`,
});
return false;
}

const files = await fs.promises.readdir(scriptDir);

if (!files) {
await inquirer.prompt({
name: "test complete",
type: "press-to-continue",
anyKey: true,
pressToContinueMessage: `ℹ️ No scripts found at ${chalk.bgWhiteBright.black(
path.join(process.cwd(), config.scriptsDir)
)}\n Press any key to continue...\n`,
});
}

const choices = files.map((file) => {
const ext = getExtString(file);
return { name: `${ext}: ${path.basename(file, "")}`, value: file };
});

for (;;) {
const result = await inquirer.prompt({
name: "selections",
message: "Select which scripts you'd like to run (press ↩️ with none selected to go 🔙)\n",
type: "checkbox",
choices,
});

if (result.selections.length === 0) {
const result = await inquirer.prompt({
name: "none-selected",
message: "No scripts have been selected to run, do you wish to exit?",
type: "confirm",
default: true,
});

if (result["none-selected"]) {
return false;
} else {
continue;
}
}

for (const script of result.selections) {
const result = await inquirer.prompt({
name: "args",
message: `Enter any arguments for ${chalk.bgWhiteBright.black(
script
)} (press enter for none)`,
type: "input",
});

await executeScript(script, result.args);
}

await inquirer.prompt({
name: "test complete",
type: "press-to-continue",
anyKey: true,
pressToContinueMessage: `Press any key to continue...\n`,
});
return false;
}
}

Expand Down Expand Up @@ -308,19 +407,14 @@ const printIntro = async () => {
##################################################
##################################################
`) +
chalk.magenta(`
*** ************************************************************
**** *********************************************
*** ******************************************************
** *********************** *********************************************
** *********************** ********************************************
*** ******************************
**** *****************************
chalk.red(`
🧱🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱
🧱🧱🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱
🧱🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱
🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱
🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱
🧱🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱
🧱🧱🧱🧱 🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱🧱
\n`);
process.stdout.write(logo);
Expand Down Expand Up @@ -350,3 +444,17 @@ const printIntro = async () => {
)
);
};

const getExtString = (file: string) => {
const ext = path.extname(file);
switch (ext) {
case ".js":
return chalk.bgYellow.black(ext);
case ".ts":
return chalk.bgBlue.black(ext);
case ".sh":
return chalk.bgGreen.black(ext);
default:
return chalk.bgRed.black(ext);
}
};
8 changes: 4 additions & 4 deletions packages/cli/src/internal/launcherCommon.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ async function devBinCheck(env: Environment) {
await downloadBinsIfMissing(env.foundation.launchSpec[0].binPath);
}

async function executeScript(scriptCommand: string) {
export async function executeScript(scriptCommand: string, args?: string) {
const scriptsDir = (await importAsyncConfig()).scriptsDir;
const files = await fs.promises.readdir(scriptsDir);

Expand All @@ -68,13 +68,13 @@ async function executeScript(scriptCommand: string) {

switch (ext) {
case ".js":
execSync("node " + scriptPath, { stdio: "inherit" });
execSync("node " + scriptPath + ` ${args}`, { stdio: "inherit" });
break;
case ".ts":
execSync("pnpm tsx " + scriptPath, { stdio: "inherit" });
execSync("pnpm tsx " + scriptPath + ` ${args}`, { stdio: "inherit" });
break;
case ".sh":
execSync(scriptPath, { stdio: "inherit" });
execSync(scriptPath + ` ${args}`, { stdio: "inherit" });
break;
default:
console.log(`${ext} not supported, skipping ${script}`);
Expand Down
7 changes: 6 additions & 1 deletion test/scripts/greeting.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
function main() {
console.log("Hello World!");
const args = process.argv.slice(2);
if (args.length > 0) {
console.log(`Hello, ${args[0]}!`);
} else {
console.log("Hello World!");
}
}

main();

0 comments on commit 48ee0cc

Please sign in to comment.