fix(core): update

This commit is contained in:
Philipp Kunz 2018-11-26 17:55:15 +01:00
parent 6e7b4dd18e
commit 6a047d6333
5 changed files with 20 additions and 34 deletions

View File

@ -26,6 +26,7 @@ mirror:
snyk: snyk:
stage: security stage: security
script: script:
- npmci npm prepare
- npmci command npm install -g snyk - npmci command npm install -g snyk
- npmci command npm install --ignore-scripts - npmci command npm install --ignore-scripts
- npmci command snyk test - npmci command snyk test
@ -36,21 +37,11 @@ snyk:
# ==================== # ====================
# test stage # 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: testLTS:
stage: test stage: test
script: script:
- npmci npm prepare
- npmci node install lts - npmci node install lts
- npmci npm install - npmci npm install
- npmci npm test - npmci npm test
@ -62,6 +53,7 @@ testLTS:
testSTABLE: testSTABLE:
stage: test stage: test
script: script:
- npmci npm prepare
- npmci node install stable - npmci node install stable
- npmci npm install - npmci npm install
- npmci npm test - npmci npm test
@ -118,6 +110,7 @@ pages:
stage: metadata stage: metadata
script: script:
- npmci command npm install -g typedoc typescript - npmci command npm install -g typedoc typescript
- npmci npm prepare
- npmci npm install - npmci npm install
- npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/ - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
tags: tags:
@ -130,13 +123,3 @@ pages:
paths: paths:
- public - public
allow_failure: true allow_failure: true
windowsCompatibility:
image: stefanscherer/node-windows:10-build-tools
stage: metadata
script:
- npm install & npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- windows
allow_failure: true

View File

@ -1,4 +1,4 @@
export type TExecutor = "sh" | "bash"; export type TExecutor = 'sh' | 'bash';
export interface IShellEnvContructorOptions { export interface IShellEnvContructorOptions {
executor: TExecutor; executor: TExecutor;
@ -19,9 +19,7 @@ export class ShellEnv {
// add sourcefiles // add sourcefiles
if (optionsArg.sourceFilePaths) { if (optionsArg.sourceFilePaths) {
this.sourceFileArray = this.sourceFileArray.concat( this.sourceFileArray = this.sourceFileArray.concat(optionsArg.sourceFilePaths);
optionsArg.sourceFilePaths
);
} }
// add pathDirectories // add pathDirectories
@ -39,9 +37,7 @@ export class ShellEnv {
if (process.env.SMARTSHELL_PATH) { if (process.env.SMARTSHELL_PATH) {
commandPath = `${commandPath}:${process.env.SMARTSHELL_PATH}`; commandPath = `${commandPath}:${process.env.SMARTSHELL_PATH}`;
} }
commandResult = `PATH=${ commandResult = `PATH=${commandPath} && ${commandStringArg}`;
commandPath
} && ${commandStringArg}`;
return commandResult; return commandResult;
} }
@ -63,9 +59,9 @@ export class ShellEnv {
} }
createEnvExecString(commandArg): string { createEnvExecString(commandArg): string {
let commandResult = '' let commandResult = '';
if (this.executor === "bash") { if (this.executor === 'bash') {
let sourceString = ""; let sourceString = '';
for (let sourceFilePath of this.sourceFileArray) { for (let sourceFilePath of this.sourceFileArray) {
sourceString = sourceString + `source ${sourceFilePath} && `; sourceString = sourceString + `source ${sourceFilePath} && `;
} }

View File

@ -30,7 +30,7 @@ export class Smartshell {
constructor(optionsArg: IShellEnvContructorOptions) { constructor(optionsArg: IShellEnvContructorOptions) {
this.shellEnv = new ShellEnv(optionsArg); this.shellEnv = new ShellEnv(optionsArg);
}; }
/** /**
* executes a given command async * executes a given command async

View File

@ -4,7 +4,14 @@
"semicolon": [true, "always"], "semicolon": [true, "always"],
"no-console": false, "no-console": false,
"ordered-imports": false, "ordered-imports": false,
"object-literal-sort-keys": false "object-literal-sort-keys": false,
"member-ordering": {
"options":{
"order": [
"static-method"
]
}
}
}, },
"defaultSeverity": "warning" "defaultSeverity": "warning"
} }