fix(core): update

This commit is contained in:
Philipp Kunz 2019-06-17 10:26:26 +02:00
parent 1afa78307c
commit fc22ea9e4d
17 changed files with 1100 additions and 1115 deletions

20
.gitignore vendored
View File

@ -1,4 +1,22 @@
node_modules/
.nogit/
# artifacts
coverage/
public/
pages/
# installs
node_modules/
# caches
.yarn/
.cache/
.rpt2_cache
# builds
dist/
dist_web/
dist_serve/
dist_ts_web/
# custom

View File

@ -1,4 +1,4 @@
# gitzone standard
# gitzone ci_default
image: hosttoday/ht-docker-node:npmci
cache:
@ -26,6 +26,7 @@ mirror:
snyk:
stage: security
script:
- npmci npm prepare
- npmci command npm install -g snyk
- npmci command npm install --ignore-scripts
- npmci command snyk test
@ -36,21 +37,11 @@ snyk:
# ====================
# test stage
# ====================
testLEGACY:
stage: test
script:
- npmci node install legacy
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
- notpriv
allow_failure: true
testLTS:
stage: test
script:
- npmci npm prepare
- npmci node install lts
- npmci npm install
- npmci npm test
@ -62,6 +53,7 @@ testLTS:
testSTABLE:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci npm test
@ -86,19 +78,11 @@ release:
# ====================
codequality:
stage: metadata
image: docker:stable
allow_failure: true
services:
- docker:stable-dind
script:
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
- docker run
--env SOURCE_CODE="$PWD"
--volume "$PWD":/code
--volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
artifacts:
paths: [codeclimate.json]
- npmci command npm install -g tslint typescript
- npmci npm install
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
tags:
- docker
- priv
@ -117,8 +101,10 @@ pages:
image: hosttoday/ht-docker-node:npmci
stage: metadata
script:
- npmci command npm install -g npmpage
- npmci command npmpage
- npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare
- npmci npm install
- npmci command tsdoc
tags:
- docker
- notpriv
@ -128,3 +114,4 @@ pages:
expire_in: 1 week
paths:
- public
allow_failure: true

View File

