@rathnasgala/cli 1.1.5 → 1.1.7

package/README.md

@@ -34,6 +34,9 @@ It signs you in to Gala and to GitHub if you are not already, creates the reposi
 publication, and leaves a working checkout in the folder. When it finishes it prints the address
 your publication will live at.
 
+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
 unavoidable. Everything else is automatic.

package/package.json

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

package/src/commands/init.js

@@ -160,14 +160,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;