@jrc03c/gt-cli 0.1.4 → 0.1.6

package/README.md

@@ -37,14 +37,14 @@ Set `GT_ENV` to target different GuidedTrack environments:
 ```bash
 gt init                          # Create gt.config.json by scanning for program files
 gt config                        # Print current project configuration
-gt push                          # Upload all local program files to the server
-gt push --only <name>            # Push a single program
-gt push --build                  # Push and build
+gt push                          # Upload local programs and build
+gt push --only <key>             # Push a single program
+gt push --no-build               # Push without building
 gt pull                          # Download all program sources from the server
-gt pull --only <name>            # Pull a single program
-gt create [names...]             # Create new programs on the server
+gt pull --only <key>             # Pull a single program
+gt create [names...]             # Create new programs (updates gt.config.json)
 gt build                         # Compile programs and report errors
-gt compare [args...]             # Compare programs using gt-compare
+gt build --only <key>            # Build a single program
 ```
 
 ### Program management
@@ -89,16 +89,39 @@ gt request <path> -H "X-Custom:value"         # Add custom headers
 
 ```json
 {
+  "email": "you@example.com",
+  "password": "your-password",
   "programs": {
-    "my-program": {
-      "id": 12345,
-      "key": "abc1234"
+    "abc1234": {
+      "file": "my-program.gt",
+      "id": 12345
     }
   }
 }
 ```
 
