@rathnasgala/cli 1.1.6 → 1.1.8

package/README.md

@@ -31,8 +31,12 @@ accepted and its `.git` directory is preserved. To reserve a custom domain durin
 before activating it.
 
 It signs you in to Gala and to GitHub if you are not already, creates the repository, registers the
-publication, and leaves a working checkout in the folder. When it finishes it prints the address
-your publication will live at.
+publication, and leaves a working checkout in the folder. GitHub starts the first deployment in the
+background. The command links to that deployment rather than presenting the public address as live
+before GitHub has finished.
+
+On the first run, it opens GitHub's Gala App installation page. Choose the account Gala may use,
+finish the installation, and return to the terminal; the same command resumes automatically.
 
 If the Gala GitHub App has not been given access to the new repository, it says so and links to the
 one page that grants it — GitHub has no way for an app to grant itself access, so that click is
@@ -40,12 +44,19 @@ unavoidable. Everything else is automatic.
 
 ## Write
 
+Every command continues to run through `npx`; `init` does not install a global `gala` executable.
+To see every command, run:
+
+```console
+npx --yes @rathnasgala/cli@latest --help
+```
+
 ```console
 npx --yes @rathnasgala/cli@latest new "The places we return to"
 ```
 
-This creates the Markdown file and tells you the address the post will appear at. Write below the
-second `---` line.
+This creates a local Markdown draft; it does not publish anything. It also tells you the address the
+post will use after a successful publication. Write below the second `---` line.
 
 ```console
 npx --yes @rathnasgala/cli@latest preview

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rathnasgala/cli",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "type": "module",
   "files": [
     "src"

package/src/commands/init.js

@@ -26,7 +26,8 @@ import { customDomain } from '../domain.js';
  *   - **GitHub** turns on Pages by itself once publishing creates a `gh-pages` branch. The CLI used
  *     to poll ten minutes for a run it had caused, then call an API that changed nothing.
  *
- * What is left is genuinely the CLI's: asking what to call it, cloning, and reporting the address.
+ * What is left is genuinely the CLI's: asking what to call it, cloning, and explaining the next
+ * steps without presenting a deployment as live before GitHub has finished it.
  */
 const NAME = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 const GITHUB_APP_INSTALLATION_URL = 'https://github.com/apps/gala67-app/installations/new';
@@ -87,10 +88,6 @@ export async function init({ terminal, options, cwd = process.cwd() }) {
   // writer's copy is the publication as it actually exists.
   await git.takeRemote();
 
-  terminal.done(`Created ${created.owner}/${created.name}`);
-  terminal.result(publicationUrl(registration, created));
-  terminal.note(path.relative(cwd, directory) || '.');
-
   let domainChange;
   if (checkedDomain?.host) {
     terminal.step(`Reserving ${checkedDomain.host}`);
@@ -107,9 +104,13 @@ export async function init({ terminal, options, cwd = process.cwd() }) {
     }
   }
 
-  terminal.blank();
-  terminal.note('gala new "Your first post"');
-  if (domainChange) terminal.note('gala domain check');
+  reportCreatedPublication({
+    terminal,
+    owner: created.owner,
+    name: created.name,
+    directoryLabel: path.relative(cwd, directory) || '.',
+    hasDomainChange: domainChange != null
+  });
 
   return { owner: created.owner, name: created.name, siteId: registration.siteId, root: directory };
 }
@@ -160,14 +161,32 @@ async function createPublication({ terminal, api, capability, name, github, inst
   throw new Error(`Gala still cannot reach the repository for ${name}.`);
 }
 
-export async function publicationAccount({ terminal, api, capability }) {
-  const state = await api.githubInstallationAccounts({ capability });
-  const accounts = Array.isArray(state?.accounts) ? state.accounts : [];
+export async function publicationAccount({
+  terminal,
+  api,
+  capability,
+  pause = (milliseconds) => new Promise((resolve) => { setTimeout(resolve, milliseconds); })
+}) {
+  let state = await api.githubInstallationAccounts({ capability });
+  let accounts = Array.isArray(state?.accounts) ? state.accounts : [];
   if (accounts.length === 0) {
-    throw new Error(
-      `Install or request the Gala GitHub App at ${state?.installationUrl
-        ?? GITHUB_APP_INSTALLATION_URL} and try again.`
-    );
+    const url = state?.installationUrl ?? GITHUB_APP_INSTALLATION_URL;
+    terminal.blank();
+    terminal.step('Connect Gala to a GitHub account');
+    terminal.note('GitHub will ask which account and repositories Gala may use');
+    terminal.openUrl(url);
+    if (!await terminal.waitForEnter('Once the Gala GitHub App is installed')) {
+      throw new Error(`Install or request the Gala GitHub App at ${url}, then run this again.`);
+    }
+
+    for (let attempt = 0; attempt < 5 && accounts.length === 0; attempt += 1) {
+      if (attempt > 0) await pause(1000);
+      state = await api.githubInstallationAccounts({ capability });
+      accounts = Array.isArray(state?.accounts) ? state.accounts : [];
+    }
+    if (accounts.length === 0) {
+      throw new Error(`Gala still cannot see a GitHub App installation. Check ${url}, then run this again.`);
+    }
   }
   const personal = accounts.find((account) => account?.organization === false);
   if (personal) return personal;
@@ -265,10 +284,37 @@ async function hasReference(directory) {
   return false;
 }
 
-function publicationUrl(registration, created) {
-  const base = registration?.canonicalBaseUrl ?? `https://${created.owner.toLowerCase()}.github.io`;
-  const prefix = registration?.pathPrefix ?? `/${created.name}`;
-  return `${base}${prefix === '/' ? '' : prefix}/`;
+export function reportCreatedPublication({
+  terminal,
+  owner,
+  name,
+  directoryLabel,
+  hasDomainChange = false
+}) {
+  const run = 'npx --yes @rathnasgala/cli@latest';
+  terminal.done(`Created ${owner}/${name}`);
+  terminal.note('The first deployment is running in GitHub Actions. The public site is not live yet.');
+  terminal.note(`track it at https://github.com/${owner}/${name}/actions`);
+
+  terminal.blank();
+  terminal.result('Next steps');
+  if (directoryLabel !== '.') terminal.note(`cd ${shellArgument(directoryLabel)}`);
+  terminal.note(`${run} new "Your first post"`);
+  terminal.note('creates a local Markdown draft; it does not publish');
+  terminal.note(`${run} preview`);
+  terminal.note('builds and serves the publication locally');
+  terminal.note(`${run} publish`);
+  terminal.note('checks and sends the work to GitHub');
+  if (hasDomainChange) {
+    terminal.note(`${run} domain check`);
+    terminal.note('checks whether the custom domain is ready');
+  }
+  terminal.note(`${run} --help`);
+  terminal.note('lists every available command');
+}
+
+function shellArgument(value) {
+  return /^[A-Za-z0-9_./-]+$/.test(value) ? value : `'${value.replaceAll("'", "'\\''")}'`;
 }
 
 function idempotencyKey(owner, name) {

package/src/commands/new.js

@@ -54,7 +54,7 @@ export async function createPost({ terminal, options, cwd = process.cwd(), now =
   if (address != null) terminal.note(`will appear at ${address}`);
 
   terminal.blank();
-  terminal.note('write below the second --- line, then: gala preview');
+  terminal.note('write below the second --- line, then: npx --yes @rathnasgala/cli@latest preview');
   return { file, metadata };
 }