3.0.4

npmextra.json

@@ -8,10 +8,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartshell",
       "description": "shell actions designed as promises",
-      "npmPackagename": "@pushrocks/smartshell",
+      "npmPackagename": "@push.rocks/smartshell",
       "license": "MIT"
     }
   }

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@pushrocks/smartshell",
+  "name": "@push.rocks/smartshell",
   "private": false,
-  "version": "3.0.0",
+  "version": "3.0.4",
   "description": "shell actions designed as promises",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -26,19 +26,19 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartshell#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.66",
+    "@git.zone/tsbuild": "^2.1.66",
-    "@gitzone/tsrun": "^1.2.42",
+    "@git.zone/tsrun": "^1.2.44",
-    "@gitzone/tstest": "^1.0.74",
+    "@git.zone/tstest": "^1.0.77",
-    "@pushrocks/tapbundle": "^5.0.4",
+    "@push.rocks/tapbundle": "^5.0.8",
-    "@types/node": "^20.3.1"
+    "@types/node": "^20.11.28"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^3.0.1",
+    "@push.rocks/smartdelay": "^3.0.1",
-    "@pushrocks/smartexit": "^1.0.20",
+    "@push.rocks/smartexit": "^1.0.20",
-    "@pushrocks/smartpromise": "^4.0.2",
+    "@push.rocks/smartpromise": "^4.0.2",
-    "@types/which": "^3.0.0",
+    "@types/which": "^3.0.3",
     "tree-kill": "^1.2.2",
