bump version

.github/workflows/main.yml

@@ -0,0 +1,97 @@
+name: "Main"
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    name: Lint
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+      - run: /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & echo "Started xvfb"
+        shell: bash
+      - run: npm install
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - run: npm run lint
+        env:
+          DISPLAY: ":99.0"
+  package:
+    runs-on: ubuntu-latest
+    needs: lint
+    name: Package
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+      - run: npm install
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+      - run: npm install -g vsce
+      - run: vsce package
+      - run: echo "VSIX_PATH=$(find . -maxdepth 1 -type f -iname "*.vsix" | head -1)" >> $GITHUB_ENV
+      - run: echo "VSIX_NAME=$(basename $(find . -maxdepth 1 -type f -iname "*.vsix" | head -1))" >> $GITHUB_ENV
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ${{ env.VSIX_PATH }}
+          name: ${{ env.VSIX_NAME }}
+  release:
+    runs-on: ubuntu-latest
+    needs: package
+    if: startsWith(github.ref, 'refs/tags/v')
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      VSCE_PAT: ${{ secrets.VSCE_PAT }}
+      DISPLAY: ":99.0"
+    name: Release
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+      - run: /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & echo "Started xvfb"
+        shell: bash
+      - run: npm install
+      - run: npm install -g vsce
+      - run: vsce package
+      - run: echo "VSIX_PATH=$(find . -maxdepth 1 -type f -iname "*.vsix" | head -1)" >> $GITHUB_ENV
+      - run: echo "VSIX_NAME=$(basename $(find . -maxdepth 1 -type f -iname "*.vsix" | head -1))" >> $GITHUB_ENV
+      - uses: actions/create-release@v1
+        id: create_release
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          body: See [CHANGE LOG](https://github.com/maksim77/gitcheck/blob/main/CHANGELOG.md) for details.
+          draft: false
+          prerelease: false
+      - uses: actions/upload-release-asset@v1
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ env.VSIX_PATH }}
+          asset_name: ${{ env.VSIX_NAME }}
+          asset_content_type: application/zip
+      - run: vsce publish

.gitignore

@@ -1 +1,2 @@
 out
+.vscode-test/

CHANGELOG.md

@@ -3,7 +3,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## [0.0.2]  - 2021-12-06
+
+## [0.1.1] - 2021-12-09
+### Added 
+- icon
+## [0.1.0] - 2021-12-07
+### Added
+- Overwrite button in error message
+
+## [0.0.3] - 2021-12-07
+### Fixed
+- Small fixes
+
+## [0.0.2] - 2021-12-06
 ### Added
 - README 😂
 ### Changed

README.md

@@ -4,6 +4,6 @@ Sometimes, after cloning a repository from a corporate server and having already
 This extension is written to avoid this.
 
 ## Configuration
-* `gitcheck.domain` – The domain (or just a substring) for which the check will be performed (you can see in the output of the command `git remote -v`)&
+* `gitcheck.domain` – The domain (or just a substring) for which the check will be performed (you can see in the output of the command `git remote -v`).
 * `gitcheck.name` – This value will be checked against the value of the git parameter `user.name`.
 * `gitcheck.email` – This value will be checked against the value of the git parameter `user.email`.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "gitcheck",
