2.0.26

.gitlab-ci.yml

@@ -1,5 +1,5 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -38,19 +38,7 @@ snyk:
 # test stage
 # ====================
 
-testLTS:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+testStable:
   stage: test
   script:
   - npmci npm prepare
@@ -60,12 +48,24 @@ testSTABLE:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
   - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -78,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
@@ -106,7 +98,9 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:stable-dind
   stage: metadata
   script:
     - npmci command npm install -g @gitzone/tsdoc

README.md

@@ -23,6 +23,6 @@ Use TypeScript for best in class instellisense.
 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)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartshell",
-  "version": "2.0.24",
+  "version": "2.0.26",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1416,6 +1416,11 @@
       "resolved": "https://verdaccio.lossless.one/symbol-tree/-/symbol-tree-3.2.2.tgz",
       "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
     },
+    "tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://verdaccio.lossless.one/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="
+    },
     "ts-node": {
       "version": "8.3.0",
       "resolved": "https://verdaccio.lossless.one/ts-node/-/ts-node-8.3.0.tgz",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pushrocks/smartshell",
   "private": false,
-  "version": "2.0.24",
+  "version": "2.0.26",
   "description": "shell actions designed as promises",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -37,6 +37,18 @@
     "@pushrocks/smartexit": "^1.0.15",
     "@pushrocks/smartpromise": "^3.0.2",
     "@types/which": "^1.3.1",
+    "tree-kill": "^1.2.2",
     "which": "^1.3.1"
-  }
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

test/test.ts

@@ -49,7 +49,7 @@ tap.test('should be able to find git', async () => {
 });
 
 tap.test('should spawn an interactive cli', async () => {
-  await testSmartshell.execInteractive('echo "hi"');
+  // await testSmartshell.execInteractive('echo "hi"');
 });
 
 tap.start({

ts/smartshell.classes.smartshell.ts

@@ -53,18 +53,18 @@ export class Smartshell {
     const execChildProcess = cp.spawn(commandToExecute, [], {
       shell: true,
       env: process.env,
-      detached: false
+      detached: false,
     });
 
     this.smartexit.addProcess(execChildProcess);
 
-    execChildProcess.stdout.on('data', data => {
+    execChildProcess.stdout.on('data', (data) => {
       if (!silentArg) {
         spawnlogInstance.writeToConsole(data);
       }
       spawnlogInstance.addToBuffer(data);
     });
-    execChildProcess.stderr.on('data', data => {
+    execChildProcess.stderr.on('data', (data) => {
       if (!silentArg) {
         spawnlogInstance.writeToConsole(data);
       }
@@ -77,8 +77,9 @@ export class Smartshell {
         finalPromise: childProcessEnded.promise,
         kill: () => {
           // this notation with the - kills the whole process group
-          process.kill(-execChildProcess.pid);
-        }
+          console.log(`running tree kill on process ${execChildProcess.pid}`);
+          plugins.treeKill(execChildProcess.pid);
+        },
       });
     }
 
@@ -90,7 +91,7 @@ export class Smartshell {
 
       const execResult = {
         exitCode: code,
-        stdout: spawnlogInstance.logStore.toString()
+        stdout: spawnlogInstance.logStore.toString(),
       };
 
       if (!streamingArg) {
@@ -122,7 +123,7 @@ export class Smartshell {
     return (await this._exec(commandStringArg, false, true)) as IExecResult;
   }
 
-  public async execStrictSilent (commandStringArg: string): Promise<IExecResult> {
+  public async execStrictSilent(commandStringArg: string): Promise<IExecResult> {
     return (await this._exec(commandStringArg, true, true)) as IExecResult;
   }
 
@@ -179,7 +180,7 @@ export class Smartshell {
     const shellLog = new ShellLog();
     const stdInStream = process.stdin.pipe(shell.stdin);
     const stdOutStream = shell.stdout.pipe(process.stdout);
-    shell.on('close', code => {
+    shell.on('close', (code) => {
       console.log(`interactive shell terminated with code ${code}`);
       stdInStream.removeAllListeners();
       stdInStream.uncork();

ts/smartshell.plugins.ts

@@ -4,3 +4,8 @@ import * as smartpromise from '@pushrocks/smartpromise';
 import * as which from 'which';
 
 export { smartdelay, smartexit, smartpromise, which };
+
+// third party
+import treeKill from 'tree-kill';
+
+export { treeKill };