@hurshb50/setup-ubuntu 2.0.3 → 2.0.5

package/distribution/assets/.gitconfig

@@ -1,7 +1,3 @@
-[user]
-	name = Hursh Patel
-	email = hurshb50@gmail.com
-
 [core]
 	editor = zed --wait
 
@@ -29,3 +25,13 @@
 [credential "https://github.com"]
 	helper =
 	helper = !/usr/bin/gh auth git-credential
+
+[credential "https://gist.github.com"]
+	helper =
+	helper = !/usr/bin/gh auth git-credential
+
+[includeIf "hasconfig:remote.*.url:https://github.com/rai-inst/**"]
+	path = ~/.config/git/work.gitconfig
+
+[includeIf "hasconfig:remote.*.url:https://github.com/hurshb50/**"]
+	path = ~/.config/git/personal.gitconfig

package/distribution/assets/git/personal.gitconfig

@@ -0,0 +1,3 @@
+[user]
+	name = Hursh Patel
+	email = hurshb50@gmail.com

package/distribution/assets/git/work.gitconfig

@@ -0,0 +1,3 @@
+[user]
+	name = Hursh Patel
+	email = hpatel@theaiinstitute.com

package/distribution/assets/skills/{test-planning → plan-tests}/SKILL.md

@@ -1,9 +1,9 @@
 ---
-name: test-planning
+name: plan-tests
 description: Plan reliable, behavior-focused tests without implementing them.
 ---
 
-# Test Planning
+# Plan Tests
 
 Plan tests for a selected function or class.
 

package/distribution/setup-ubuntu.mjs

@@ -11,7 +11,7 @@ import util from "util";
 import childProcess from "child_process";
 //#region package.json
 var name = "@hurshb50/setup-ubuntu";
-var version = "2.0.2";
+var version = "2.0.4";
 //#endregion
 //#region source/modules/logger/logger.ts
 var Logger = class Logger {
@@ -662,7 +662,28 @@ var VersionControlSystem = class {
 		const sourceFilePath = path.join(context.directories.assets, ".gitconfig");
 		const destinationFilePath = path.join(context.directories.home, ".gitconfig");
 		task.continue("Copy configuration");
-		await fs.copyFile(sourceFilePath, destinationFilePath);
+		const sourceConfiguration = await fs.readFile(sourceFilePath, "utf8");
+		let existingConfiguration = "";
+		try {
+			existingConfiguration = await fs.readFile(destinationFilePath, "utf8");
+		} catch (error) {
+			if (error.code !== "ENOENT") throw error;
+		}
+		const userConfigurations = [];
+		let currentSection = [];
+		let preserveCurrentSection = false;
+		for (const line of existingConfiguration.match(/[^\r\n]*(?:\r?\n|$)/g) ?? []) if (/^[ \t]*\[/.test(line)) {
+			if (preserveCurrentSection) userConfigurations.push(currentSection.join(""));
+			preserveCurrentSection = (line.match(/^[ \t]*\[([^\s\]]+)/)?.[1])?.toLowerCase() === "user";
+			currentSection = preserveCurrentSection ? [line] : [];
+		} else if (preserveCurrentSection) currentSection.push(line);
+		if (preserveCurrentSection) userConfigurations.push(currentSection.join(""));
+		const configuration = [...userConfigurations.map((value) => value.trim()), sourceConfiguration.trimEnd()].filter(Boolean).join("\n\n");
+		await fs.writeFile(destinationFilePath, `${configuration}\n`);
+		task.continue("Copy identity profiles");
+		const profilesDirectoryPath = path.join(context.directories.home, ".config", "git");
+		await fs.mkdir(profilesDirectoryPath, { recursive: true });
+		for (const fileName of ["work.gitconfig", "personal.gitconfig"]) await fs.copyFile(path.join(context.directories.assets, "git", fileName), path.join(profilesDirectoryPath, fileName));
 		task.finish();
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hurshb50/setup-ubuntu",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "type": "module",
   "files": [
     "distribution"