add smart sourcing of files with bash

dist/index.d.ts

@@ -1 +1,2 @@
 export * from './smartshell.wrap';
+export * from './smartshell.classes.smartshell';

dist/index.js

@@ -4,4 +4,5 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./smartshell.wrap"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHVDQUFpQyJ9
+__export(require("./smartshell.classes.smartshell"));
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHVDQUFpQztBQUNqQyxxREFBK0MifQ==

dist/smartshell.classes.smartshell.d.ts

@@ -1,11 +1,23 @@
+import * as smartshellWrap from './smartshell.wrap';
 export declare type TExecutor = 'sh' | 'bash';
 export interface ISmartshellContructorOptions {
     executor: TExecutor;
     sourceFilePaths: string[];
 }
 export declare class Smartshell {
-    sourceFiles: string[];
+    executor: TExecutor;
+    sourceFileArray: string[];
     constructor(optionsArg: ISmartshellContructorOptions);
     addSourceFiles(sourceFilePathsArray: string[]): void;
     cleanSourceFiles(): void;
+    /**
+     * executes silently and returns IExecResult
+     * @param commandArg
+     */
+    execSilent(commandArg: string): Promise<smartshellWrap.IExecResult>;
+    /**
+     * creates the final sourcing string
+     * @param commandArg
+     */
+    private createExecString(commandArg);
 }

dist/smartshell.classes.smartshell.js

@@ -1,20 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const smartshellWrap = require("./smartshell.wrap");
 class Smartshell {
     constructor(optionsArg) {
-        this.sourceFiles = [];
+        this.sourceFileArray = [];
+        this.executor = optionsArg.executor;
         for (let sourceFilePath of optionsArg.sourceFilePaths) {
-            this.sourceFiles.push(sourceFilePath);
+            this.sourceFileArray.push(sourceFilePath);
         }
     }
     addSourceFiles(sourceFilePathsArray) {
         for (let sourceFilePath of sourceFilePathsArray) {
-            this.sourceFiles.push(sourceFilePath);
+            this.sourceFileArray.push(sourceFilePath);
         }
     }
     cleanSourceFiles() {
-        this.sourceFiles = [];
+        this.sourceFileArray = [];
+    }
+    /**
+     * executes silently and returns IExecResult
+     * @param commandArg
+     */
+    execSilent(commandArg) {
+        let execCommand = this.createExecString(commandArg);
+        return smartshellWrap.execSilent(commandArg);
+    }
+    /**
+     * creates the final sourcing string
+     * @param commandArg
+     */
+    createExecString(commandArg) {
+        if (this.executor === 'bash') {
+            let sourceString = '';
+            for (let sourceFilePath of this.sourceFileArray) {
+                sourceString = sourceString + `source ${sourceFilePath} && `;
+            }
+            return `bash -c '${sourceString} ${commandArg}'`;
+        }
+        else {
+            return commandArg;
+        }
     }
 }
 exports.Smartshell = Smartshell;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5jbGFzc2VzLnNtYXJ0c2hlbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNoZWxsLmNsYXNzZXMuc21hcnRzaGVsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVdBO0lBRUUsWUFBYSxVQUF3QztRQURyRCxnQkFBVyxHQUFhLEVBQUUsQ0FBQTtRQUV4QixHQUFHLENBQUMsQ0FBQyxJQUFJLGNBQWMsSUFBSSxVQUFVLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQztZQUN0RCxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQTtRQUN2QyxDQUFDO0lBQ0gsQ0FBQztJQUVELGNBQWMsQ0FBQyxvQkFBOEI7UUFDM0MsR0FBRyxDQUFBLENBQUMsSUFBSSxjQUFjLElBQUksb0JBQW9CLENBQUMsQ0FBQyxDQUFDO1lBQy9DLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBQ3ZDLENBQUM7SUFDSCxDQUFDO0lBRUQsZ0JBQWdCO1FBQ2QsSUFBSSxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUE7SUFDdkIsQ0FBQztDQUNGO0FBakJELGdDQWlCQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzaGVsbC5jbGFzc2VzLnNtYXJ0c2hlbGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNoZWxsLmNsYXNzZXMuc21hcnRzaGVsbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUNBLG9EQUFtRDtBQVVuRDtJQUdFLFlBQWEsVUFBd0M7UUFEckQsb0JBQWUsR0FBYSxFQUFFLENBQUE7UUFFNUIsSUFBSSxDQUFDLFFBQVEsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFBO1FBQ25DLEdBQUcsQ0FBQyxDQUFDLElBQUksY0FBYyxJQUFJLFVBQVUsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO1lBQ3RELElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBQzNDLENBQUM7SUFDSCxDQUFDO0lBRUQsY0FBYyxDQUFDLG9CQUE4QjtRQUMzQyxHQUFHLENBQUEsQ0FBQyxJQUFJLGNBQWMsSUFBSSxvQkFBb0IsQ0FBQyxDQUFDLENBQUM7WUFDL0MsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUE7UUFDM0MsQ0FBQztJQUNILENBQUM7SUFFRCxnQkFBZ0I7UUFDZCxJQUFJLENBQUMsZUFBZSxHQUFHLEVBQUUsQ0FBQTtJQUMzQixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsVUFBVSxDQUFDLFVBQWtCO1FBQzNCLElBQUksV0FBVyxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxVQUFVLENBQUMsQ0FBQTtRQUNuRCxNQUFNLENBQUMsY0FBYyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUM5QyxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ssZ0JBQWdCLENBQUUsVUFBVTtRQUNsQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDN0IsSUFBSSxZQUFZLEdBQUcsRUFBRSxDQUFBO1lBQ3JCLEdBQUcsQ0FBQyxDQUFDLElBQUksY0FBYyxJQUFJLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDO2dCQUNoRCxZQUFZLEdBQUcsWUFBWSxHQUFHLFVBQVUsY0FBYyxNQUFNLENBQUE7WUFDOUQsQ0FBQztZQUNELE1BQU0sQ0FBQyxZQUFZLFlBQVksSUFBSSxVQUFVLEdBQUcsQ0FBQTtRQUNsRCxDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDTixNQUFNLENBQUMsVUFBVSxDQUFBO1FBQ25CLENBQUM7SUFDSCxDQUFDO0NBQ0Y7QUE1Q0QsZ0NBNENDIn0=

