Publish

Author: thedrlambda

CHANGELOG.md

@@ -8,6 +8,13 @@
 -
 -->
 
+# 4.10.1
+## Fixes and improvements
+- `rapids` now buckets cached-requests together
+- Try harder to avoid fingerprint question from SSH
+- Don't fail `deploy` in new repos
+- Don't suggest duplicating the `repo` you are creating
+
 # 4.10.0
 ## Added features
 - Can select which email to `join` with

config.js

@@ -1,5 +1,5 @@
 export const FINGERPRINT = `AAAAC3NzaC1lZDI1NTE5AAAAIPLSjAn8YwNclgEEk8fgyNb1pbhn9X7bMKwFUweaoPzn`;
-export const MERRYMAKE_IO = `merrymake.io`;
+export const MERRYMAKE_IO = process.env["ASDF_DOMAIN"] || `merrymake.io`;
 export const API_URL = `api.${MERRYMAKE_IO}`;
 export const RAPIDS_HOST = `https://rapids.${MERRYMAKE_IO}`;
 export const HTTP_HOST = `https://${API_URL}`;

config.ts

@@ -1,5 +1,5 @@
 export const FINGERPRINT = `AAAAC3NzaC1lZDI1NTE5AAAAIPLSjAn8YwNclgEEk8fgyNb1pbhn9X7bMKwFUweaoPzn`;
-export const MERRYMAKE_IO = `merrymake.io`;
+export const MERRYMAKE_IO = process.env["ASDF_DOMAIN"] || `merrymake.io`;
 export const API_URL = `api.${MERRYMAKE_IO}`;
 export const RAPIDS_HOST = `https://rapids.${MERRYMAKE_IO}`;
 

index.js

@@ -3,8 +3,8 @@ import { initializeArgs } from "./args.js";
 import { abort, setDryrun } from "./exitMessages.js";
 import { index } from "./newCommands/index.js";
 import { addKnownHost } from "./newCommands/register.js";
-import { CTRL_C, moveToBottom } from "./prompt.js";
-import { checkVersionIfOutdated, package_json } from "./printUtils.js";
+import { CTRL_C, moveToBottom, NORMAL_COLOR } from "./prompt.js";
+import { checkVersionIfOutdated, outputGit, package_json, } from "./printUtils.js";
 process.argv.splice(0, 1); // Remove node
 process.argv.splice(0, 1); // Remove index
 if (process.argv.length > 0 && process.argv[0].endsWith("version")) {
@@ -45,10 +45,17 @@ if (stdin.isTTY) {
 })().catch((e) => {
     moveToBottom();
     const eStr = "" + e;
-    if (eStr.includes("Permission denied")) {
+    if (eStr.includes("Permission denied (publickey)")) {
         addKnownHost();
-        console.log("\x1b[31mAn error occurred, please try again. If the problem persists reach out on http://discord.merrymake.eu \x1b[0m", e);
+        outputGit(`A permission error occurred. Please try these solutions:
+1. Make sure you have registered the device with the correct email using 'mm start'
+2. Run 'mm help'
+3. Run this command again.
+4. If the problem persists reach out on http://discord.merrymake.eu` +
+            NORMAL_COLOR);
+    }
+    else {
+        console.error(`\x1b[31mERROR ${eStr.trimEnd()}\x1b[0m`);
     }
-    console.log(`\x1b[31mERROR ${eStr.trimEnd()}\x1b[0m`);
     abort();
 });

index.ts

@@ -3,8 +3,12 @@ import { initializeArgs } from "./args.js";
 import { abort, setDryrun } from "./exitMessages.js";
 import { index } from "./newCommands/index.js";
 import { addKnownHost } from "./newCommands/register.js";
-import { CTRL_C, moveToBottom } from "./prompt.js";
-import { checkVersionIfOutdated, package_json } from "./printUtils.js";
+import { CTRL_C, moveToBottom, NORMAL_COLOR, RED } from "./prompt.js";
+import {
+  checkVersionIfOutdated,
+  outputGit,
+  package_json,
+} from "./printUtils.js";
 
 process.argv.splice(0, 1); // Remove node
 process.argv.splice(0, 1); // Remove index
@@ -54,13 +58,18 @@ if (stdin.isTTY) {
 })().catch((e) => {
   moveToBottom();
   const eStr = "" + e;
-  if (eStr.includes("Permission denied")) {
+  if (eStr.includes("Permission denied (publickey)")) {
     addKnownHost();
-    console.log(
-      "\x1b[31mAn error occurred, please try again. If the problem persists reach out on http://discord.merrymake.eu \x1b[0m",
-      e
+    outputGit(
+      `A permission error occurred. Please try these solutions:
+1. Make sure you have registered the device with the correct email using 'mm start'
+2. Run 'mm help'
+3. Run this command again.
+4. If the problem persists reach out on http://discord.merrymake.eu` +
+        NORMAL_COLOR
     );
+  } else {
+    console.error(`\x1b[31mERROR ${eStr.trimEnd()}\x1b[0m`);
   }
-  console.log(`\x1b[31mERROR ${eStr.trimEnd()}\x1b[0m`);
   abort();
 });

newCommands/clone.js

@@ -2,7 +2,7 @@ import fs from "fs";
 import { GIT_HOST } from "../config.js";
 import { choice } from "../prompt.js";
 import { OrganizationId, PathToOrganization } from "../types.js";
-import { execPromise, sshReq, toFolderName } from "../utils.js";
+import { execPromise, sshReq, toFolderName, toSubdomain, } from "../utils.js";
 import { outputGit } from "../printUtils.js";
 import { ensureGroupStructure } from "./fetch.js";
 import { listOrgs } from "./org.js";
@@ -55,11 +55,24 @@ export async function checkout() {
         const orgs = await listOrgs();
         return choice("Which organization would you like to clone?", orgs.map((org) => ({
             long: org.id,
-            text: `${org.name} (${org.id})`,
+            text: `${org.name}`,
             action: () => checkout_org(org.name, new OrganizationId(org.id)),
         })));
     }
     catch (e) {
         throw e;
     }
 }
+export async function checkoutName(name) {
+    try {
+        const subdomain = toSubdomain(name);
+        const org = (await listOrgs()).find((x) => toSubdomain(x.name) === subdomain);
+        if (org === undefined)
+            return checkout();
+        else
+            return checkout_org(org.name, new OrganizationId(org.id));
+    }
+    catch (e) {
+        throw e;
+    }
+}

newCommands/clone.ts

@@ -2,7 +2,13 @@ import fs from "fs";
 import { GIT_HOST } from "../config.js";
 import { choice } from "../prompt.js";
 import { OrganizationId, PathToOrganization } from "../types.js";
-import { OrgFile, execPromise, sshReq, toFolderName } from "../utils.js";
+import {
+  OrgFile,
+  execPromise,
+  sshReq,
+  toFolderName,
+  toSubdomain,
+} from "../utils.js";
 import { outputGit } from "../printUtils.js";
 import { ToBeStructure, ensureGroupStructure } from "./fetch.js";
 import { listOrgs } from "./org.js";
@@ -87,11 +93,24 @@ export async function checkout() {
       "Which organization would you like to clone?",
       orgs.map((org) => ({
         long: org.id,
-        text: `${org.name} (${org.id})`,
+        text: `${org.name}`,
         action: () => checkout_org(org.name, new OrganizationId(org.id)),
       }))
     );
   } catch (e) {
     throw e;
   }
 }