-This file is gitignored. It maps local program file names to their server-side IDs and keys.
+Programs are keyed by their 7-character program key, and each entry maps to a local `.gt` file and its server-side numeric ID.
+
+The `email` and `password` fields are optional — they provide an alternative to environment variables for authentication (see [Authentication](#authentication) above).
+
+> **NOTE:** 🚨 If storing `email` and `password` values in `gt.config.json`, then **DO NOT** commit that file to the repository history! Instead, add `gt.config.json` to your `.gitignore` file.
+
+### Separate push and pull files
+
+If you use a build step to transform your `.gt` files before pushing, you can specify separate source and dist paths:
+
+```json
+{
+  "programs": {
+    "abc1234": {
+      "file": { "src": "src/program.gt", "dist": "dist/program.gt" },
+      "id": 12345
+    }
+  }
+}
+```
+
+With this configuration, `gt pull` writes to `src/program.gt` and `gt push` reads from `dist/program.gt`.
 
 ## Development
 

package/dist/index.js

@@ -3,16 +3,18 @@
 // src/index.ts
 import { Command } from "commander";
 
-// src/commands/build.ts
-import { readFile as readFile2 } from "fs/promises";
-import { resolve as resolve2 } from "path";
-
 // src/types.ts
 var ENVIRONMENT_HOSTS = {
   development: "https://localhost:3000",
   stage: "https://guidedtrack-stage.herokuapp.com",
   production: "https://www.guidedtrack.com"
 };
+function getPullFile(ref) {
+  return typeof ref.file === "string" ? ref.file : ref.file.src;
+}
+function getPushFile(ref) {
+  return typeof ref.file === "string" ? ref.file : ref.file.dist;
+}
 
 // src/lib/api.ts
 function buildAuthHeader(credentials) {
@@ -136,10 +138,10 @@ async function saveConfig(config, dir) {
 // src/lib/auth.ts
 function prompt(question) {
   const rl2 = createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve7) => {
+  return new Promise((resolve5) => {
     rl2.question(question, (answer) => {
       rl2.close();
-      resolve7(answer);
+      resolve5(answer);
     });
   });
 }
@@ -153,13 +155,13 @@ function promptSecret(question) {
     }
     return originalWrite(...args);
   });
-  return new Promise((resolve7) => {
+  return new Promise((resolve5) => {
     rl2.question(question, (answer) => {
       muted = false;
       process.stdout.write = originalWrite;
       originalWrite("\n");
       rl2.close();
-      resolve7(answer);
+      resolve5(answer);
     });
     muted = true;
   });
@@ -200,7 +202,7 @@ async function pollJob(jobId, credentials, options) {
     if (job.status !== "running") {
       return job;
     }
-    await new Promise((resolve7) => setTimeout(resolve7, interval));
+    await new Promise((resolve5) => setTimeout(resolve5, interval));
   }
 }
 
@@ -282,68 +284,32 @@ async function buildProgram(name, key, credentials, environment) {
 }
 
 // src/commands/build.ts
-var PROJECTS_FILENAME = ".gt_projects";
 function registerBuild(program2) {
-  program2.command("build").description("Compile programs and report errors").action(async () => {
+  program2.command("build").description("Compile programs and report errors").option("-o, --only <key>", "Build only the specified program (by key)").action(async (options) => {
     const credentials = await resolveCredentials();
     const environment = getEnvironment();
-    const projects = await loadProjects();
-    if (!projects) {
-      console.log(`No ${PROJECTS_FILENAME} file, nothing to build`);
-      return;
-    }
-    for (const project of projects) {
-      const found = await findProgramByTitle(project, credentials, environment);
-      if (!found) {
-        console.error(`>> Program "${project}" not found, skipping...`);
-        continue;
+    const config = await loadConfig();
+    const programs = config.programs ?? {};
+    let entries = Object.entries(programs);
+    if (options.only) {
+      const ref = programs[options.only];
+      if (!ref) {
+        console.error(
+          `Program with key "${options.only}" not found in config.`
+        );
+        process.exit(1);
       }
-      await buildProgram(project, found.key, credentials, environment);
+      entries = [[options.only, ref]];
     }
-  });
-}
-async function loadProjects() {
-  try {
-    const raw = await readFile2(
-      resolve2(process.cwd(), PROJECTS_FILENAME),
-      "utf-8"
-    );
-    return raw.split("\n").map((line) => line.trim()).filter((line) => line.length > 0);
-  } catch {
-    return null;
-  }
-}
-
-// src/commands/compare.ts
-import { execFileSync } from "child_process";
-import { dirname, resolve as resolve3 } from "path";
-function registerCompare(program2) {
-  program2.command("compare").description("Compare programs using gt-compare").allowUnknownOption().argument("[args...]", "Arguments to pass to gt-compare").action((args) => {
-    const gtPath = process.env.GT_COMPARE_PATH ?? findGtCompare();
-    if (!gtPath) {
-      console.error(
-        "Could not find gt-compare. Set GT_COMPARE_PATH to the gt-compare directory."
-      );
+    if (entries.length === 0) {
+      console.error("No programs in config. Run `gt init` first.");
       process.exit(1);
     }
-    try {
-      execFileSync("./gt-compare", args, {
-        cwd: gtPath,
-        stdio: "inherit"
-      });
-    } catch {
-      process.exit(1);
+    for (const [key, ref] of entries) {
+      await buildProgram(getPushFile(ref), key, credentials, environment);
     }
   });
 }
-function findGtCompare() {
-  try {
-    const gtBin = execFileSync("which", ["gt"], { encoding: "utf-8" }).trim();
-    return resolve3(dirname(gtBin), "gt-compare");
-  } catch {
-    return null;
-  }
-}
 
 // src/commands/config.ts
 function registerConfig(program2) {
@@ -387,6 +353,9 @@ function registerCreate(program2) {
       process.exit(1);
     }
     console.log(`Creating programs in ${environment}...`);
+    const config = await loadConfig();
+    const programs = config.programs ?? {};
+    let configChanged = false;
     for (const filename of filenames) {
       process.stdout.write(`>> Creating "${filename}"... `);
       try {
@@ -398,7 +367,19 @@ function registerCreate(program2) {
         });
         const data = await response.json();
         if (data.job_id) {
-          console.log("done");
+          await pollJob(data.job_id, credentials, {
+            environment,
+            intervalMs: 1e3
+          }).catch(() => {
+          });
+          const found = await findProgramByTitle(filename, credentials, environment);
+          if (found) {
+            console.log(`done (id: ${found.id}, key: ${found.key})`);
+            programs[found.key] = { file: filename, id: found.id };
+            configChanged = true;
+          } else {
+            console.log("done");
+          }
         } else {
           console.error("failed");
           console.error(`${JSON.stringify(data)} -- skipping`);
@@ -409,6 +390,10 @@ function registerCreate(program2) {
         process.exit(1);
       }
     }
+    if (configChanged) {
+      await saveConfig({ ...config, programs });
+      console.log("Updated gt.config.json");
+    }
   });
 }
 
@@ -417,10 +402,10 @@ import { createInterface as createInterface2 } from "readline";
 var rl = () => createInterface2({ input: process.stdin, output: process.stdout });
 async function ask(question) {
   const iface = rl();
-  return new Promise((resolve7) => {
+  return new Promise((resolve5) => {
     iface.question(question, (answer) => {
       iface.close();
-      resolve7(answer.trim());
+      resolve5(answer.trim());
     });
   });
 }
@@ -454,7 +439,7 @@ function registerInit(program2) {
       console.log("No .gt files found.");
       return;
     }
-    const linkedFiles = new Set(Object.values(programs).map((p) => p.file));
+    const linkedFiles = new Set(Object.values(programs).map((p) => getPullFile(p)));
     for (const file of files) {
       if (linkedFiles.has(file)) {
         console.log(`
@@ -508,7 +493,7 @@ Found "${file}"`);
       console.log(`found! ("${found.name}")`);
       if (programs[found.key]) {
         console.log(
-          `Program "${found.name}" is already linked to "${programs[found.key].file}", skipping.`
+          `Program "${found.name}" is already linked to "${getPullFile(programs[found.key])}", skipping.`
         );
         continue;
       }
@@ -526,7 +511,7 @@ Wrote ${CONFIG_FILENAME}`);
 // src/commands/program.ts
 import { exec } from "child_process";
 import { writeFile as writeFile2 } from "fs/promises";
-import { resolve as resolve4 } from "path";
+import { resolve as resolve2 } from "path";
 import { createInterface as createInterface3 } from "readline";
 function registerProgram(parent) {
   const program2 = parent.command("program").description("Manage programs on the server");
@@ -693,7 +678,7 @@ function registerProgram(parent) {
     });
     const csv = await response.text();
     if (options.output) {
-      await writeFile2(resolve4(process.cwd(), options.output), csv);
+      await writeFile2(resolve2(process.cwd(), options.output), csv);
       console.log(`Saved to ${options.output}`);
     } else {
       process.stdout.write(csv);
@@ -702,10 +687,10 @@ function registerProgram(parent) {
 }
 function confirm2(prompt2) {
   const rl2 = createInterface3({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve7) => {
+  return new Promise((resolve5) => {
     rl2.question(prompt2, (answer) => {
       rl2.close();
-      resolve7(answer.toLowerCase() === "y");
+      resolve5(answer.toLowerCase() === "y");
     });
   });
 }
@@ -717,7 +702,7 @@ function openBrowser(url) {
 
 // src/commands/pull.ts
 import { writeFile as writeFile3 } from "fs/promises";
-import { resolve as resolve5 } from "path";
+import { resolve as resolve3 } from "path";
 function registerPull(program2) {
   program2.command("pull").description("Download program source from the server").option("-o, --only <key>", "Pull only the specified program (by key)").action(async (options) => {
     const credentials = await resolveCredentials();
@@ -743,25 +728,26 @@ function registerPull(program2) {
     }
     console.log(`Pulling from ${environment}...`);
     for (const [, ref] of entries) {
+      const pullFile = getPullFile(ref);
       process.stdout.write(
-        `>> Downloading "${ref.file}" (id: ${ref.id})... `
+        `>> Downloading "${pullFile}" (id: ${ref.id})... `
       );
       const source = await fetchProgramSource(
         ref.id,
         credentials,
         environment
       );
-      await writeFile3(resolve5(process.cwd(), ref.file), source);
+      await writeFile3(resolve3(process.cwd(), pullFile), source);
       console.log("done");
     }
   });
 }
 
 // src/commands/push.ts
-import { readFile as readFile3 } from "fs/promises";
-import { resolve as resolve6 } from "path";
+import { readFile as readFile2 } from "fs/promises";
+import { resolve as resolve4 } from "path";
 function registerPush(program2) {
-  program2.command("push").description("Upload local program files to the server").option("-o, --only <key>", "Push only the specified program (by key)").option("-b, --build", "Build after pushing").action(async (options) => {
+  program2.command("push").description("Upload local program files to the server").option("-o, --only <key>", "Push only the specified program (by key)").option("--no-build", "Skip building after push").action(async (options) => {
     const credentials = await resolveCredentials();
     const environment = getEnvironment();
     const config = await loadConfig();
@@ -786,11 +772,12 @@ function registerPush(program2) {
     console.log(`Pushing to ${environment}...`);
     const pushed = [];
     for (const [key, ref] of entries) {
+      const pushFile = getPushFile(ref);
       process.stdout.write(
-        `>> Updating "${ref.file}" (id: ${ref.id})... `
+        `>> Updating "${pushFile}" (id: ${ref.id})... `
       );
-      const contents = await readFile3(
-        resolve6(process.cwd(), ref.file),
+      const contents = await readFile2(
+        resolve4(process.cwd(), pushFile),
         "utf-8"
       );
       await apiRequest(`/programs/${ref.id}.json`, {
@@ -800,7 +787,7 @@ function registerPush(program2) {
         body: { contents, program: { description: "" } }
       });
       console.log("done");
-      pushed.push({ file: ref.file, key });
+      pushed.push({ file: pushFile, key });
     }
     if (options.build && pushed.length > 0) {
       console.log("\nBuilding pushed programs...");
@@ -865,7 +852,6 @@ registerPush(program);
 registerPull(program);
 registerCreate(program);
 registerBuild(program);
-registerCompare(program);
 registerInit(program);
 registerConfig(program);
 registerProgram(program);

package/package.json

@@ -39,5 +39,5 @@
     "test:watch": "vitest"
   },
   "type": "module",
-  "version": "0.1.4"
+  "version": "0.1.6"
 }