test/test.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-test");
 const smartchai_1 = require("smartchai");
 const smartshell = require("../dist/index");
+let testSmartshell;
 describe('smartshell', function () {
     it('it should run async', function () {
         this.timeout(1000000);
@@ -22,5 +23,12 @@ describe('smartshell', function () {
         });
         return execStreamingResponse.finalPromise;
     });
+    it('should create a Smartshell instance', function () {
+        testSmartshell = new smartshell.Smartshell({
+            executor: 'bash',
+            sourceFilePaths: []
+        });
+        smartchai_1.expect(testSmartshell).to.be.instanceof(smartshell.Smartshell);
+    });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3QkFBcUI7QUFDckIseUNBQWtDO0FBRWxDLDRDQUEyQztBQUUzQyxRQUFRLENBQUMsWUFBWSxFQUFFO0lBQ3JCLEVBQUUsQ0FBQyxxQkFBcUIsRUFBRTtRQUN4QixJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQ3JCLE1BQU0sQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLFVBQVU7WUFDL0Msa0JBQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQTtRQUNoRCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0lBQ0YsRUFBRSxDQUFDLDZCQUE2QixFQUFFO1FBQ2hDLE1BQU0sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLFVBQVU7WUFDckQsa0JBQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQTtRQUNoRCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0lBQ0YsRUFBRSxDQUFDLGlDQUFpQyxFQUFFO1FBQ3BDLElBQUkscUJBQXFCLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM5RCxxQkFBcUIsQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxJQUFJO1lBQ3hELE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQyxDQUFBO1FBQ2pDLENBQUMsQ0FBQyxDQUFBO1FBQ0YsTUFBTSxDQUFDLHFCQUFxQixDQUFDLFlBQVksQ0FBQTtJQUMzQyxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx3QkFBcUI7QUFDckIseUNBQWtDO0FBRWxDLDRDQUEyQztBQUUzQyxJQUFJLGNBQXFDLENBQUE7QUFFekMsUUFBUSxDQUFDLFlBQVksRUFBRTtJQUNyQixFQUFFLENBQUMscUJBQXFCLEVBQUU7UUFDeEIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUNyQixNQUFNLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxVQUFVO1lBQy9DLGtCQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUE7UUFDaEQsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyw2QkFBNkIsRUFBRTtRQUNoQyxNQUFNLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxVQUFVO1lBQ3JELGtCQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUE7UUFDaEQsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyxpQ0FBaUMsRUFBRTtRQUNwQyxJQUFJLHFCQUFxQixHQUFHLFVBQVUsQ0FBQyxhQUFhLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDOUQscUJBQXFCLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsSUFBSTtZQUN4RCxPQUFPLENBQUMsR0FBRyxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsQ0FBQTtRQUNqQyxDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxZQUFZLENBQUE7SUFDM0MsQ0FBQyxDQUFDLENBQUE7SUFDRixFQUFFLENBQUMscUNBQXFDLEVBQUU7UUFDeEMsY0FBYyxHQUFHLElBQUksVUFBVSxDQUFDLFVBQVUsQ0FBQztZQUN6QyxRQUFRLEVBQUUsTUFBTTtZQUNoQixlQUFlLEVBQUUsRUFBRTtTQUNwQixDQUFDLENBQUE7UUFDRixrQkFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUNoRSxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQyxDQUFBIn0=

test/test.ts

@@ -3,6 +3,8 @@ import { expect } from 'smartchai'
 
 import * as smartshell from '../dist/index'
 
+let testSmartshell: smartshell.Smartshell
+
 describe('smartshell', function () {
   it('it should run async', function () {
     this.timeout(1000000)
@@ -10,16 +12,23 @@ describe('smartshell', function () {
       expect(execResult.stdout).to.match(/[0-9\.]*/)
     })
   })
-  it('should run async and silent', function() {
+  it('should run async and silent', function () {
     return smartshell.execSilent('npm -v').then((execResult) => {
       expect(execResult.stdout).to.match(/[0-9\.]*/)
     })
   })
-  it('should stream a shell execution', function() {
+  it('should stream a shell execution', function () {
     let execStreamingResponse = smartshell.execStreaming('npm -v')
     execStreamingResponse.childProcess.stdout.on('data', (data) => {
       console.log('Received ' + data)
     })
     return execStreamingResponse.finalPromise
   })
+  it('should create a Smartshell instance', function () {
+    testSmartshell = new smartshell.Smartshell({
+      executor: 'bash',
+      sourceFilePaths: []
+    })
+    expect(testSmartshell).to.be.instanceof(smartshell.Smartshell)
+  })
 })

ts/index.ts

@@ -1 +1,2 @@
 export * from './smartshell.wrap'
+export * from './smartshell.classes.smartshell'

ts/smartshell.classes.smartshell.ts

@@ -10,20 +10,47 @@ export interface ISmartshellContructorOptions {
 }
 
 export class Smartshell {
-  sourceFiles: string[] = []
+  executor: TExecutor
+  sourceFileArray: string[] = []
   constructor (optionsArg: ISmartshellContructorOptions) {
+    this.executor = optionsArg.executor
     for (let sourceFilePath of optionsArg.sourceFilePaths) {
-      this.sourceFiles.push(sourceFilePath)
+      this.sourceFileArray.push(sourceFilePath)
     }
   }
 
   addSourceFiles(sourceFilePathsArray: string[]) {
     for(let sourceFilePath of sourceFilePathsArray) {
-      this.sourceFiles.push(sourceFilePath)
+      this.sourceFileArray.push(sourceFilePath)
     }
   }
 
   cleanSourceFiles () {
-    this.sourceFiles = []
+    this.sourceFileArray = []
   }
-}
+
+  /**
+   * executes silently and returns IExecResult
+   * @param commandArg 
+   */
+  execSilent(commandArg: string) {
+    let execCommand = this.createExecString(commandArg)
+    return smartshellWrap.execSilent(commandArg)
+  }
+
+  /**
+   * creates the final sourcing string
+   * @param commandArg
+   */
+  private createExecString (commandArg): string {
+    if (this.executor === 'bash') {
+      let sourceString = ''
+      for (let sourceFilePath of this.sourceFileArray) {
+        sourceString = sourceString + `source ${sourceFilePath} && `
+      }
+      return `bash -c '${sourceString} ${commandArg}'`
+    } else {
+      return commandArg
+    }
+  }
+}