-    "which": "^3.0.1"
+    "which": "^4.0.0"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -1,8 +1,8 @@
-# @pushrocks/smartshell
+# @push.rocks/smartshell
 shell actions designed as promises
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartshell)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartshell)
 * [gitlab.com (source)](https://gitlab.com/pushrocks/smartshell)
 * [github.com (source mirror)](https://github.com/pushrocks/smartshell)
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartshell/)
@@ -13,14 +13,14 @@ Status Category | Status Badge
 -- | --
 GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartshell/badges/master/pipeline.svg)](https://lossless.cloud)
 GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartshell/badges/master/coverage.svg)](https://lossless.cloud)
-npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartshell)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartshell)](https://lossless.cloud)
 Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartshell)](https://lossless.cloud)
 TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
 node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
-PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartshell)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartshell)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartshell)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartshell)](https://lossless.cloud)
-BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartshell)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartshell)](https://lossless.cloud)
 
 ## Usage
 

test/test.ts

@@ -1,7 +1,7 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 
 import * as smartshell from '../ts/index.js';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartpromise from '@push.rocks/smartpromise';
 
 let testSmartshell: smartshell.Smartshell;
 
@@ -15,12 +15,12 @@ tap.test('smartshell should create a Smartshell instance', async () => {
 
 tap.test('smartshell should run async', async () => {
   let execResult = await testSmartshell.exec('npm -v');
-  // expect(execResult.stdout).toMatch(/[0-9\.]*/);
+  expect(execResult.stdout).toMatch(/[0-9\.]*/);
 });
 
 tap.test('smartshell should run async and silent', async () => {
   let execResult = await testSmartshell.execSilent('npm -v');
-  // expect(execResult.stdout).toMatch(/[0-9\.]*/);
+  expect(execResult.stdout).toMatch(/[0-9\.]*/);
 });
 
 tap.test('smartshell should stream a shell execution', async () => {
@@ -30,7 +30,7 @@ tap.test('smartshell should stream a shell execution', async () => {
     done.resolve(data);
   });
   let data = await done.promise;
-  // expect(data).toMatch(/[0-9\.]*/);
+  expect(data).toMatch(/[0-9\.]*/);
   await execStreamingResponse.finalPromise;
 });
 
@@ -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/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/smartshell',
+  name: '@push.rocks/smartshell',
-  version: '3.0.0',
+  version: '3.0.4',
   description: 'shell actions designed as promises'
 }

ts/smartshell.classes.smartshell.ts

@@ -30,43 +30,34 @@ export class Smartshell {
    * executes a given command async
    */
   private async _exec(options: {
-    commandString: string,
+    commandString: string;
-    silent?: boolean,
+    silent?: boolean;
-    strict?: boolean,
+    strict?: boolean;
-    streaming?: boolean,
+    streaming?: boolean;
-    interactive?: boolean
+    interactive?: boolean;
   }): Promise<IExecResult | IExecResultStreaming | void> {
-
     if (options.interactive) {
       if (process.env.CI) {
         return;
       }
 
       const done = plugins.smartpromise.defer();
-      const shell = cp.spawn('sh', [], { stdio: 'pipe' });
-      this.smartexit.addProcess(shell);
       
-      const stdInStream = process.stdin.pipe(shell.stdin);
+      // Notice that stdio is set to 'inherit'
-      const stdOutStream = shell.stdout.pipe(process.stdout);
+      const shell = cp.spawn(options.commandString, {
+        stdio: 'inherit',
+        shell: true,
+        detached: true
+      });
+
+      this.smartexit.addProcess(shell);
 
       shell.on('close', (code) => {
         console.log(`interactive shell terminated with code ${code}`);
-        stdInStream.removeAllListeners();
+        this.smartexit.removeProcess(shell);
-        stdInStream.uncork();
-        stdOutStream.removeAllListeners();
-        stdOutStream.unpipe();
-        shell.kill('SIGTERM');
-        process.stdin.pause();
         done.resolve();
       });
 
-      let commandString = options.commandString;
-      if (process.env.CI) {
-        commandString += ' && exit';
-      }
-      commandString += '\n';
-
-      shell.stdin.write(commandString);
       await done.promise;
 
       return;
@@ -153,19 +144,30 @@ export class Smartshell {
     return (await this._exec({ commandString, silent: true, strict: true })) as IExecResult;
   }
 
-  public async execStreaming(commandString: string, silent: boolean = false): Promise<IExecResultStreaming> {
+  public async execStreaming(
+    commandString: string,
+    silent: boolean = false
+  ): Promise<IExecResultStreaming> {
     return (await this._exec({ commandString, silent, streaming: true })) as IExecResultStreaming;
   }
 
   public async execStreamingSilent(commandString: string): Promise<IExecResultStreaming> {
-    return (await this._exec({ commandString, silent: true, streaming: true })) as IExecResultStreaming;
+    return (await this._exec({
+      commandString,
+      silent: true,
+      streaming: true,
+    })) as IExecResultStreaming;
   }
 
   public async execInteractive(commandString: string) {
     await this._exec({ commandString, interactive: true });
   }
 
-  public async execAndWaitForLine(commandString: string, regexArg: RegExp, silentArg: boolean = false) {
+  public async execAndWaitForLine(
+    commandString: string,
+    regexArg: RegExp,
+    silentArg: boolean = false
+  ) {
     let done = plugins.smartpromise.defer();
     let execStreamingResult = await this.execStreaming(commandString, silentArg);
     execStreamingResult.childProcess.stdout.on('data', (stdOutChunk: string) => {

ts/smartshell.plugins.ts

@@ -1,6 +1,6 @@
-import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartdelay from '@push.rocks/smartdelay';
-import * as smartexit from '@pushrocks/smartexit';
+import * as smartexit from '@push.rocks/smartexit';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartpromise from '@push.rocks/smartpromise';
 import which from 'which';
 
 export { smartdelay, smartexit, smartpromise, which };

tsconfig.json

@@ -3,9 +3,12 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
+    "module": "NodeNext",
-    "moduleResolution": "nodenext",
+    "moduleResolution": "NodeNext",
     "esModuleInterop": true,
-    "verbatimModuleSyntax": true,
+    "verbatimModuleSyntax": true
-  }
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }