@catladder/cli 2.7.3 → 2.7.5

package/package.json

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

package/src/utils/gitlab.ts

@@ -27,7 +27,7 @@ export const setupGitlabToken = async (vorpal: CommandInstance) => {
     getGitRemoteHostAndPath(),
   ]);
 
-  open(`https://${gitRemoteHost}/-/profile/personal_access_tokens`);
+  open(`https://${gitRemoteHost}/-/user_settings/personal_access_tokens`);
 
   vorpal.log("Please type in gitlab's personal access token");
 

package/src/utils/preferences.ts

@@ -1,4 +1,12 @@
-import { readFile, writeFile, mkdir } from "fs/promises";
+import {
+  readFile,
+  writeFile,
+  mkdir,
+  rename,
+  cp,
+  rmdir,
+  chmod,
+} from "fs/promises";
 import { existsSync } from "fs";
 import { join, dirname } from "path";
 import { homedir } from "os";
@@ -8,26 +16,37 @@ const legacyPreferencesPath = join(homedir(), ".catladder/preferences.yml");
 const preferencesPath = join(homedir(), ".config/catladder/preferences.yml");
 
 const ensurePreferencesFile = async () => {
+  if (existsSync(legacyPreferencesPath)) {
+    await mkdir(dirname(preferencesPath), { recursive: true, mode: 0o700 });
+    await cp(legacyPreferencesPath, preferencesPath);
+    await chmod(dirname(preferencesPath), 0o600);
+    await rename(
+      legacyPreferencesPath,
+      join(dirname(preferencesPath), "old_preferences_backup.yml"),
+    );
+    await chmod(
+      join(dirname(preferencesPath), "old_preferences_backup.yml"),
+      0o600,
+    );
+    await rmdir(dirname(legacyPreferencesPath));
+    return;
+  }
   if (existsSync(preferencesPath)) {
-    return preferencesPath;
+    return;
   }
   await mkdir(dirname(preferencesPath), { recursive: true, mode: 0o700 });
   await writeFile(preferencesPath, "---\n{}", {
     encoding: "utf-8",
     mode: 0o600,
   });
-  if (existsSync(legacyPreferencesPath)) {
-    return legacyPreferencesPath;
-  }
-  return preferencesPath;
 };
 
 const loadPreferences = async () => {
-  const currentLoadPath = await ensurePreferencesFile();
-  return readFile(currentLoadPath, { encoding: "utf-8" });
+  await ensurePreferencesFile();
+  return readFile(preferencesPath, { encoding: "utf-8" });
 };
 
-const getPreferences = async () => {
+export const getPreferences = async () => {
   const yamlContent = await loadPreferences();
   return (parse(yamlContent) ?? {}) as Record<string, string>;
 };