@catladder/cli 2.4.0 → 2.6.0

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/git/gitConfig.ts

@@ -0,0 +1,32 @@
+import { exec } from "child-process-promise";
+
+export type GitLocationScope = "global" | "local" | "system" | "worktree";
+export type GitConfigOptions = {
+  location?: GitLocationScope;
+  comment?: string;
+};
+
+const argsJoin = (args: (string | undefined)[]): string =>
+  args.filter(Boolean).join(" ");
+
+export async function gitConfigGet(
+  key: string,
+  { location }: Pick<GitConfigOptions, "location"> = {},
+) {
+  const { stdout } = await exec(
+    `git config get ${argsJoin([location ? `--${location}` : undefined])} ${key}`,
+  );
+  return stdout.trim();
+}
+
+export const gitConfigSet = (
+  key: string,
+  value: string,
+  { location, comment }: GitConfigOptions = {},
+) =>
+  exec(
+    `git config set ${argsJoin([
+      location ? `--${location}` : undefined,
+      comment ? `--comment=${comment}` : undefined,
+    ])} ${key} ${value}`,
+  );

package/src/git/gitProjectInformation.ts

@@ -0,0 +1,40 @@
+import { gitConfigGet } from "./gitConfig";
+import { exec } from "child-process-promise";
+
+/**
+ * Find the absolute path of the current git project root.
+ */
+export const getProjectRootPath = async (): Promise<string> => {
+  const { stdout } = await exec(`git rev-parse --show-toplevel`);
+  return stdout.trim();
+};
+
+/**
+ * Get the git remote hostname and project path from the git config.
+ */
+export const getGitRemoteHostAndPath = async (): Promise<{
+  gitRemoteHost: string;
+  gitRemotePath: string;
+}> => {
+  const remoteUrl = await gitConfigGet("remote.origin.url");
+  const remoteReg = /(https:\/\/|git@)([^:/]+)[:/]([^.]*)(\.git)?/;
+  const match = remoteUrl.match(remoteReg) ?? [];
+  const [, , gitRemoteHost, gitRemotePath] = match;
+  if (!gitRemoteHost?.length || !gitRemotePath?.length) {
+    throw new Error(
+      `Failed to parse git remote hostname and path from git configs remote.origin.url! ${remoteUrl}`,
+    );
+  }
+  return { gitRemoteHost, gitRemotePath };
+};
+
+export const gitProjectInformation = async () => {
+  const [{ gitRemoteHost, gitRemotePath }, projectRootPath] = await Promise.all(
+    [getGitRemoteHostAndPath(), getProjectRootPath()],
+  );
+  return {
+    gitRemoteHost,
+    gitRemotePath,
+    projectRootPath,
+  };
+};

package/src/git/index.ts

@@ -0,0 +1,2 @@
+export * from "./gitConfig";
+export * from "./gitProjectInformation";

package/src/utils/gitlab.ts

@@ -1,11 +1,11 @@
 import { getSecretVarName } from "@catladder/pipeline";
-import { exec } from "child-process-promise";
 import { has, isObject } from "lodash";
 import memoizee from "memoizee";
 import fetch from "node-fetch";
 import open from "open";
 import type { CommandInstance } from "vorpal";
 import { getPreference, hasPreference, setPreference } from "./preferences";
+import { getGitRemoteHostAndPath } from "../git/gitProjectInformation";
 
 const TOKEN_KEY = "gitlab-personal-access-token";
 
@@ -17,14 +17,17 @@ export const setupGitlabToken = async (vorpal: CommandInstance) => {
   vorpal.log("");
   vorpal.log("☝ we open up the settings page for you!");
   vorpal.log("");
-  const { shouldContinue } = await vorpal.prompt({
-    default: true,
-    message: "Ok",
-    name: "shouldContinue",
-    type: "prompt",
-  });
-
-  open("https://git.panter.ch/-/profile/personal_access_tokens");
+  const [{ shouldContinue }, { gitRemoteHost }] = await Promise.all([
+    vorpal.prompt({
+      default: true,
+      message: "Ok",
+      name: "shouldContinue",
+      type: "prompt",
+    }),
+    getGitRemoteHostAndPath(),
+  ]);
+
+  open(`https://${gitRemoteHost}/-/profile/personal_access_tokens`);
 
   vorpal.log("Please type in gitlab's personal access token");
 
@@ -58,11 +61,14 @@ export const doGitlabRequest = async <T = any>(
   data: any = undefined,
   method: Method = "GET",
 ): Promise<T> => {
-  const rootToken = await getGitlabToken(vorpal);
+  const [rootToken, { gitRemoteHost }] = await Promise.all([
+    getGitlabToken(vorpal),
+    getGitRemoteHostAndPath(),
+  ]);
 
   //const method = data ? (update ? "PUT" : "POST") : "GET";
 
-  const result = await fetch(`https://git.panter.ch/api/v4/${path}`, {
+  const result = await fetch(`https://${gitRemoteHost}/api/v4/${path}`, {
     method,
     headers: {
       "Content-Type": "application/json",
@@ -91,16 +97,10 @@ export const doGitlabRequest = async <T = any>(
 export const getProjectInfo = async (
   vorpal: CommandInstance | null,
 ): Promise<{ id: string; web_url: string }> => {
-  const gitRemoteOriginUrl = (
-    await exec("git config --get remote.origin.url")
-  ).stdout.trim();
-  const projectPath =
-    /(https:\/\/|git@)git\.panter\.ch[:/]([^.]*)(\.git)?/g.exec(
-      gitRemoteOriginUrl,
-    );
+  const { gitRemotePath } = await getGitRemoteHostAndPath();
   const project = await doGitlabRequest(
     vorpal,
-    `projects/${encodeURIComponent(projectPath[2])}`,
+    `projects/${encodeURIComponent(gitRemotePath)}`,
   );
   return project;
 };