3.0.9

fix(core): update
3.0.8
2019-10-11 21:56:11 +02:00 · 2019-10-11 21:56:11 +02:00 · 2019-10-02 12:50:14 +02:00 · 2019-10-02 12:50:14 +02:00 · 2019-09-10 18:23:53 +02:00 · 2019-09-10 18:23:53 +02:00
21 changed files with 678 additions and 899 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,22 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
 public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom
--- a/.gitlab-ci.yml
+++ b/.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:
@ -34,48 +34,11 @@ snyk:
  - docker
  - notpriv

-sast:
-  stage: security
-  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command npm run build
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
-        --volume "$PWD:/code"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
-  artifacts:
-    reports:
-      sast: gl-sast-report.json
-  tags:
-  - docker
-  - priv
-
 # ====================
 # 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
@ -85,6 +48,18 @@ testSTABLE:
  coverage: /\d+.?\d+?\%\s*coverage/
  tags:
  - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
  - notpriv

 release:
@ -103,19 +78,12 @@ 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 prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
  tags:
  - docker
  - priv
@ -131,13 +99,15 @@ 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 typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
    - npmci npm prepare
    - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
  tags:
    - docker
    - notpriv
--- a/.snyk
+++ b/.snyk
@ -0,0 +1,23 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.5
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-JSYAML-173999:
+    - '@pushrocks/smartfm > gray-matter > js-yaml':
+        reason: None given
+        expires: '2019-10-10T16:23:38.993Z'
+    - '@pushrocks/smartyaml > js-yaml':
+        reason: None given
+        expires: '2019-10-10T16:23:38.993Z'
+  SNYK-JS-JSYAML-174129:
+    - '@pushrocks/smartfm > gray-matter > js-yaml':
+        reason: None given
+        expires: '2019-10-10T16:23:38.993Z'
+    - '@pushrocks/smartyaml > js-yaml':
+        reason: None given
+        expires: '2019-10-10T16:23:38.993Z'
+  SNYK-JS-LODASH-450202:
+    - '@pushrocks/smartinteract > inquirer > lodash':
+        reason: None given
+        expires: '2019-10-10T16:23:38.993Z'
+patch: {}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,20 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone"
+          }
+        }
+      }
+    }
+  ]
+}
--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@ -1 +0,0 @@
-export * from './smartscaf.classes.smartscaf';
--- a/dist/index.js
+++ b/dist/index.js
@ -1,7 +0,0 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./smartscaf.classes.smartscaf"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLG1EQUE4QyJ9
--- a/dist/smartscaf.classes.smartscaf.d.ts
+++ b/dist/smartscaf.classes.smartscaf.d.ts
@ -1,74 +0,0 @@
-import { Smartfile } from '@pushrocks/smartfile';
-export interface ScafTemplateContructorOptions {
-    name?: string;
-    description?: string;
-    sourceDir?: string;
-}
-export declare class ScafTemplate {
-    static createTemplateFromDir(): Promise<void>;
-    /**
-     * the name of the template
-     */
-    name: string;
-    /**
-     * the descriptions of the template
-     */
-    description: string;
-    /**
-     * the location on disk of the template
-     */
-    dirPath: string;
-    /**
-     * the files of the template as array of Smartfiles
-     */
-    templateSmartfileArray: Smartfile[];
-    requiredVariables: string[];
-    defaultVariables: any;
-    suppliedVariables: any;
-    missingVariables: string[];
-    constructor(dirPathArg: string);
-    /**
-     * read a template from a directory
-     */
-    readTemplateFromDir(): Promise<void>;
-    /**
-     * supply the variables to render the teplate with
-     * @param variablesArg gets merged with this.suppliedVariables
-     */
-    supplyVariables(variablesArg: any): Promise<void>;
-    /**
-     * Will ask for the missing variables by cli interaction
-     */
-    askCliForMissingVariables(): Promise<void>;
-    /**
-     * writes a file to disk
-     * @param destinationDirArg
-     */
-    writeToDisk(destinationDirArg: any): Promise<void>;
-    /**
-     * finds all variables in a Template in as string
-     * e.g. myobject.someKey and myobject.someOtherKey
-     */
-    private _findVariablesInTemplate;
-    /**
-     * checks if supplied Variables satisfy the template
-     */
-    private _checkSuppliedVariables;
-    /**
-     * checks the smartscaf.yml default values at the root of a template
-     * allows 2 ways of notation in YAML:
-     * >> myObject.myKey.someDeeperKey: someValue
-     * >> myObject.yourKey.yourDeeperKey: yourValue
-     * or
-     * >> myObject:
-     * >>   - someKey:
-     * >>     - someDeeperKey: someValue
-     * >>   - yourKey:
-     * >>     - yourDeeperKey: yourValue
-     */
-    private _checkDefaultVariables;
-    /**
-     * resolve template dependencies
-     */
-    private _resolveTemplateDependencies;
-}
--- a/dist/smartscaf.classes.smartscaf.js
+++ b/dist/smartscaf.classes.smartscaf.js
--- a/dist/smartscaf.helpers.d.ts
+++ b/dist/smartscaf.helpers.d.ts
@ -1,4 +0,0 @@
-/**
- * adds a variable in string dot notation to an already more or less expanded object
- */
-export declare let deepAddToObject: (objectArg: any, varStringArg: string, valueArg: string) => Promise<void>;
--- a/dist/smartscaf.helpers.js
+++ b/dist/smartscaf.helpers.js
@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * adds a variable in string dot notation to an already more or less expanded object
- */
-exports.deepAddToObject = async (objectArg, varStringArg, valueArg) => {
-    let varNamesArray = varStringArg.split('.');
-    let referencePointer = objectArg;
-    for (let i = 0; i !== varNamesArray.length; i++) {
-        let varName = varNamesArray[i];
-        // is there a next variable ?
-        let varNameNext = (() => {
-            if (varNamesArray[i + 1]) {
-                return varNamesArray[i + 1];
-            }
-            return null;
-        })();
-        // build the tree in suppliedVariables
-        if (!referencePointer[varName] && !varNameNext) {
-            referencePointer[varName] = valueArg;
-            referencePointer = null;
-        }
-        else if (!referencePointer[varName] && varNameNext) {
-            referencePointer[varName] = {};
-            referencePointer = referencePointer[varName];
-        }
-        else if (referencePointer[varName] && varNameNext) {
-            referencePointer = referencePointer[varName];
-        }
-        else {
-            throw new Error('Something is strange!');
-        }
-    }
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLmhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBOztHQUVHO0FBQ1EsUUFBQSxlQUFlLEdBQUcsS0FBSyxFQUFFLFNBQVMsRUFBRSxZQUFvQixFQUFFLFFBQWdCLEVBQUUsRUFBRTtJQUN2RixJQUFJLGFBQWEsR0FBRyxZQUFZLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzVDLElBQUksZ0JBQWdCLEdBQUcsU0FBUyxDQUFDO0lBQ2pDLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsS0FBSyxhQUFhLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFO1FBQy9DLElBQUksT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUUvQiw2QkFBNkI7UUFDN0IsSUFBSSxXQUFXLEdBQVcsQ0FBQyxHQUFHLEVBQUU7WUFDOUIsSUFBSSxhQUFhLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFO2dCQUN4QixPQUFPLGFBQWEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7YUFDN0I7WUFDRCxPQUFPLElBQUksQ0FBQztRQUNkLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFFTCxzQ0FBc0M7UUFDdEMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFO1lBQzlDLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLFFBQVEsQ0FBQztZQUNyQyxnQkFBZ0IsR0FBRyxJQUFJLENBQUM7U0FDekI7YUFBTSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksV0FBVyxFQUFFO1lBQ3BELGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUMvQixnQkFBZ0IsR0FBRyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztTQUM5QzthQUFNLElBQUksZ0JBQWdCLENBQUMsT0FBTyxDQUFDLElBQUksV0FBVyxFQUFFO1lBQ25ELGdCQUFnQixHQUFHLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1NBQzlDO2FBQU07WUFDTCxNQUFNLElBQUksS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUM7U0FDMUM7S0FDRjtBQUNILENBQUMsQ0FBQyJ9
--- a/dist/smartscaf.plugins.d.ts
+++ b/dist/smartscaf.plugins.d.ts
@ -1,9 +0,0 @@
-import * as path from 'path';
-import * as lik from '@pushrocks/lik';
-import * as smartfile from '@pushrocks/smartfile';
-import * as smartfm from '@pushrocks/smartfm';
-import * as smarthbs from '@pushrocks/smarthbs';
-import * as smartinteract from '@pushrocks/smartinteract';
-import * as smartq from '@pushrocks/smartpromise';
-import * as smartyaml from '@pushrocks/smartyaml';
-export { path, lik, smartfile, smartfm, smarthbs, smartinteract, smartq, smartyaml };
--- a/dist/smartscaf.plugins.js
+++ b/dist/smartscaf.plugins.js
@ -1,26 +0,0 @@
-"use strict";
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path = __importStar(require("path"));
-exports.path = path;
-const lik = __importStar(require("@pushrocks/lik"));
-exports.lik = lik;
-const smartfile = __importStar(require("@pushrocks/smartfile"));
-exports.smartfile = smartfile;
-const smartfm = __importStar(require("@pushrocks/smartfm"));
-exports.smartfm = smartfm;
-const smarthbs = __importStar(require("@pushrocks/smarthbs"));
-exports.smarthbs = smarthbs;
-const smartinteract = __importStar(require("@pushrocks/smartinteract"));
-exports.smartinteract = smartinteract;
-const smartq = __importStar(require("@pushrocks/smartpromise"));
-exports.smartq = smartq;
-const smartyaml = __importStar(require("@pushrocks/smartyaml"));
-exports.smartyaml = smartyaml;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzY2FmLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNjYWYucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSwyQ0FBNkI7QUFTcEIsb0JBQUk7QUFSYixvREFBc0M7QUFRdkIsa0JBQUc7QUFQbEIsZ0VBQWtEO0FBTzlCLDhCQUFTO0FBTjdCLDREQUE4QztBQU1mLDBCQUFPO0FBTHRDLDhEQUFnRDtBQUtSLDRCQUFRO0FBSmhELHdFQUEwRDtBQUlSLHNDQUFhO0FBSC9ELGdFQUFrRDtBQUdlLHdCQUFNO0FBRnZFLGdFQUFrRDtBQUV1Qiw4QkFBUyJ9
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@pushrocks/smartscaf",
-  "version": "3.0.4",
+  "version": "3.0.9",
  "private": false,
  "description": "scaffold projects quickly",
  "main": "dist/index.js",
@ -27,17 +27,31 @@
  "devDependencies": {
    "@gitzone/tsbuild": "^2.1.17",
    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.24",
+    "@gitzone/tstest": "^1.0.28",
    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.4"
+    "@types/node": "^12.7.9",
+    "tslint": "^5.20.0",
+    "tslint-config-prettier": "^1.18.0"
  },
  "dependencies": {
    "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/smartfile": "^7.0.4",
+    "@pushrocks/smartfile": "^7.0.6",
    "@pushrocks/smartfm": "^2.0.4",
-    "@pushrocks/smarthbs": "^2.0.4",
+    "@pushrocks/smarthbs": "^2.0.8",
    "@pushrocks/smartinteract": "^2.0.4",
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartshell": "^2.0.25",
    "@pushrocks/smartyaml": "^2.0.3"
-  }
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }
--- a/readme.md
+++ b/readme.md
@ -14,7 +14,7 @@ scaffold projects quickly
 [![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartscaf/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartscaf)
 [![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)

 ## Usage

@ -30,6 +30,6 @@ For further information read the linked docs at the top of this README.
 For further information read the linked docs at the top of this readme.

 > MIT licensed | **&copy;** [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)
--- a/test/test_template/.smartscaf.yml
+++ b/test/test_template/.smartscaf.yml
@ -8,3 +8,6 @@ defaults:
 dependencies:
  merge:
    - ../test_template_2
+
+runafter:
+  - npm install
--- a/ts/interfaces/index.ts
+++ b/ts/interfaces/index.ts
@ -0,0 +1 @@
+export * from './smartscaf';
--- a/ts/interfaces/smartscaf.ts
+++ b/ts/interfaces/smartscaf.ts
@ -0,0 +1,7 @@
+export interface ISmartscafFile {
+  defaults: {[key:string]: string};
+  dependencies: {
+    merge: string[];
+  };
+  runafter: string[];
+}
--- a/ts/smartscaf.classes.smartscaf.ts
+++ b/ts/smartscaf.classes.smartscaf.ts
@ -1,4 +1,5 @@
 import * as plugins from './smartscaf.plugins';
+import * as interfaces from './interfaces';
 import * as helpers from './smartscaf.helpers';

 // interfaces
@ -11,31 +12,37 @@ export interface ScafTemplateContructorOptions {
 }

 export class ScafTemplate {
-  static async createTemplateFromDir() {}
+  public static async createTemplateFromDir() {}

  /**
   * the name of the template
   */
-  name: string;
+  public name: string;

  /**
   * the descriptions of the template
   */
-  description: string;
+  public description: string;

  /**
   * the location on disk of the template
   */
-  dirPath: string;
+  public dirPath: string;
+  public destinationPath: string;
+
+  /**
+   * smartscafFile
+   */
+  public smartscafFile: interfaces.ISmartscafFile;

  /**
   * the files of the template as array of Smartfiles
   */
-  templateSmartfileArray: Smartfile[];
-  requiredVariables: string[];
-  defaultVariables: any;
-  suppliedVariables: any = {};
-  missingVariables: string[] = [];
+  public templateSmartfileArray: Smartfile[];
+  public requiredVariables: string[];
+  public defaultVariables: any;
+  public suppliedVariables: any = {};
+  public missingVariables: string[] = [];

  constructor(dirPathArg: string) {
    this.dirPath = plugins.path.resolve(dirPathArg);
@ -44,8 +51,30 @@ export class ScafTemplate {
  /**
   * read a template from a directory
   */
-  async readTemplateFromDir() {
+  public async readTemplateFromDir() {
    this.templateSmartfileArray = await plugins.smartfile.fs.fileTreeToObject(this.dirPath, '**/*');
+
+    // read .smartscaf.yml file
+    let smartscafFile: interfaces.ISmartscafFile = {
+      defaults: {},
+      dependencies: {
+        merge: []
+      },
+      runafter: []
+    };
+
+    const smartscafSmartfile = this.templateSmartfileArray.find(smartfileArg => {
+      return smartfileArg.parsedPath.base === '.smartscaf.yml';
+    });
+
+    if (smartscafSmartfile) {
+      smartscafFile = {
+        ...smartscafFile,
+        ...await plugins.smartyaml.yamlStringToObject(smartscafSmartfile.contentBuffer.toString())
+      };
+    }
+    this.smartscafFile = smartscafFile;
+
    await this._resolveTemplateDependencies();
    await this._findVariablesInTemplate();
    await this._checkSuppliedVariables();
@ -56,7 +85,7 @@ export class ScafTemplate {
   * supply the variables to render the teplate with
   * @param variablesArg gets merged with this.suppliedVariables
   */
-  async supplyVariables(variablesArg) {
+  public async supplyVariables(variablesArg) {
    this.suppliedVariables = {
      ...this.suppliedVariables,
      ...variablesArg
@ -67,10 +96,10 @@ export class ScafTemplate {
  /**
   * Will ask for the missing variables by cli interaction
   */
-  async askCliForMissingVariables() {
+  public async askCliForMissingVariables() {
    this.missingVariables = await this._checkSuppliedVariables();
-    let localSmartInteract = new plugins.smartinteract.SmartInteract();
-    for (let missingVariable of this.missingVariables) {
+    const localSmartInteract = new plugins.smartinteract.SmartInteract();
+    for (const missingVariable of this.missingVariables) {
      localSmartInteract.addQuestions([
        {
          name: missingVariable,
@ -86,7 +115,7 @@ export class ScafTemplate {
        }
      ]);
    }
-    let answerBucket = await localSmartInteract.runQueue();
+    const answerBucket = await localSmartInteract.runQueue();
    await answerBucket.answerMap.forEach(async answer => {
      await helpers.deepAddToObject(this.suppliedVariables, answer.name, answer.value);
    });
@ -96,23 +125,24 @@ export class ScafTemplate {
   * writes a file to disk
   * @param destinationDirArg
   */
-  async writeToDisk(destinationDirArg) {
+  public async writeToDisk(destinationDirArg) {
+    this.destinationPath = destinationDirArg;
    const smartfileArrayToWrite: Smartfile[] = [];
-    for (let smartfile of this.templateSmartfileArray) {
+    for (const smartfile of this.templateSmartfileArray) {
      // lets filter out template files
      if (smartfile.path === '.smartscaf.yml') {
        continue;
      }

      // render the template
-      let template = await plugins.smarthbs.getTemplateForString(smartfile.contents.toString());
-      let renderedTemplateString = template(this.suppliedVariables);
+      const template = await plugins.smarthbs.getTemplateForString(smartfile.contents.toString());
+      const renderedTemplateString = template(this.suppliedVariables);

      // handle frontmatter
      const smartfmInstance = new plugins.smartfm.Smartfm({
        fmType: 'yaml'
      });
-      let parsedTemplate = smartfmInstance.parse(renderedTemplateString) as any;
+      const parsedTemplate = smartfmInstance.parse(renderedTemplateString) as any;
      if (parsedTemplate.data.fileName) {
        smartfile.updateFileName(parsedTemplate.data.fileName);
      }
@ -122,6 +152,7 @@ export class ScafTemplate {
    }

    await plugins.smartfile.memory.smartfileArrayToFs(smartfileArrayToWrite, destinationDirArg);
+    await this.runScripts();
  }

  /**
@ -130,8 +161,8 @@ export class ScafTemplate {
   */
  private async _findVariablesInTemplate() {
    let templateVariables: string[] = [];
-    for (let templateSmartfile of this.templateSmartfileArray) {
-      let localTemplateVariables = await plugins.smarthbs.findVarsInHbsString(
+    for (const templateSmartfile of this.templateSmartfileArray) {
+      const localTemplateVariables = await plugins.smarthbs.findVarsInHbsString(
        templateSmartfile.contents.toString()
      );
      templateVariables = [...templateVariables, ...localTemplateVariables];
@ -146,8 +177,8 @@ export class ScafTemplate {
   */
  private async _checkSuppliedVariables() {
    let missingVars: string[] = [];
-    for (let templateSmartfile of this.templateSmartfileArray) {
-      let localMissingVars = await plugins.smarthbs.checkVarsSatisfaction(
+    for (const templateSmartfile of this.templateSmartfileArray) {
+      const localMissingVars = await plugins.smarthbs.checkVarsSatisfaction(
        templateSmartfile.contents.toString(),
        this.suppliedVariables
      );
@ -176,7 +207,7 @@ export class ScafTemplate {
   * >>     - yourDeeperKey: yourValue
   */
  private async _checkDefaultVariables() {
-    let smartscafSmartfile = this.templateSmartfileArray.find(smartfileArg => {
+    const smartscafSmartfile = this.templateSmartfileArray.find(smartfileArg => {
      return smartfileArg.parsedPath.base === '.smartscaf.yml';
    });

@ -199,23 +230,8 @@ export class ScafTemplate {
   * resolve template dependencies
   */
  private async _resolveTemplateDependencies() {
-    const smartscafSmartfile = this.templateSmartfileArray.find(smartfileArg => {
-      return smartfileArg.parsedPath.base === '.smartscaf.yml';
-    });
-    if (!smartscafSmartfile) {
-      console.log('No further template dependencies defined!');
-      return;
-    }
-    console.log('Found template dependencies! Resolving them now!');
    console.log('looking at templates to merge!');
-    const smartscafYamlObject = await plugins.smartyaml.yamlStringToObject(
-      smartscafSmartfile.contentBuffer.toString()
-    );
-    if (!smartscafYamlObject) {
-      console.log('Something seems strange about the supplied dependencies.yml file.');
-      return;
-    }
-    for (const dependency of smartscafYamlObject.dependencies.merge) {
+    for (const dependency of this.smartscafFile.dependencies.merge) {
      console.log(`Now resolving ${dependency}`);
      const templatePathToMerge = plugins.path.join(this.dirPath, dependency);
      if (!plugins.smartfile.fs.isDirectory(templatePathToMerge)) {
@ -231,4 +247,16 @@ export class ScafTemplate {
      this.templateSmartfileArray = this.templateSmartfileArray.concat(templateSmartfileArray);
    }
  }
+
+  private async runScripts () {
+    if (!this.destinationPath) {
+      throw new Error('cannot run scripts without an destinationdir');
+    }
+    const smartshellInstance = new plugins.smartshell.Smartshell({
+      executor: 'bash'
+    });
+    for (const command of this.smartscafFile.runafter) {
+      await smartshellInstance.exec(`cd ${this.destinationPath} && ${command}`);
+    }
+  }
 }
--- a/ts/smartscaf.plugins.ts
+++ b/ts/smartscaf.plugins.ts
@ -6,5 +6,6 @@ import * as smarthbs from '@pushrocks/smarthbs';
 import * as smartinteract from '@pushrocks/smartinteract';
 import * as smartq from '@pushrocks/smartpromise';
 import * as smartyaml from '@pushrocks/smartyaml';
+import * as smartshell from '@pushrocks/smartshell';

-export { path, lik, smartfile, smartfm, smarthbs, smartinteract, smartq, smartyaml };
+export { path, lik, smartfile, smartfm, smarthbs, smartinteract, smartq, smartyaml, smartshell };
Author	SHA1	Message	Date
Phil Kunz	088bed779f	3.0.9	2019-10-11 21:56:11 +02:00
Phil Kunz	1cecba6f13	fix(core): update	2019-10-11 21:56:11 +02:00
Phil Kunz	324b93a419	3.0.8	2019-10-02 12:50:14 +02:00
Phil Kunz	4be3fc27b3	fix(core): update	2019-10-02 12:50:14 +02:00
Phil Kunz	655a8a72ff	3.0.7	2019-09-10 18:23:53 +02:00
Phil Kunz	80a77d5f06	fix(core): update	2019-09-10 18:23:53 +02:00
Phil Kunz	6296411b50	3.0.6	2019-09-10 18:18:30 +02:00
Phil Kunz	e7690d4020	fix(core): update	2019-09-10 18:18:30 +02:00
Phil Kunz	b85a29cfc1	3.0.5	2019-09-10 18:03:33 +02:00
Phil Kunz	d559b0f402	fix(core): update	2019-09-10 18:03:33 +02:00
				`@ -1 +0,0 @@`
				`export * from './smartscaf.classes.smartscaf';`