23 Commits

Author SHA1 Message Date
99bc7cb73e bump version 2021-12-07 15:25:06 +03:00
d4c2614d8e remove vsce from npm deps 2021-12-07 15:24:31 +03:00
98873d8be2 simplify gh actions 2021-12-07 15:23:27 +03:00
50f4015f30 rename error message 2021-12-07 15:17:55 +03:00
cb3ccbb4f6 Add overwrite button 2021-12-07 15:17:19 +03:00
5e776f686b Change error message 2021-12-07 15:03:15 +03:00
3c9a3f8168 remove unused log from switch 2021-12-07 15:02:56 +03:00
fdd72009b9 add some logs 2021-12-07 15:02:14 +03:00
3560e9f93b Fix gh actions 2021-12-07 14:24:55 +03:00
5e70f0da6b bump version 2021-12-07 11:56:16 +03:00
bf14a00b38 Change creation method for vscode.git api object 2021-12-07 11:53:13 +03:00
3b1a55ea0a add publish step to gh actions 2021-12-07 11:47:19 +03:00
926b050a63 add package step to gh actions 2021-12-07 11:35:44 +03:00
7e8621f6b2 remove matrix.os from gh actions 2021-12-07 11:35:33 +03:00
e1b1b4a16a Add Github Actions 2021-12-07 11:18:51 +03:00
ec9ab4174b Update .gitignore && package-lock.json 2021-12-07 11:17:18 +03:00
90cdb968bc fix typo in README 2021-12-06 22:47:35 +03:00
461bd634a6 bump version 2021-12-06 22:12:13 +03:00
533fe677de Update readme 2021-12-06 22:05:17 +03:00
4788b5403b rename user=>name 2021-12-06 21:52:48 +03:00
eee833f62e fix indent 2021-12-06 21:40:31 +03:00
f305cdd7c3 Change the repository creation method 2021-12-06 21:39:41 +03:00
f38ef7dee3 fix typo 2021-12-06 16:27:31 +03:00
7 changed files with 252 additions and 107 deletions

97
.github/workflows/main.yml vendored Normal file
View File

@@ -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

1
.gitignore vendored
View File

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

View File

@@ -1,5 +1,17 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file.
## [0.0.1] 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.3] - 2021-12-07
### Fixed
- Small fixes
## [0.0.2] - 2021-12-06
### Added
- README 😂
### Changed
- Rename `user` => `name` in settings options
## [0.0.1] - 2021-12-06
- Initial release - Initial release

View File

@@ -1 +1,9 @@
# gitcheck # Git User Check
Sometimes, after cloning a repository from a corporate server and having already sent several commits there, you notice that you forgot to change the user settings in git.
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.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`.

4
package-lock.json generated
View File

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

View File

@@ -2,8 +2,8 @@
"name": "gitcheck", "name": "gitcheck",
"displayName": "Git User Check", "displayName": "Git User Check",
"description": "Checking the user's compliance with the repository", "description": "Checking the user's compliance with the repository",
"version": "0.0.1", "version": "0.1.0",
"preview": true, "preview": false,
"engines": { "engines": {
"vscode": "^1.62.0" "vscode": "^1.62.0"
}, },
@@ -33,15 +33,15 @@
"properties": { "properties": {
"gitcheck.domain": { "gitcheck.domain": {
"type": "string", "type": "string",
"description": "remote domain for check" "description": "Remote domain for check"
}, },
"gitcheck.user": { "gitcheck.name": {
"type": "string", "type": "string",
"description": "Username for gitcheck domain" "description": "user.name for gitcheck domain"
}, },
"gitcheck.email": { "gitcheck.email": {
"type": "string", "type": "string",
"description": "Email for gitcheck domain" "description": "user.email for gitcheck domain"
} }
} }
} }
@@ -56,16 +56,16 @@
"test": "node ./out/test/runTest.js" "test": "node ./out/test/runTest.js"
}, },
"devDependencies": { "devDependencies": {
"@types/vscode": "^1.62.0",
"@types/glob": "^7.1.4", "@types/glob": "^7.1.4",
"@types/mocha": "^9.0.0", "@types/mocha": "^9.0.0",
"@types/node": "14.17.27", "@types/node": "14.17.27",
"@types/vscode": "^1.62.0",
"@typescript-eslint/eslint-plugin": "^5.1.0", "@typescript-eslint/eslint-plugin": "^5.1.0",
"@typescript-eslint/parser": "^5.1.0", "@typescript-eslint/parser": "^5.1.0",
"@vscode/test-electron": "^1.6.2",
"eslint": "^8.1.0", "eslint": "^8.1.0",
"glob": "^7.1.7", "glob": "^7.1.7",
"mocha": "^9.1.3", "mocha": "^9.1.3",
"typescript": "^4.4.4", "typescript": "^4.4.4"
"@vscode/test-electron": "^1.6.2"
} }
} }

View File

@@ -1,36 +1,58 @@
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import { GitExtension } from './git'; import { GitExtension } from './git';
export function activate() { export async function activate() {
var conf = vscode.workspace.getConfiguration("gitcheck"); var conf = vscode.workspace.getConfiguration("gitcheck");
const domain = conf.get<string>("domain"); const domain = conf.get<string>("domain");
const user = conf.get<string>("user"); const name = conf.get<string>("name");
const email = conf.get<string>("email"); const email = conf.get<string>("email");
if (!(domain && user && email)) { if (!vscode.workspace.workspaceFolders) {
console.log("No opened workspace");
return;
}
if (!(domain && name && email)) {
console.log("Missing config params"); console.log("Missing config params");
return; return;
} }
const git = vscode.extensions.getExtension<GitExtension>('vscode.git')!.exports.getAPI(1)!; const gitExt = vscode.extensions.getExtension<GitExtension>('vscode.git')!;
const repository = git.repositories[0]; 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;
}
repository.state.remotes.forEach(async remote => { repository.state.remotes.forEach(async remote => {
const pushUrl = remote.pushUrl; const pushUrl = remote.pushUrl;
if (pushUrl && pushUrl.includes(domain)) { if (pushUrl && pushUrl.includes(domain)) {
var gitConfig = await repository.getConfigs(); var gitConfig = await repository.getConfigs();
var gitUser:string = ""; var gitName:string = "";
var gitEmail:string = ""; var gitEmail:string = "";
gitConfig = gitConfig.filter( elem => { gitConfig = gitConfig.filter( elem => {
return elem.key === "user.name" || elem.key === "user.email"; return elem.key === "user.name" || elem.key === "user.email";
}); });
if (gitConfig.length === 0) { 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; return;
} }
gitConfig.forEach(c => { gitConfig.forEach(c => {
switch (c.key) { switch (c.key) {
case "user.name": case "user.name":
gitUser = c.value; gitName = c.value;
break; break;
case "user.email": case "user.email":
@@ -38,11 +60,16 @@ export function activate() {
break; break;
default: default:
console.log(c.key); break;
} }
}); });
if (gitUser !== user || gitEmail !== email) { 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);
}
} }
} }
}); });