4.0.4

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@pushrocks/smartcli",
-  "version": "4.0.1",
+  "version": "4.0.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartcli",
-      "version": "4.0.1",
+      "version": "4.0.4",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/lik": "^6.0.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pushrocks/smartcli",
   "private": false,
-  "version": "4.0.1",
+  "version": "4.0.4",
   "description": "easy observable cli tasks",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",

test/test.ts

@@ -3,41 +3,40 @@ import { Subject } from 'rxjs';
 
 import * as smartcli from '../ts/index.js';
 
-let smartCliTestObject: smartcli.Smartcli;
-
 tap.test('should create a new Smartcli', async () => {
-  smartCliTestObject = new smartcli.Smartcli();
+  const smartCliTestObject = new smartcli.Smartcli();
   expect(smartCliTestObject).toBeInstanceOf(smartcli.Smartcli);
 });
 
-tap.test('should add an command', async () => {
+tap.test('should add an command', async (toolsArg) => {
-  expect(smartCliTestObject.addCommand('awesome')).toBeInstanceOf(Subject);
+  const done = toolsArg.defer();
+  const smartCliTestObject = new smartcli.Smartcli();
+  const awesomeCommandSubject = smartCliTestObject.addCommand('awesome')
+  expect(awesomeCommandSubject).toBeInstanceOf(Subject);
+  awesomeCommandSubject.subscribe(() => {
+    done.resolve();
+  });
+  console.log(process.argv);
+  process.argv.splice(2, 0, 'awesome');
+  console.log(process.argv);
+  smartCliTestObject.startParse();
+  await done.promise;
 });
 
 tap.test('should start parsing a standardTask', async () => {
+  const smartCliTestObject = new smartcli.Smartcli();
   expect(smartCliTestObject.standardCommand()).toBeInstanceOf(Subject);
 });
 
 let hasExecuted: boolean = false;
 
 tap.test('should accept a command', async () => {
+  const smartCliTestObject = new smartcli.Smartcli();
   smartCliTestObject.addCommand('triggerme').subscribe(() => {
     hasExecuted = true;
   });
-});
-
-tap.test('should not have executed yet', async () => {
-  expect(hasExecuted).toBeFalse();
-});
-
-tap.test('should execute when triggered', async () => {
   smartCliTestObject.triggerCommand('triggerme', {});
   expect(hasExecuted).toBeTrue();
 });
 
-tap.test('should start parsing the CLI input', async () => {
-  smartCliTestObject.startParse();
-  expect(smartCliTestObject.parseCompleted.promise).toBeInstanceOf(Promise);
-});
-
 tap.start();

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/smartcli',
-  version: '4.0.1',
+  version: '4.0.4',
   description: 'easy observable cli tasks'
 }

ts/smartcli.classes.smartcli.ts

@@ -18,7 +18,6 @@ export class Smartcli {
   public parseCompleted = plugins.smartpromise.defer<any>();
 
   public version: string;
-  private checkForEnvCliCall = true;
 
   /**
    * map of all Trigger/Observable objects to keep track
@@ -35,13 +34,6 @@ export class Smartcli {
    */
   constructor() {}
 
-  /**
-   * halts any execution of commands if (process.env.CLI_CALL === false)
-   */
-  disableEnvCliCall() {
-    this.checkForEnvCliCall = false;
-  }
-
   /**
    * adds an alias, meaning one equals the other in terms of command execution.
    */
@@ -103,12 +95,6 @@ export class Smartcli {
    */
   public addVersion(versionArg: string) {
     this.version = versionArg;
-    this.addCommandAlias('v', 'version');
-    this.parseCompleted.promise.then((argv) => {
-      if (argv.v) {
-        console.log(this.version);
-      }
-    });
   }
 
   /**
@@ -123,19 +109,12 @@ export class Smartcli {
    * start the process of evaluating commands
    */
   public startParse(): void {
-    // if we check for cli env calls, we might want to abort here.
-    if (!process.env.CLI_CALL && this.checkForEnvCliCall) {
-      console.log(
-        `note: @pushrocks/smartcli: You called .startParse() on a SmartCli instance. However process.env.CLI_CALL being absent prevented parsing.`
-      );
-      return;
-    }
     const parsedYArgs = plugins.yargsParser(process.argv);
 
     // lets handle commands
     let counter = 0;
     let foundCommand = false;
-    parsedYArgs._.map((commandPartArg) => {
+    parsedYArgs._ = parsedYArgs._.filter((commandPartArg) => {
       counter++;
       if (typeof commandPartArg === 'number') {
         return true;
@@ -148,8 +127,16 @@ export class Smartcli {
         return true;
       }
     });
+    const wantedCommand = parsedYArgs._[0];
+
+    // lets handle some standards
+    if (!wantedCommand && (parsedYArgs.v || parsedYArgs.version)) {
+      console.log(this.version || 'unknown version');
+      return;
+    }
+
     for (const command of this.commandObservableMap.getArray()) {
-      if (!parsedYArgs._[0]) {
+      if (!wantedCommand) {
         const standardCommand = this.commandObservableMap.findSync((commandArg) => {
           return commandArg.commandName === 'standardCommand';
         });
@@ -160,6 +147,7 @@ export class Smartcli {
         }
         break;
       }
+      console.log(`Wanted command: ${wantedCommand}`);
       if (command.commandName === parsedYArgs._[0]) {
         command.subject.next(parsedYArgs);
         break;