-  "version": "0.0.1",
+  "version": "0.1.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "gitcheck",
-      "version": "0.0.1",
+      "version": "0.1.1",
       "devDependencies": {
         "@types/glob": "^7.1.4",
         "@types/mocha": "^9.0.0",

package.json

@@ -1,71 +1,72 @@
 {
   "name": "gitcheck",
-	"displayName": "Git User Check",
-	"description": "Checking the user's compliance with the repository",
-	"version": "0.0.2",
-	"preview": true,
-	"engines": {
-		"vscode": "^1.62.0"
-	},
-	"categories": [
-		"Other"
-	],
-	"author": {
-		"name": "Maksim Syomochkin",
-		"email": "maksim77ster@gmail.com"
-	},
-	"publisher": "mak-sim",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/maksim77/gitcheck.git"
-	},
-	"activationEvents": [
-        "workspaceContains:.git/"
-	],
-	"extensionDependencies": [
-		"vscode.git"
-	],
-	"main": "./out/extension.js",
-	"contributes": {
-		"configuration":[
-			{
-				"title": "Git User Check",
-				"properties": {
-				"gitcheck.domain": {
-					"type": "string",
-					"description": "Remote domain for check"
-				},
-				"gitcheck.name": {
-					"type":"string",
-					"description": "user.name for gitcheck domain"
-				},
-				"gitcheck.email": {
-					"type":"string",
-					"description": "user.email for gitcheck domain"
-				}
-				}
-			}
-		]
-	},
-	"scripts": {
-		"vscode:prepublish": "npm run compile",
-		"compile": "tsc -p ./",
-		"watch": "tsc -watch -p ./",
-		"pretest": "npm run compile && npm run lint",
-		"lint": "eslint src --ext ts",
-		"test": "node ./out/test/runTest.js"
-	},
-	"devDependencies": {
-		"@types/vscode": "^1.62.0",
-		"@types/glob": "^7.1.4",
-		"@types/mocha": "^9.0.0",
-		"@types/node": "14.17.27",
-		"@typescript-eslint/eslint-plugin": "^5.1.0",
-		"@typescript-eslint/parser": "^5.1.0",
-		"eslint": "^8.1.0",
-		"glob": "^7.1.7",
-		"mocha": "^9.1.3",
-		"typescript": "^4.4.4",
-		"@vscode/test-electron": "^1.6.2"
-	}
+  "displayName": "Git User Check",
+  "description": "Checking the user's compliance with the repository",
+  "version": "0.1.1",
+  "preview": false,
+  "engines": {
+    "vscode": "^1.62.0"
+  },
+  "categories": [
+    "Other"
+  ],
+  "author": {
+    "name": "Maksim Syomochkin",
+    "email": "maksim77ster@gmail.com"
+  },
+  "publisher": "mak-sim",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/maksim77/gitcheck.git"
+  },
+  "icon": "media/folder-green-git-icon.png",
+  "activationEvents": [
+    "workspaceContains:.git/"
+  ],
+  "extensionDependencies": [
+    "vscode.git"
+  ],
+  "main": "./out/extension.js",
+  "contributes": {
+    "configuration": [
+      {
+        "title": "Git User Check",
+        "properties": {
+          "gitcheck.domain": {
+            "type": "string",
+            "description": "Remote domain for check"
+          },
+          "gitcheck.name": {
+            "type": "string",
+            "description": "user.name for gitcheck domain"
+          },
+          "gitcheck.email": {
+            "type": "string",
+            "description": "user.email for gitcheck domain"
+          }
+        }
+      }
+    ]
+  },
+  "scripts": {
+    "vscode:prepublish": "npm run compile",
+    "compile": "tsc -p ./",
+    "watch": "tsc -watch -p ./",
+    "pretest": "npm run compile && npm run lint",
+    "lint": "eslint src --ext ts",
+    "test": "node ./out/test/runTest.js"
+  },
+  "devDependencies": {
+    "@types/glob": "^7.1.4",
+    "@types/mocha": "^9.0.0",
+    "@types/node": "14.17.27",
+    "@types/vscode": "^1.62.0",
+    "@typescript-eslint/eslint-plugin": "^5.1.0",
+    "@typescript-eslint/parser": "^5.1.0",
+    "@vscode/test-electron": "^1.6.2",
+    "eslint": "^8.1.0",
+    "glob": "^7.1.7",
+    "mocha": "^9.1.3",
+    "typescript": "^4.4.4"
+  }
 }

src/extension.ts

@@ -8,6 +8,7 @@ export async function activate() {
 	const email = conf.get<string>("email");
 
 	if (!vscode.workspace.workspaceFolders) {
+		console.log("No opened workspace");
 		return;
 	}
 
@@ -16,10 +17,17 @@ export async function activate() {
 		return;
 	}
 
-	const git = vscode.extensions.getExtension<GitExtension>('vscode.git')!.exports.getAPI(1)!;
+	const gitExt = vscode.extensions.getExtension<GitExtension>('vscode.git')!;
+	const git = gitExt.exports.getAPI(1);
+	if (!git) {
+		console.log("Git extension disabled");
+		return;
+	}
+	
 	const repository = await git.openRepository(vscode.workspace.workspaceFolders[0].uri);
 	
 	if (!repository) {
+		console.error("Cannot open git repository");
 		return;
 	}
 
@@ -33,7 +41,12 @@ export async function activate() {
 				return elem.key === "user.name" || elem.key === "user.email";
 			});
 			if (gitConfig.length === 0) {
-				vscode.window.showErrorMessage("Missing user creds in git");
+				console.error("Missing user creds in git");
+				const option = await vscode.window.showErrorMessage("Missing user settings in git", "Overwrite");
+				if (option && option === "Overwrite") {
+					await repository.setConfig("user.name", name);
+					await repository.setConfig("user.email", email);
+				}
 				return;
 			}
 			gitConfig.forEach(c => {
@@ -47,11 +60,16 @@ export async function activate() {
 						break;
 						
 					default:
-						console.log(c.key);
+						break;
 				}
 			});
 			if (gitName !== name || gitEmail !== email) {
-				vscode.window.showErrorMessage("Wrong user creds in git");
+				console.error("Wrong user settings in git");
+				const option = await vscode.window.showErrorMessage("Wrong user settings in git", "Overwrite");
+				if (option && option === "Overwrite") {
+					await repository.setConfig("user.name", name);
+					await repository.setConfig("user.email", email);
+				}	
 			}
 		}
 	});