fix(core): update
This commit is contained in:
parent
b46d1e19a7
commit
f5617d9d45
@ -12,20 +12,12 @@ stages:
|
|||||||
- release
|
- release
|
||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
|
before_script:
|
||||||
|
- npm install -g @shipzone/npmci
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
# ====================
|
# ====================
|
||||||
mirror:
|
|
||||||
stage: security
|
|
||||||
script:
|
|
||||||
- npmci git mirror
|
|
||||||
only:
|
|
||||||
- tags
|
|
||||||
tags:
|
|
||||||
- lossless
|
|
||||||
- docker
|
|
||||||
- notpriv
|
|
||||||
|
|
||||||
auditProductionDependencies:
|
auditProductionDependencies:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
stage: security
|
stage: security
|
||||||
@ -36,6 +28,7 @@ auditProductionDependencies:
|
|||||||
- npmci command npm audit --audit-level=high --only=prod --production
|
- npmci command npm audit --audit-level=high --only=prod --production
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
|
allow_failure: true
|
||||||
|
|
||||||
auditDevDependencies:
|
auditDevDependencies:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
@ -96,10 +89,9 @@ codequality:
|
|||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
script:
|
script:
|
||||||
- npmci command npm install -g tslint typescript
|
- npmci command npm install -g typescript
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
@ -119,11 +111,10 @@ trigger:
|
|||||||
pages:
|
pages:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci command npm install -g @gitzone/tsdoc
|
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command tsdoc
|
- npmci command npm run buildDocs
|
||||||
tags:
|
tags:
|
||||||
- lossless
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
|
24
.vscode/launch.json
vendored
24
.vscode/launch.json
vendored
@ -2,28 +2,10 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "current file",
|
"command": "npm test",
|
||||||
"type": "node",
|
"name": "Run npm test",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"args": [
|
"type": "node-terminal"
|
||||||
"${relativeFile}"
|
|
||||||
],
|
|
||||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
|
||||||
"cwd": "${workspaceRoot}",
|
|
||||||
"protocol": "inspector",
|
|
||||||
"internalConsoleOptions": "openOnSessionStart"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "test.ts",
|
|
||||||
"type": "node",
|
|
||||||
"request": "launch",
|
|
||||||
"args": [
|
|
||||||
"test/test.ts"
|
|
||||||
],
|
|
||||||
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
|
||||||
"cwd": "${workspaceRoot}",
|
|
||||||
"protocol": "inspector",
|
|
||||||
"internalConsoleOptions": "openOnSessionStart"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "pushrocks",
|
"gitscope": "pushrocks",
|
||||||
"gitrepo": "smartgit",
|
"gitrepo": "smartgit",
|
||||||
"shortDescription": "smart wrapper for nodegit",
|
"description": "smart wrapper for nodegit",
|
||||||
"npmPackagename": "@pushrocks/smartgit",
|
"npmPackagename": "@pushrocks/smartgit",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,8 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "(tstest test/)",
|
"test": "(tstest test/)",
|
||||||
"build": "(tsbuild --web)"
|
"build": "(tsbuild --web)",
|
||||||
|
"buildDocs": "tsdoc"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@ -75,7 +75,6 @@ Tip: use [smartssh](https://npmjs.com/smartssh) to setup your SSH environment
|
|||||||
|
|
||||||
[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
|
[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
|
||||||
|
|
||||||
|
|
||||||
## Contribution
|
## Contribution
|
||||||
|
|
||||||
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
|
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
|
||||||
|
@ -7,20 +7,23 @@ import * as path from 'path';
|
|||||||
|
|
||||||
let testSmartgitInstance: smartgit.Smartgit;
|
let testSmartgitInstance: smartgit.Smartgit;
|
||||||
const testRepoDir = path.join(__dirname, '../.nogit/testrepo');
|
const testRepoDir = path.join(__dirname, '../.nogit/testrepo');
|
||||||
const testRepoDirSmartfile = path.join(__dirname, '../.nogit/pushrocks_smartfile')
|
const testRepoDirSmartfile = path.join(__dirname, '../.nogit/pushrocks_smartfile');
|
||||||
|
|
||||||
tap.test('should create a valid smartgit instance', async () => {
|
tap.test('should create a valid smartgit instance', async () => {
|
||||||
testSmartgitInstance = new smartgit.Smartgit();
|
testSmartgitInstance = new smartgit.Smartgit();
|
||||||
await testSmartgitInstance.init();
|
await testSmartgitInstance.init();
|
||||||
expect(testSmartgitInstance).toBeInstanceOf(smartgit.Smartgit);
|
expect(testSmartgitInstance).toBeInstanceOf(smartgit.Smartgit);
|
||||||
})
|
});
|
||||||
|
|
||||||
tap.test('should create a new repo at .nogit', async () => {
|
tap.test('should create a new repo at .nogit', async () => {
|
||||||
const gitRepo = await testSmartgitInstance.createRepoByOpen(testRepoDir);
|
const gitRepo = await testSmartgitInstance.createRepoByOpen(testRepoDir);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should clone a repo', async () => {
|
tap.test('should clone a repo', async () => {
|
||||||
const gitRepo = await testSmartgitInstance.createRepoByClone('https://gitlab.com/pushrocks/smartfile.git', testRepoDirSmartfile);
|
const gitRepo = await testSmartgitInstance.createRepoByClone(
|
||||||
|
'https://gitlab.com/pushrocks/smartfile.git',
|
||||||
|
testRepoDirSmartfile
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@pushrocks/smartgit',
|
name: '@pushrocks/smartgit',
|
||||||
version: '2.0.3',
|
version: '2.0.4',
|
||||||
description: 'smart wrapper for nodegit'
|
description: 'smart wrapper for nodegit'
|
||||||
}
|
}
|
||||||
|
@ -74,24 +74,23 @@ export class GitRepo {
|
|||||||
*/
|
*/
|
||||||
public async ensureRemote(remoteNameArg: string, remoteUrlArg: string): Promise<void> {
|
public async ensureRemote(remoteNameArg: string, remoteUrlArg: string): Promise<void> {
|
||||||
const remotes = await this.listRemotes();
|
const remotes = await this.listRemotes();
|
||||||
const existingRemote =
|
const existingRemote = remotes.find((itemArg) => itemArg.remote === remoteNameArg);
|
||||||
remotes.find((itemArg) => itemArg.remote === remoteNameArg);
|
|
||||||
if (existingRemote) {
|
if (existingRemote) {
|
||||||
if (existingRemote.url !== remoteUrlArg) {
|
if (existingRemote.url !== remoteUrlArg) {
|
||||||
await plugins.isomorphicGit.deleteRemote({
|
await plugins.isomorphicGit.deleteRemote({
|
||||||
remote: remoteNameArg,
|
remote: remoteNameArg,
|
||||||
fs: this.smartgitRef.envDeps.fs,
|
fs: this.smartgitRef.envDeps.fs,
|
||||||
dir: this.repoDir
|
dir: this.repoDir,
|
||||||
})
|
});
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
await plugins.isomorphicGit.addRemote({
|
await plugins.isomorphicGit.addRemote({
|
||||||
remote: remoteNameArg,
|
remote: remoteNameArg,
|
||||||
fs: this.smartgitRef.envDeps.fs,
|
fs: this.smartgitRef.envDeps.fs,
|
||||||
url: remoteUrlArg
|
url: remoteUrlArg,
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -99,7 +98,7 @@ export class GitRepo {
|
|||||||
*/
|
*/
|
||||||
public async getUrlForRemote(remoteName: string): Promise<string> {
|
public async getUrlForRemote(remoteName: string): Promise<string> {
|
||||||
const remotes = await this.listRemotes();
|
const remotes = await this.listRemotes();
|
||||||
const existingRemote = remotes.find(remoteArg => remoteArg.remote === remoteName);
|
const existingRemote = remotes.find((remoteArg) => remoteArg.remote === remoteName);
|
||||||
return existingRemote?.url;
|
return existingRemote?.url;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,7 +107,7 @@ export class GitRepo {
|
|||||||
fs: this.smartgitRef.envDeps.fs,
|
fs: this.smartgitRef.envDeps.fs,
|
||||||
http: this.smartgitRef.envDeps.http,
|
http: this.smartgitRef.envDeps.http,
|
||||||
ref: branchName,
|
ref: branchName,
|
||||||
remote: remoteName
|
remote: remoteName,
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,28 +8,30 @@ export class Smartgit {
|
|||||||
http: any;
|
http: any;
|
||||||
} = {
|
} = {
|
||||||
fs: null,
|
fs: null,
|
||||||
http: null
|
http: null,
|
||||||
}
|
};
|
||||||
|
|
||||||
constructor() {};
|
constructor() {}
|
||||||
|
|
||||||
public async init() {
|
public async init() {
|
||||||
if (this.smartenvInstance.isNode) {
|
if (this.smartenvInstance.isNode) {
|
||||||
this.envDeps.fs = await this.smartenvInstance.getSafeNodeModule('fs');
|
this.envDeps.fs = await this.smartenvInstance.getSafeNodeModule('fs');
|
||||||
this.envDeps.http = await this.smartenvInstance.getSafeNodeModule('isomorphic-git/http/node/index.js');
|
this.envDeps.http = await this.smartenvInstance.getSafeNodeModule(
|
||||||
|
'isomorphic-git/http/node/index.js'
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
throw new Error('currently only node.js is supported.')
|
throw new Error('currently only node.js is supported.');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
public async createRepoByClone(fromUrlArg: string, toDirArg: string) {
|
public async createRepoByClone(fromUrlArg: string, toDirArg: string) {
|
||||||
const repo = await GitRepo.fromCloningIntoDir(this, fromUrlArg, toDirArg)
|
const repo = await GitRepo.fromCloningIntoDir(this, fromUrlArg, toDirArg);
|
||||||
};
|
}
|
||||||
|
|
||||||
public async createRepoByInit(dirArg: string) {
|
public async createRepoByInit(dirArg: string) {
|
||||||
const repo = await GitRepo.fromCreatingRepoInDir(this, dirArg);
|
const repo = await GitRepo.fromCreatingRepoInDir(this, dirArg);
|
||||||
return repo;
|
return repo;
|
||||||
};
|
}
|
||||||
|
|
||||||
public async createRepoByOpen(dirArg: string) {
|
public async createRepoByOpen(dirArg: string) {
|
||||||
const repo = await GitRepo.fromOpeningRepoDir(this, dirArg);
|
const repo = await GitRepo.fromOpeningRepoDir(this, dirArg);
|
||||||
|
Loading…
Reference in New Issue
Block a user