+
+export async function checkoutName(name: string) {
+  try {
+    const subdomain = toSubdomain(name);
+    const org = (await listOrgs()).find(
+      (x) => toSubdomain(x.name) === subdomain
+    );
+    if (org === undefined) return checkout();
+    else return checkout_org(org.name, new OrganizationId(org.id));
+  } catch (e) {
+    throw e;
+  }
+}

newCommands/deploy.js

@@ -58,7 +58,9 @@ async function rebaseOntoMain(monorepo) {
             const mat = a.match(/ref: refs\/heads\/(.+)\t/);
             return mat === null ? undefined : mat[1];
         })(await execute(`git ls-remote --symref origin HEAD 2>&1`));
-        const output = await execute(`git fetch && ({ ! git ls-remote --exit-code origin ${remoteHead} >/dev/null; } || git rebase origin/${remoteHead}) && git push origin HEAD:${remoteHead} 2>&1`, true);
+        const output = await execute((remoteHead !== undefined
+            ? `git fetch && ({ ! git ls-remote --exit-code origin ${remoteHead} >/dev/null; } || git rebase origin/${remoteHead}) && `
+            : "") + `git push origin HEAD:${remoteHead || "main"} 2>&1`, true);
         if (output.trimEnd().endsWith("Everything up-to-date") && !monorepo) {
             return choice("Would you like to redeploy?", [
                 {

newCommands/deploy.ts

@@ -71,7 +71,9 @@ async function rebaseOntoMain(monorepo: boolean) {
       return mat === null ? undefined : mat[1];
     })(await execute(`git ls-remote --symref origin HEAD 2>&1`));
     const output = await execute(
-      `git fetch && ({ ! git ls-remote --exit-code origin ${remoteHead} >/dev/null; } || git rebase origin/${remoteHead}) && git push origin HEAD:${remoteHead} 2>&1`,
+      (remoteHead !== undefined
+        ? `git fetch && ({ ! git ls-remote --exit-code origin ${remoteHead} >/dev/null; } || git rebase origin/${remoteHead}) && `
+        : "") + `git push origin HEAD:${remoteHead || "main"} 2>&1`,
       true
     );
     if (output.trimEnd().endsWith("Everything up-to-date") && !monorepo) {

newCommands/envvar.js

@@ -95,7 +95,7 @@ function envvar_key(pathToOrganization, organizationId, serviceGroupId, key, sec
 }
 async function envvar_new(pathToOrganization, organizationId, serviceGroupId) {
     try {
-        const key = await shortText("Key", "Key for the key-value pair", "key").then();
+        const key = await shortText("Key", "Key for the key-value pair", "DB").then();
         return envvar_key(pathToOrganization, organizationId, serviceGroupId, key, true, true, true);
     }
     catch (e) {