2.0.2

.gitignore

@@ -1,6 +1,13 @@
 node_modules/
 .settings/
 .idea/
+coverage/
+docs/
+public/
+pages/
 
 ts/*.js
 ts/*.js.map
+ts/typings/
+test/result/
+

.gitlab-ci.yml

@@ -0,0 +1,53 @@
+image: hosttoday/ht-docker-node:npmts
+stages:
+- test
+- release
+- trigger
+- pages
+testLEGACY:
+  stage: test
+  script:
+    - npmci test legacy
+  tags:
+    - docker
+  allow_failure: true
+testLTS:
+  stage: test
+  script:
+    - npmci test lts
+  tags:
+    - docker
+    
+testSTABLE:
+  stage: test
+  script:
+    - npmci test stable
+  tags:
+    - docker
+release:
+  stage: release
+  script:
+    - npmci publish
+  only:
+    - tags
+  tags:
+    - docker
+trigger:
+  stage: trigger
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - docker
+pages:
+  image: hosttoday/ht-docker-node:npmpage
+  stage: pages
+  script:
+    - npmci command npmpage --host gitlab
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public

.npmignore

@@ -0,0 +1,5 @@
+ts/
+test/
+docs/
+coverage/
+node_modules/

.travis.yml

@@ -1,19 +0,0 @@
-language: node_js
-before_install:
-- nvm install stable
-- node -v
-- npm -v
-- npm install -g gulp
-- npm install gulp
-- npm install gulp-typescript
-deploy:
-  provider: npm
-  email: npm@smart-coordination.com
-  api_key:
-    secure: AcM6ooFjEIaWOC84QMxxugV3GtkMEoMI6zxy4oB9u9xihLopVZnm6c8FxIr+Wl2Ykjwj2deOuC7Q7QLtfH8/n4cVj1x7c32DJ21XJsE6uGm2opT7bSMm/NgcIvbkzWdPSyG8OpJEu8l///+YTceLdLV2Tn4lPobZRgu0KIF3Pg0Fo2V/0kSH/gSjlbLBgMBx1QrO2y52VHMdqWs3VwMIv1lEEicUsbnBg1z03I/Ka+JZQPCDYGgHu7y62zgB36mdkNVg8pyvGrrTSWeMVyHc8SSvBoqszVUeXfs4d4tcw0+vPsIJD5hDzAGOtH+3KO2Bgi87UB/Dgd5xw92+zQxhKnKewFiyTvANFXoag5UooPupWKhu5DljZ27CkgLX/N/AF6eTuQR0ffW92Bvz2YWis5JC75+HGFV2tBI7hRinScc00J0vOAqqVpp81PD6BXQDX2y5y77arArJVQTC5irOYL20x3UMBB7fOpTkYV9T2NxzR6OBv4P6MLWPbnmFr+zpjkzBxHeJMOosb+9W6TAbVmouM5SfnFU5bBYh2gF52Yz2FnfpDzclVZW/OI0YcAtIdozbHRcJ1s6pVkPqZIqKcCM+jVhzvt8NTnehSOqjFyIV9rcbsYQplLs8b9ntmcuRLCPatXMGFQM/y9Sjw4is0gHhRMjxQo32bfIiX1CTqVo=
-  on:
-    tags: true
-    repo: pushrocks/gulp-callfunction
-notifications:
-  slack:
-    secure: Bb8P3fboL52CugSsp0RhOkGCeWVbgjb+QDpnMHdSOa0Nequj8V4kvrzBLZOBOjaSB0/gMvdoB4Slv2bls1dAxXW1IX1DdRb3RLMKj/Owje7eTd4IoUuSs49y6/yEkVK+E1wicdwjlMmvsk8fQE/owDRMRXYoXxhN2ZOVSQvAQ3iBO0eokFvWO7yj/VSxKoITymCXA3LfyzXXUuhvxuQd3BPZCe25xa6GWuHtaa5fbJg17pp8jJX6VZYLSRcSYyJxMU8SLdkrOsQZKj0+/Yfpu7XTmPbqxjNapuE7Zm70mi+aB26IQCnmwkdcEQNJVxQOKoP2+/ZnDfcTLQROwH1PJVzol0hneH6DdOlWt9bvBJcUvFRwaDgIb5xXQV8bGsRe5ayE/4MgCgfvdBTvevu6n12fmPx74prIv4pOPMwlALjjP8XavGL4A6amOuV7fJiSyGAku8aUe1rlUXyfoHJswMyOfkIsvnGDE3eEfq1WUIjn8tW1ZozJyoCTAIh6IHPI3Nsg3LkTRvDHPYq25/xCKWxGb2OaJc3JeqVREqm0auDqj6HoVAi/mW/uyvwX9jEVX8fNoQ69ac5VUMFfn2Mx3sU6aHKgZe/tdrtql6NYtIA+g5/ZDnHE1mnbl6MfrYiKwRbrICH5v/u1xK+4+yh09BUqazi3PzOhyTRfba/gRUg=

README.md

@@ -1,25 +1,59 @@
-# gulp-callfunction
+# gulp-function
 accepts call to execute in gulp pipeline.
 
-### build status/Dependencies
-[![Build Status](https://travis-ci.org/pushrocks/gulp-callfunction.svg?branch=v0.0.2)](https://travis-ci.org/pushrocks/gulp-callfunction)
-[![Dependency Status](https://david-dm.org/pushrocks/gulp-callfunction.svg)](https://david-dm.org/pushrocks/gulp-callfunction)
+## Availabililty
+[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/gulp-function)
+[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/gulp-function)
+[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/gulp-function)
+[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/gulp-function/)
+
+## Status for master
+[![build status](https://gitlab.com/pushrocks/gulp-function/badges/master/build.svg)](https://gitlab.com/pushrocks/gulp-function/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/gulp-function/badges/master/coverage.svg)](https://gitlab.com/pushrocks/gulp-function/commits/master)
+[![Dependency Status](https://david-dm.org/pushrocks/gulp-function.svg)](https://david-dm.org/pushrocks/gulp-function)
+[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/gulp-function/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/gulp-function/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/pushrocks/gulp-function/badges/code.svg)](https://www.bithound.io/github/pushrocks/gulp-function)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ### Usage
 ```javascript
-var gulp = require("gulp");
-var gulpCallFunction = require("gulp-callfunction");
+let gulp = require("gulp");
+let gulpFunction = require("gulp-function");
+let Q = require("q");
 
-var myFunction = function () {
+let myFunction = function (file, enc) { // file and enc are optional in case you want to modify the file object
+    let done = Q.defer();
     console.log("Hello World!")
+    
+    // NOTE:
+    // you can use done.resolve as callback function
+    // of any async tasks within this function
+    done.resolve();
+    
+    return done.promise;
 }
 
 gulp.task('gulpTest',function() {
-    gulp.src('./mydir/*.something')
-        .pipe(gulpCallFunction(myFunction,'forEach'))
-        .pipe(gulp.dest("./build/"))
+    let stream = gulp.src('./mydir/*.something')
+        .pipe(gulpFunction(myFunction,'forEach')) //read the notes below
+        .pipe(gulp.dest("./build/"));
+    return stream; // by returning the stream gulp knows when our task has finished.
 });
 ```
 
->Note: The first argument of gulpCallFunction can also be an array of multiple functionnames.  
->Note: the second argument can be empty (defaults to 'forEach') or 'atEnd'
+### Notes:
+
+* The first argument of gulpFunction can also be an **array of multiple functionnames**.
+Each function can return a promise. The pipe stop will finish when every promise is fullfilled.
+When providing an array of functions be careful with modifying the file object -> race condition
+* The second argument can be empty, it defaults to "forEach"
+* The following options are available:
+    * "forFirst" - executes when first chunk/vinylfile of the stream reaches the pipestop.
+       file is pushed further down the line when function's returned promise is fullfilled.
+    *  "forEach" - executes like "forFirst" but with every chunk/vinylfile in the stream;
+    *  "atEnd" - executes after all chunks have passed and are processed in full.
+       That means the stream's "finish" event fires **before "atLast" is executed**!!!
+
+[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)

dist/index.d.ts

@@ -0,0 +1,5 @@
+import 'typings-global';
+export declare type TExecutionMode = 'forEach' | 'forFirst' | 'atEnd';
+export interface IPromiseFunction {
+    (file?: any, enc?: any): PromiseLike<any>;
+}

dist/index.js

@@ -0,0 +1,66 @@
+"use strict";
+require("typings-global");
+const q = require("q");
+const through2 = require("through2");
+module.exports = (functionsToExecuteArg, executionModeArg = 'forEach') => {
+    let promiseArray = [];
+    let runFunction = function (functionArg, file, enc) {
+        let returnValue = functionArg(file, enc);
+        if (typeof returnValue !== 'undefined' && typeof returnValue.then !== 'undefined') {
+            promiseArray.push(returnValue);
+        }
+    };
+    let checkAndRunFunction = function (file, enc) {
+        if (typeof functionsToExecuteArg === 'function') {
+            runFunction(functionsToExecuteArg, file, enc);
+        }
+        else if (Array.isArray(functionsToExecuteArg)) {
+            for (let anyFunction in functionsToExecuteArg) {
+                runFunction(functionsToExecuteArg[anyFunction], file, enc);
+            }
+        }
+        else {
+            throw new Error('gulp-callfunction: something is strange with the given arguments');
+        }
+        return q.all(promiseArray);
+    };
+    let hasExecutedOnce = false;
+    let forEach = function (file, enc, cb) {
+        switch (executionModeArg) {
+            case 'forEach':
+                checkAndRunFunction(file, enc).then(function () {
+                    cb(null, file);
+                });
+                break;
+            case 'forFirst':
+                if (hasExecutedOnce) {
+                    checkAndRunFunction(file, enc)
+                        .then(function () {
+                        cb(null, file);
+                    });
+                }
+                else {
+                    cb(null, file);
+                }
+                hasExecutedOnce = true;
+                break;
+            case 'atEnd':
+                cb(null, file);
+                break;
+            default:
+                break;
+        }
+    };
+    let atEnd = function (cb) {
+        if (executionModeArg === 'atEnd') {
+            checkAndRunFunction(null, null).then(function () {
+                cb();
+            });
+        }
+        else {
+            cb();
+        }
+    };
+    return through2.obj(forEach, atEnd);
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLHVCQUFzQjtBQUN0QixxQ0FBb0M7QUFTcEMsTUFBTSxDQUFDLE9BQU8sR0FBRyxDQUNiLHFCQUE0RCxFQUM1RCxnQkFBZ0IsR0FBbUIsU0FBUztJQUc1QyxJQUFJLFlBQVksR0FBRyxFQUFFLENBQUE7SUFDckIsSUFBSSxXQUFXLEdBQUcsVUFBVSxXQUFXLEVBQUUsSUFBSSxFQUFFLEdBQUc7UUFDOUMsSUFBSSxXQUFXLEdBQUcsV0FBVyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQTtRQUN4QyxFQUFFLENBQUMsQ0FBQyxPQUFPLFdBQVcsS0FBSyxXQUFXLElBQUksT0FBTyxXQUFXLENBQUMsSUFBSSxLQUFLLFdBQVcsQ0FBQyxDQUFDLENBQUM7WUFDaEYsWUFBWSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQTtRQUNsQyxDQUFDO0lBQ0wsQ0FBQyxDQUFBO0lBRUQsSUFBSSxtQkFBbUIsR0FBRyxVQUFVLElBQUksRUFBRSxHQUFHO1FBQ3pDLEVBQUUsQ0FBQyxDQUFDLE9BQU8scUJBQXFCLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQztZQUM5QyxXQUFXLENBQUMscUJBQXFCLEVBQUUsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQ2pELENBQUM7UUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM5QyxHQUFHLENBQUMsQ0FBQyxJQUFJLFdBQVcsSUFBSSxxQkFBcUIsQ0FBQyxDQUFDLENBQUM7Z0JBQzVDLFdBQVcsQ0FBQyxxQkFBcUIsQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLEVBQUUsR0FBRyxDQUFDLENBQUE7WUFDOUQsQ0FBQztRQUNMLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNKLE1BQU0sSUFBSSxLQUFLLENBQUMsa0VBQWtFLENBQUMsQ0FBQTtRQUN2RixDQUFDO1FBQ0QsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUE7SUFDOUIsQ0FBQyxDQUFBO0lBRUQsSUFBSSxlQUFlLEdBQUcsS0FBSyxDQUFBO0lBQzNCLElBQUksT0FBTyxHQUFHLFVBQVUsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ2pDLE1BQU0sQ0FBQyxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQztZQUN2QixLQUFLLFNBQVM7Z0JBQ1YsbUJBQW1CLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQztvQkFDaEMsRUFBRSxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQTtnQkFDbEIsQ0FBQyxDQUFDLENBQUE7Z0JBQ0YsS0FBSyxDQUFBO1lBQ1QsS0FBSyxVQUFVO2dCQUNYLEVBQUUsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxDQUFDLENBQUM7b0JBQ2xCLG1CQUFtQixDQUFDLElBQUksRUFBRSxHQUFHLENBQUM7eUJBQ3pCLElBQUksQ0FBQzt3QkFDRixFQUFFLENBQUMsSUFBSSxFQUFFLElBQUksQ0FBQyxDQUFBO29CQUNsQixDQUFDLENBQUMsQ0FBQTtnQkFDVixDQUFDO2dCQUFDLElBQUksQ0FBQyxDQUFDO29CQUNKLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUE7Z0JBQ2xCLENBQUM7Z0JBQ0QsZUFBZSxHQUFHLElBQUksQ0FBQTtnQkFDdEIsS0FBSyxDQUFBO1lBQ1QsS0FBSyxPQUFPO2dCQUNSLEVBQUUsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUE7Z0JBQ2QsS0FBSyxDQUFBO1lBQ1Q7Z0JBQ0ksS0FBSyxDQUFBO1FBQ2IsQ0FBQztJQUNMLENBQUMsQ0FBQTtJQUVELElBQUksS0FBSyxHQUFHLFVBQVUsRUFBRTtRQUNwQixFQUFFLENBQUMsQ0FBQyxnQkFBZ0IsS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDO1lBQy9CLG1CQUFtQixDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUM7Z0JBQ2pDLEVBQUUsRUFBRSxDQUFBO1lBQ1IsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixFQUFFLEVBQUUsQ0FBQTtRQUNSLENBQUM7SUFDTCxDQUFDLENBQUE7SUFDRCxNQUFNLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUE7QUFDdkMsQ0FBQyxDQUFBIn0=

index.js

@@ -1,47 +0,0 @@
-/// <reference path="typings/tsd.d.ts" />
-var through = require("through2");
-var path = require("path");
-var beautylog = require("beautylog");
-//important vars
-var gulpCallFunction = {
-    executionMode: 'forEach',
-    functionsToExecute: undefined,
-    logBool: false
-};
-var runFunctionNames = function () {
-    if (typeof gulpCallFunction.functionsToExecute == "function") {
-        gulpCallFunction.functionsToExecute();
-    }
-    else if (Array.isArray(gulpCallFunction.functionsToExecute)) {
-        for (var anyFunction in gulpCallFunction.functionsToExecute) {
-            anyFunction();
-        }
-    }
-    else {
-        beautylog.error('gulp-callfunction: something is strange with the given arguments');
-    }
-};
-var forEach = function (file, enc, cb) {
-    if (gulpCallFunction.logBool)
-        beautylog.log(gulpCallFunction.executionMode);
-    if (gulpCallFunction.executionMode === 'forEach') {
-        if (gulpCallFunction.logBool)
-            beautylog.log('is forEach');
-        runFunctionNames();
-    }
-    //tell gulp that we are complete
-    return cb(null, file);
-};
-var atEnd = function () {
-    if (gulpCallFunction.executionMode == "atEnd") {
-        runFunctionNames();
-    }
-};
-module.exports = function (functionsToExecute, executionMode, logBool) {
-    if (executionMode === void 0) { executionMode = 'forEach'; }
-    if (logBool === void 0) { logBool = false; }
-    gulpCallFunction.functionsToExecute = functionsToExecute;
-    gulpCallFunction.executionMode = executionMode;
-    gulpCallFunction.logBool = logBool;
-    return through.obj(forEach, atEnd);
-};

npmextra.json

@@ -0,0 +1,5 @@
+{
+  "npmts": {
+    "mode": "default"
+  }
+}

package.json

@@ -1,35 +1,41 @@
 {
-  "name": "gulp-callfunction",
-  "version": "0.0.4",
+  "name": "gulp-function",
+  "version": "2.0.2",
   "description": "accepts a function call as parameter to execute in gulp pipeline",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(cd ts/compile && node compile.js) && (node test.js)",
+    "test": "(npmts)",
     "reinstall": "(rm -r node_modules && npm install)",
     "release": "(git pull origin master && npm version patch && git push origin master && git checkout release && git merge master && git push origin release && git checkout master)",
     "startdev": "(git checkout master && git pull origin master)"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/pushrocks/gulp-callfunction.git"
+    "url": "https://gitlab.com/pushrocks/gulp-function.git"
   },
   "keywords": [
-    "json",
-    "jade",
-    "template"
+    "gulpplugin",
+    "gulp",
+    "function"
   ],
-  "author": "Smart Coordination GmbH <office@push.rocks> (https://push.rocks)",
+  "author": "Lossless GmbH <office@lossless.com> (https://lossless.com)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/pushrocks/gulp-callfunction/issues"
-  },
-  "homepage": "https://github.com/pushrocks/gulp-callfunction",
-  "devDependencies": {
-    "gulp": "^3.9.0",
-    "gulp-typescript": "^2.9.2"
+    "url": "https://gitlab.com/pushrocks/gulp-function/issues"
   },
+  "homepage": "https://gitlab.com/pushrocks/gulp-function",
   "dependencies": {
-    "beautylog": "0.0.15",
-    "through2": "^2.0.0"
+    "@types/q": "0.0.32",
+    "@types/through2": "^2.0.31",
+    "q": "^1.4.1",
+    "through2": "^2.0.1",
+    "typings-global": "^1.0.14"
+  },
+  "devDependencies": {
+    "beautylog": "^6.0.0",
+    "gulp": "^3.9.1",
+    "npmts-g": "^5.2.8",
+    "typings-test": "^1.0.3"
   }
 }

test.js

@@ -1,12 +0,0 @@
-/// <reference path="typings/tsd.d.ts" />
-var gulp = require("gulp");
-var gulpCallFunction = require("./index.js");
-var myFunction = function () {
-    console.log("Hello World!");
-};
-gulp.task('default', function () {
-    gulp.src('./test/test.md')
-        .pipe(gulpCallFunction(myFunction, 'forEach'))
-        .pipe(gulp.dest("./test/result/"));
-});
-gulp.start.apply(gulp, ['default']);

test/test.d.ts

@@ -0,0 +1 @@
+import "typings-test";

test/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"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"}

test/test.md

@@ -1,2 +0,0 @@
-# Test.md
-This is a test file for the test.js gulp pipeline

test/test.ts

@@ -0,0 +1,118 @@
+import "typings-test"
+var gulp = require("gulp");
+var gulpFunction = require("../dist/index.js");
+var beautylog = require("beautylog");
+var Q = require("q");
+
+var myFunction = function () {
+    var done = Q.defer()
+    beautylog.log("Function executed");
+    done.resolve();
+    return done.promise;
+};
+var myFunction2 = function () {
+    var done = Q.defer();
+    beautylog.ok("Function2 executed");
+    done.resolve();
+    return done.promise;
+};
+var myFunction3 = function () {
+    var done = Q.defer();
+    beautylog.success("Function3 executed");
+    done.resolve();
+    return done.promise;
+};
+
+var beforeFunction = function () {
+    var done = Q.defer();
+    beautylog.success("beforeFunction executed");
+    done.resolve();
+    return done.promise;
+};
+
+var middleFunctionRun = false;
+
+var middleFunction = function () {
+    var done = Q.defer();
+    beautylog.success("middleFunction executed");
+    setTimeout(function(){
+        beautylog.log("timeout fired");
+        middleFunctionRun = true;
+        done.resolve();
+    }, 500);
+    return done.promise;
+};
+
+var afterFunction = function () {
+    var done = Q.defer();
+    beautylog.success("afterFunction executed");
+    done.resolve();
+    return done.promise;
+};
+
+let timeoutFunction = function(){
+    var done = Q.defer();
+    setTimeout(function(){
+        beautylog.log("largeTimeout fired");
+        done.resolve();
+    },2000);
+    return done.promise;
+};
+
+
+
+describe("gulpFunction",function(){
+    it("should run through smoothly with " + "'forEach'".blue,function(done){
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction(myFunction,'forEach'))
+            .pipe(gulp.dest("./test/result/"));
+
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction([myFunction2,myFunction3],'forEach'))
+            .pipe(gulp.dest("./test/result/"))
+            .pipe(gulpFunction(done,"atEnd"));
+
+    });
+
+    it("should run through smoothly with " + "'atEnd'".blue,function(done){
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction(myFunction,'atEnd'))
+            .pipe(gulp.dest("./test/result/"));
+
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction([myFunction2,myFunction3],'atEnd'))
+            .pipe(gulp.dest("./test/result/"))
+            .pipe(gulpFunction(done,"atEnd"));
+    });
+
+    it("should run through smoothly once with " + "'atFirst'".blue,function(done){
+
+        gulp.src('./test/*.md')
+            .pipe(gulpFunction([myFunction2,myFunction3],'forFirst'))
+            .pipe(gulp.dest("./test/result/"))
+            .pipe(gulpFunction(done,"atEnd"));
+    });
+
+    it("should run in order",function(done){
+        this.timeout(5000);
+        let stream = gulp.src('./test/*.md')
+            .pipe(gulpFunction([beforeFunction,middleFunction,middleFunction],'atEnd'))
+            .pipe(gulpFunction(function(){
+                beautylog.log("stream progressed");
+                var done2 = Q.defer();
+                done2.resolve();
+                return done2.promise;
+            },"forEach"))
+            .pipe(gulpFunction(function(){
+                beautylog.log("nextStep");
+            }))
+            .pipe(gulpFunction(afterFunction,"atEnd"))
+            .pipe(gulpFunction(timeoutFunction,"atEnd"));
+
+        stream.on("finish",function(){
+            beautylog.info("stream finished");
+            done();
+        });
+    });
+});
+

test/test02.md

@@ -0,0 +1,2 @@
+# Test.md
+This is another test file for the test.js gulp pipeline

ts/compile/compile.js

@@ -1,26 +0,0 @@
-// import gulp
-var gulp = require("gulp"),
-	gulpTypescript = require("gulp-typescript");
-
-gulp.task('compileTS', function() {
-	var stream = gulp.src('../index.ts')
-	  .pipe(gulpTypescript({
-	  	out: "index.js"
-	  }))
-	  .pipe(gulp.dest("../../"));
-	return stream;
-});
-
-gulp.task('compileTestTS', function() {
-	var stream = gulp.src('../test.ts')
-			.pipe(gulpTypescript({
-				out: "test.js"
-			}))
-			.pipe(gulp.dest("../../"));
-	return stream;
-});
-
-gulp.task('default',['compileTS','compileTestTS'], function() {
-	console.log('Typescript compiled');
-});
-gulp.start.apply(gulp, ['default']);

ts/compile/compile.sh

@@ -1,2 +0,0 @@
-nvm use v0.12.7
-gulp

ts/compile/readme.md

@@ -1,2 +0,0 @@
-# How to compile.
-Make sure gulp and gulp-taypescript from npm are available. Then run the gulpfile in this directory.

ts/index.ts

@@ -1,46 +1,75 @@
-/// <reference path="typings/tsd.d.ts" />
-var through = require("through2");
-var path = require("path");
-var beautylog = require("beautylog");
+import 'typings-global'
+import * as q from 'q'
+import * as through2 from 'through2'
+import { Transform } from 'stream'
 
-//important vars
-var gulpCallFunction = {
-    executionMode: 'forEach', //can be forEach or atEnd
-    functionsToExecute: undefined,
-    logBool: false
-};
+export type TExecutionMode = 'forEach' | 'forFirst' | 'atEnd'
 
-var runFunctionNames = function () {
-    if (typeof gulpCallFunction.functionsToExecute == "function" ) {
-        gulpCallFunction.functionsToExecute();
-    } else if (Array.isArray(gulpCallFunction.functionsToExecute)) {
-        for (var anyFunction in gulpCallFunction.functionsToExecute) {
-            anyFunction();
+export interface IPromiseFunction {
+    (file?, enc?): PromiseLike<any>
+}
+
+module.exports = (
+    functionsToExecuteArg: IPromiseFunction | IPromiseFunction[],
+    executionModeArg: TExecutionMode = 'forEach'
+): Transform => {
+
+    let promiseArray = []
+    let runFunction = function (functionArg, file, enc) {
+        let returnValue = functionArg(file, enc)
+        if (typeof returnValue !== 'undefined' && typeof returnValue.then !== 'undefined') {
+            promiseArray.push(returnValue)
         }
-    } else {
-        beautylog.error('gulp-callfunction: something is strange with the given arguments');
     }
-};
 
-
-var forEach = function (file, enc, cb) {
-    if (gulpCallFunction.logBool) beautylog.log(gulpCallFunction.executionMode);
-    if (gulpCallFunction.executionMode === 'forEach') {
-        if(gulpCallFunction.logBool) beautylog.log('is forEach');
-        runFunctionNames();
+    let checkAndRunFunction = function (file, enc) {
+        if (typeof functionsToExecuteArg === 'function') {
+            runFunction(functionsToExecuteArg, file, enc)
+        } else if (Array.isArray(functionsToExecuteArg)) {
+            for (let anyFunction in functionsToExecuteArg) {
+                runFunction(functionsToExecuteArg[anyFunction], file, enc)
+            }
+        } else {
+            throw new Error('gulp-callfunction: something is strange with the given arguments')
+        }
+        return q.all(promiseArray)
     }
-    //tell gulp that we are complete
-    return cb(null, file);
-};
 
-var atEnd = function() {
-    if (gulpCallFunction.executionMode == "atEnd") {
-        runFunctionNames();
+    let hasExecutedOnce = false
+    let forEach = function (file, enc, cb) { // the forEach function is called for every chunk
+        switch (executionModeArg) {
+            case 'forEach':
+                checkAndRunFunction(file, enc).then(function () {
+                    cb(null, file)
+                })
+                break
+            case 'forFirst':
+                if (hasExecutedOnce) {
+                    checkAndRunFunction(file, enc)
+                        .then(function () {
+                            cb(null, file)
+                        })
+                } else {
+                    cb(null, file)
+                }
+                hasExecutedOnce = true
+                break
+            case 'atEnd':
+                cb(null, file)
+                break
+            default:
+                break
+        }
     }
-};
-module.exports = function (functionsToExecute:any|any[],executionMode:string = 'forEach', logBool = false) {
-    gulpCallFunction.functionsToExecute = functionsToExecute;
-    gulpCallFunction.executionMode = executionMode;
-    gulpCallFunction.logBool = logBool;
-    return through.obj(forEach,atEnd);
-};
+
+    let atEnd = function (cb) {
+        if (executionModeArg === 'atEnd') {
+            checkAndRunFunction(null, null).then(function () {
+                cb()
+            })
+        } else {
+            cb()
+        }
+    }
+    return through2.obj(forEach, atEnd)
+}

ts/test.ts

@@ -1,14 +0,0 @@
-/// <reference path="typings/tsd.d.ts" />
-var gulp = require("gulp");
-var gulpCallFunction = require("./index.js");
-
-var myFunction = function () {
-    console.log("Hello World!");
-}
-
-gulp.task('default',function() {
-    gulp.src('./test/test.md')
-        .pipe(gulpCallFunction(myFunction,'forEach'))
-        .pipe(gulp.dest("./test/result/"))
-});
-gulp.start.apply(gulp, ['default']);

ts/tsd.json

@@ -1,15 +0,0 @@
-{
-  "version": "v4",
-  "repo": "borisyankov/DefinitelyTyped",
-  "ref": "master",
-  "path": "typings",
-  "bundle": "typings/tsd.d.ts",
-  "installed": {
-    "node/node.d.ts": {
-      "commit": "efa0c1196d7280640e624ac1e7fa604502e7bd63"
-    },
-    "colors/colors.d.ts": {
-      "commit": "3191f6e0088eee07c4d8fd24e4d27a40a60d9eb9"
-    }
-  }
-}

ts/typings/colors/colors.d.ts

@@ -1,123 +0,0 @@
-// Type definitions for Colors.js 0.6.0-1
-// Project: https://github.com/Marak/colors.js
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-declare module "colors" {
-    interface Color {
-        (text: string): string;
-
-        black: Color;
-        red: Color;
-        green: Color;
-        yellow: Color;
-        blue: Color;
-        magenta: Color;
-        cyan: Color;
-        white: Color;
-        gray: Color;
-        grey: Color;
-
-        bgBlack: Color;
-        bgRed: Color;
-        bgGreen: Color;
-        bgYellow: Color;
-        bgBlue: Color;
-        bgMagenta: Color;
-        bgCyan: Color;
-        bgWhite: Color;
-
-        reset: Color;
-        bold: Color;
-        dim: Color;
-        italic: Color;
-        underline: Color;
-        inverse: Color;
-        hidden: Color;
-        strikethrough: Color;
-
-        rainbow: Color;
-        zebra: Color;
-        america: Color;
-        trap: Color;
-        random: Color;
-    }
-
-    module e {
-        export function setTheme(theme:any): void;
-
-        export var black: Color;
-        export var red: Color;
-        export var green: Color;
-        export var yellow: Color;
-        export var blue: Color;
-        export var magenta: Color;
-        export var cyan: Color;
-        export var white: Color;
-        export var gray: Color;
-        export var grey: Color;
-
-        export var bgBlack: Color;
-        export var bgRed: Color;
-        export var bgGreen: Color;
-        export var bgYellow: Color;
-        export var bgBlue: Color;
-        export var bgMagenta: Color;
-        export var bgCyan: Color;
-        export var bgWhite: Color;
-
-        export var reset: Color;
-        export var bold: Color;
-        export var dim: Color;
-        export var italic: Color;
-        export var underline: Color;
-        export var inverse: Color;
-        export var hidden: Color;
-        export var strikethrough: Color;
-
-        export var rainbow: Color;
-        export var zebra: Color;
-        export var america: Color;
-        export var trap: Color;
-        export var random: Color;
-    }
-
-    export = e;
-}
-
-interface String {
-    black: string;
-    red: string;
-    green: string;
-    yellow: string;
-    blue: string;
-    magenta: string;
-    cyan: string;
-    white: string;
-    gray: string;
-    grey: string;
-
-    bgBlack: string;
-    bgRed: string;
-    bgGreen: string;
-    bgYellow: string;
-    bgBlue: string;
-    bgMagenta: string;
-    bgCyan: string;
-    bgWhite: string;
-
-    reset: string;
-    bold: string;
-    dim: string;
-    italic: string;
-    underline: string;
-    inverse: string;
-    hidden: string;
-    strikethrough: string;
-
-    rainbow: string;
-    zebra: string;
-    america: string;
-    trap: string;
-    random: string;
-}

ts/typings/tsd.d.ts

@@ -1,2 +0,0 @@
-/// <reference path="node/node.d.ts" />
-/// <reference path="colors/colors.d.ts" />

tslint.json

@@ -0,0 +1,3 @@
+{
+    "extends": "tslint-config-standard"
+}