@ -1,33 +1,28 @@
# npmg
# @gitzone/tools
setup your environment with the most important tools and update them easily.
## Availabililty
[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmg)
[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmg)
[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmg)
[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmg/)
## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@gitzone/tools)
* [gitlab.com (source)](https://gitlab.com/gitzone/tools)
* [github.com (source mirror)](https://github.com/gitzone/tools)
* [docs (typedoc)](https://gitzone.gitlab.io/tools/)
## Status for master
[![build status](https://GitLab.com/gitzone/npmg/badges/master/build.svg)](https://GitLab.com/gitzone/npmg/commits/master)
[![coverage report](https://GitLab.com/gitzone/npmg/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmg/commits/master)
[![npm downloads per month](https://img.shields.io/npm/dm/npmg.svg)](https://www.npmjs.com/package/npmg)
[![Dependency Status](https://david-dm.org/gitzonetools/npmg.svg)](https://david-dm.org/gitzonetools/npmg)
[![bitHound Dependencies](https://www.bithound.io/github/gitzonetools/npmg/badges/dependencies.svg)](https://www.bithound.io/github/gitzonetools/npmg/master/dependencies/npm)
[![bitHound Code](https://www.bithound.io/github/gitzonetools/npmg/badges/code.svg)](https://www.bithound.io/github/gitzonetools/npmg)
[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
[![build status](https://gitlab.com/gitzone/tools/badges/master/build.svg)](https://gitlab.com/gitzone/tools/commits/master)
[![coverage report](https://gitlab.com/gitzone/tools/badges/master/coverage.svg)](https://gitlab.com/gitzone/tools/commits/master)
[![npm downloads per month](https://img.shields.io/npm/dm/@gitzone/tools.svg)](https://www.npmjs.com/package/@gitzone/tools)
[![Known Vulnerabilities](https://snyk.io/test/npm/@gitzone/tools/badge.svg)](https://snyk.io/test/npm/@gitzone/tools)
[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
## Usage
Use TypeScript for best in class instellisense.
For further information read the linked docs at the top of this README.
For further information read the linked docs at the top of this readme.
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)
[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)

View File

@ -1,4 +0,0 @@
#!/usr/bin/env node
import * as tsrun from 'tsrun';
process.env.CLI_CALL = 'true';
require("../index.ts");

3
cli.js Normal file
View File

@ -0,0 +1,3 @@
#!/usr/bin/env node
process.env.CLI_CALL = 'true';
require('./dist/index');

4
cli.ts.js Normal file
View File

@ -0,0 +1,4 @@
#!/usr/bin/env node
process.env.CLI_CALL = 'true';
require('@gitzone/tsrun');
require('./ts/index');

View File

@ -1,45 +0,0 @@
# npmg
setup your environment with the most important tools and update them easily.
## Availabililty
[![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmg)
[![git](https://gitzone.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/gitzone/npmg)
[![git](https://gitzone.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/gitzone/npmg)
[![docs](https://gitzone.gitlab.io/assets/repo-button-docs.svg)](https://gitzone.gitlab.io/npmg/)
## Status for master
[![build status](https://GitLab.com/gitzone/npmg/badges/master/build.svg)](https://GitLab.com/gitzone/npmg/commits/master)
[![coverage report](https://GitLab.com/gitzone/npmg/badges/master/coverage.svg)](https://GitLab.com/gitzone/npmg/commits/master)
[![npm downloads per month](https://img.shields.io/npm/dm/npmg.svg)](https://www.npmjs.com/package/npmg)
[![Dependency Status](https://david-dm.org/gitzonetools/npmg.svg)](https://david-dm.org/gitzonetools/npmg)
[![bitHound Dependencies](https://www.bithound.io/github/gitzonetools/npmg/badges/dependencies.svg)](https://www.bithound.io/github/gitzonetools/npmg/master/dependencies/npm)
[![bitHound Code](https://www.bithound.io/github/gitzonetools/npmg/badges/code.svg)](https://www.bithound.io/github/gitzonetools/npmg)
[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
## Usage
Use TypeScript for best in class instellisense.
To install the package type
```shell
yarn global add npmg
```
Then install a bundle by typing
```shell
npmg install
```
For further information read the linked docs at the top of this README.
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
[![repo-footer](https://gitzone.gitlab.io/assets/repo-footer.svg)](https://git.zone)

View File

@ -7,5 +7,15 @@
"npmts"
],
"npmAccessLevel": "public"
},
"gitzone": {
"module": {
"githost": "gitlab.com",
"gitscope": "gitzone",
"gitrepo": "tools",
"shortDescription": "setup your environment with the most important tools and update them easily.",
"npmPackagename": "@gitzone/tools",
"license": "MIT"
}
}
}

1920
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -6,11 +6,11 @@
"main": "dist/index.js",
"typings": "dist/index.d.ts",
"scripts": {
"test": "tsrun test/test.ts",
"build": "echo \"Not needed for now\""
"test": "tstest test/",
"build": "tsbuild"
},
"bin": {
"gtools": "bin/cli.js"
"gtools": "cli.js"
},
"repository": {
"type": "git",
@ -29,15 +29,29 @@
},
"homepage": "https://github.com/GitZoneTools/npmg#readme",
"devDependencies": {
"tapbundle": "^1.0.13"
"@gitzone/tstest": "^1.0.24",
"@pushrocks/tapbundle": "^3.0.9",
"tslint": "^5.17.0",
"tslint-config-prettier": "^1.18.0"
},
"dependencies": {
"@gitzone/tsrun": "^1.0.5",
"@pushrocks/smartcli": "^3.0.1",
"@types/node": "^10.3.1",
"beautylog": "^6.1.10",
"smartenv": "^3.0.0",
"smartfile": "4.2.17",
"smartshell": "^1.0.6"
}
"@gitzone/tsrun": "^1.2.6",
"@pushrocks/smartcli": "^3.0.7",
"@pushrocks/smartenv": "^4.0.6",
"@pushrocks/smartfile": "^7.0.2",
"@pushrocks/smartlog": "^2.0.19",
"@pushrocks/smartlog-destination-local": "^8.0.2",
"@pushrocks/smartshell": "^2.0.23",
"@types/node": "^12.0.8"
},
"files": [
"ts/*",
"ts_web/*",
"dist/*",
"dist_web/*",
"assets/*",
"cli.js",
"npmextra.json",
"readme.md"
]
}

View File

@ -1,10 +1,12 @@
{
"default":[
"@gitzone/npmdocker",
"@gitzone/npmts",
"@gitzone/gitzone",
"@gitzone_private/gitzone",
"typescript",
"tslint",
"@gitzone/tsrun"
"@gitzone/tsrun",
"@gitzone/tsdocker",
"snyk",
"npm-check"
]
}

View File

@ -1,7 +1,7 @@
import { expect, tap } from 'tapbundle';
import { expect, tap } from '@pushrocks/tapbundle';
import * as npmgInstall from '../ts/tools.install';
import * as smartenv from 'smartenv';
import * as smartenv from '@pushrocks/smartenv';
let environment = new smartenv.Smartenv();

View File

@ -1,11 +1,11 @@
import * as plugins from './tools.plugins';
import * as toolsInstall from './tools.install';
let npmgSmartcli = new plugins.smartcli.Smartcli();
const toolsCli = new plugins.smartcli.Smartcli();
npmgSmartcli.addCommand('install').subscribe(async argvArg => {
toolsCli.addCommand('install').subscribe(async argvArg => {
toolsInstall.install('default');
});
npmgSmartcli.addVersion('no version set');
npmgSmartcli.startParse();
toolsCli.addVersion('no version set');
toolsCli.startParse();

View File

@ -1,30 +1,38 @@
import plugins = require('./tools.plugins');
import paths = require('./tools.paths');
import { logger } from './tools.logging';
const installExec = async (packageNames: string[]) => {
const smartshellInstance = new plugins.smartshell.Smartshell({
executor: 'bash'
});
let installString = '';
for (let packageName of packageNames) {
for (const packageName of packageNames) {
logger.log('info', `Found ${packageName}!`);
installString = installString + `${packageName} `;
}
await plugins.smartshell.exec(`yarn global remove ${installString}`);
for (let packageName of packageNames) {
plugins.beautylog.info(`now preparing ${packageName}`);
plugins.beautylog.log(`Installing ${packageName}`);
}
await plugins.smartshell.exec(`npm install -g ${installString}`);
// lets remove old packages
const uninstallCommand = `npm uninstall -g ${installString}`;
const installCommand = `npm install -g ${installString}`;
logger.log('info', `uninstalling old packages with "${uninstallCommand}"`);
await smartshellInstance.exec(uninstallCommand);
logger.log('info', `installing tools with ${installCommand}`);
await smartshellInstance.exec(installCommand);
logger.log('ok', `installed tools successfully!`);
};
let packageLibrary = plugins.smartfile.fs.toObjectSync(
const packageLibrary = plugins.smartfile.fs.toObjectSync(
plugins.path.join(paths.packageBase, 'package_library.json')
);
export const install = async (packageSetArg: String) => {
export const install = async (packageSetArg: string) => {
switch (packageSetArg) {
case 'default':
await installExec(packageLibrary.default);
break;
default:
plugins.beautylog.warn('no set has been specified');
logger.log('warn', 'no set has been specified');
break;
}
};

15
ts/tools.logging.ts Normal file
View File

@ -0,0 +1,15 @@
import * as plugins from './tools.plugins';
export const logger = new plugins.smartlog.Smartlog({
logContext: {
company: 'Some Company',
companyunit: 'Some CompanyUnit',
containerName: 'Some Containername',
environment: 'local',
runtime: 'node',
zone: 'gitzone'
},
minimumLogLevel: 'silly'
});
logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

View File

@ -1,7 +1,11 @@
import * as beautylog from 'beautylog';
// node native
import * as path from 'path';
import * as smartcli from '@pushrocks/smartcli';
import * as smartfile from 'smartfile';
import * as smartshell from 'smartshell';
export { beautylog, path, smartcli, smartfile, smartshell };
// pushrocks scope
import * as smartlog from '@pushrocks/smartlog';
import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local';
import * as smartcli from '@pushrocks/smartcli';
import * as smartfile from '@pushrocks/smartfile';
import * as smartshell from '@pushrocks/smartshell';
export { smartlog, smartlogDestinationLocal, path, smartcli, smartfile, smartshell };

View File

@ -1,3 +1,17 @@
{
"extends": "tslint-config-standard"
"extends": ["tslint:latest", "tslint-config-prettier"],
"rules": {
"semicolon": [true, "always"],
"no-console": false,
"ordered-imports": false,
"object-literal-sort-keys": false,
"member-ordering": {
"options":{
"order": [
"static-method"
]
}
}
},
"defaultSeverity": "warning"
}