Utilize importable gulp tasks

.gitignore

@@ -39,6 +39,8 @@ Icon
 node_modules
 bin
 dist
-npm-debug.log
 app
-coverage
+app-min
+temp
+npm-debug.log
+coverage

gulpfile.js

@@ -1,65 +1,48 @@
 'use strict';
 
+var coveralls = require('gulp-coveralls');
+var del = require('del');
+var exec = require('child_process').exec;
+var flatten = require('gulp-flatten');
 var gulp = require('gulp');
 var mocha = require('gulp-mocha');
 var coveralls = require('gulp-coveralls');
 var tsc = require('gulp-typescript');
+var oneJsBuild = require('gulp-onejs-build');
 var karma = require('karma').server;
-var del = require('del');
 
-var paths = {
-    app: 'app/',
-    dist: 'dist/',
-    amd: 'dist/amd',
-    commonjs: 'dist/commonjs',
-    appSourceDest: 'app/src',
-    appTestDest: 'app/test',
-    libSource: ['src/*.ts'],
-    libTest: ['test/*.ts']
-};
-
-var shouldExit = true;
-
-gulp.task('clean', function(cb) {
-    del([paths.dist, paths.app], cb);
+oneJsBuild.gulpTasks.all({
+    gulp: gulp,
+    rootDir: __dirname,
+    karma: karma
 });
 
-gulp.task('build-source', ['clean'], function() {
-    var tsResult = gulp.src(paths.libSource)
-        .pipe(tsc({
-            module: 'amd',
-            target: 'ES5',
-            declarationFiles: true
-        }));
+var shouldExit = true;
 
-    tsResult.dts.pipe(gulp.dest(paths.amd));
-    tsResult.js.pipe(gulp.dest(paths.amd))
-    return tsResult.js.pipe(gulp.dest(paths.appSourceDest));
+gulp.task('tdd', [], function (done) {
+    karma.start({
+        configFile: __dirname + '/karma.conf.js'
+    }, done);
 });
 
-gulp.task('build-test', ['clean', 'build-source'], function() {
-    return gulp.src(paths.libTest)
-        .pipe(tsc({
-            module: 'amd',
-            target: 'ES5',
-            declarationFiles: false
-        }))
-        .pipe(gulp.dest(paths.appTestDest));
+gulp.task('ciTest', ['test-preprocess'], function (done) {
+    karma.start({
+        configFile: __dirname + '/karma-ci.conf.js'
+    }, done);
 });
 
-gulp.task('build', ['build-source', 'build-test']);
-
-gulp.task('test', ['build'], function (done) {
-  karma.start({
-    configFile: __dirname + '/karma.conf.js',
-    singleRun: true
-  }, done);
+gulp.task('covertest', ['ciTest'], function() {
+    return gulp.src('bin/coverage/**/lcov.info')
 });
 
-gulp.task('covertest', ['build','test'], function() {
+gulp.task('covertest', ['build', 'test'], function() {
     return gulp.src('coverage/**/lcov.info')
         .pipe(coveralls());
+});
 
+gulp.task('watch', ['default'], function() {
+    shouldExit = false;
+    return gulp.watch(oneJsBuild.gulpTasks.paths.src.glob, ['default']);
 });
 
 gulp.task('default', ['build', 'test']);

package.json

@@ -20,8 +20,10 @@
     "del": "^0.1.3",
     "gulp": "^3.8.5",
     "gulp-coveralls": "^0.1.3",
+    "gulp-flatten": "0.0.4",
     "gulp-jasmine": "^0.2.0",
     "gulp-mocha": "^1.1.0",
+    "gulp-onejs-build": "^1.2.0",
     "gulp-requirejs": "^0.1.3",
     "gulp-rjs": "^0.1.0",
     "gulp-typescript": "2.0.0",

test/Block.test.ts

@@ -1,15 +1,16 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
+import Block = require('../Block');
+import IBinding = require('../IBinding');
+import Binding = require('../Binding');
+import BlockProcessor = require('../BlockProcessor');
+import BlockType = require('../BlockType');
+import BaseView = require('../BaseView');
+import View = require('../View');
+import EventGroup = require('../EventGroup');
+
 var assert = chai.assert;
-import Block = require('../src/Block');
-import IBinding = require('../src/IBinding');
-import Binding = require('../src/Binding');
-import BlockProcessor = require('../src/BlockProcessor');
-import BlockType = require('../src/BlockType');
-import BaseView = require('../src/BaseView');
-import View = require('../src/View');
-import EventGroup = require('../src/EventGroup');
 
 describe('Block', function () {
 

test/DomUtils.test.ts

@@ -1,8 +1,8 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
-import List = require("../src/List");
-import DomUtils = require("../src/DomUtils");
+import List = require("../List");
+import DomUtils = require("../DomUtils");
 
 var expect = chai.expect;
 var assert = chai.assert;

test/EventGroup.test.ts

@@ -1,8 +1,8 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
-import List = require("../src/List");
-import EventGroup = require("../src/EventGroup");
+import List = require("../List");
+import EventGroup = require("../EventGroup");
 
 var expect = chai.expect;
 var assert = chai.assert;

test/IfBlock.test.ts

@@ -1,11 +1,12 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
+import Block = require('../Block');
+import BlockProcessor = require('../BlockProcessor');
+import BlockType = require('../BlockType');
+import View = require('../View');
+
 var assert = chai.assert;
-import Block = require('../src/Block');
-import BlockProcessor = require('../src/BlockProcessor');
-import BlockType = require('../src/BlockType');
-import View = require('../src/View');
 
 describe('Block', function () {
 

test/List.test.ts

@@ -1,9 +1,9 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require('chai');
-import List = require('../src/List');
-import EventGroup = require('../src/EventGroup');
-import ViewModel = require('../src/ViewModel');
+import List = require('../List');
+import EventGroup = require('../EventGroup');
+import ViewModel = require('../ViewModel');
 
 var assert = chai.assert;
 

test/Observable.test.ts

@@ -1,8 +1,8 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
-import Observable = require("../src/Observable");
-import EventGroup = require("../src/EventGroup");
+import Observable = require("../Observable");
+import EventGroup = require("../EventGroup");
 
 var assert = chai.assert;
 

test/Promise.test.ts

@@ -1,7 +1,7 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
-import Promise = require("../src/Promise");
+import Promise = require("../Promise");
 
 var expect = chai.expect;
 var assert = chai.assert;

test/RepeaterBlock.test.ts

@@ -1,12 +1,13 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
+import Block = require('../Block');
+import BlockProcessor = require('../BlockProcessor');
+import BlockType = require('../BlockType');
+import View = require('../View');
+import List = require('../List');
+
 var assert = chai.assert;
-import Block = require('../src/Block');
-import BlockProcessor = require('../src/BlockProcessor');
-import BlockType = require('../src/BlockType');
-import View = require('../src/View');
-import List = require('../src/List');
 
 describe('Block', function () {
 

test/Scheduler.test.ts

@@ -1,7 +1,7 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
-import Scheduler = require('../src/Scheduler');
+import Scheduler = require('../Scheduler');
 
 var assert = chai.assert;
 

test/View.test.ts

@@ -1,9 +1,9 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
-import View = require("../src/View");
-import Block = require("../src/Block");
-import BlockType = require('../src/BlockType');
+import View = require("../View");
+import Block = require("../Block");
+import BlockType = require('../BlockType');
 
 var assert = chai.assert;
 

test/ViewModel.test.ts

@@ -1,8 +1,8 @@
-/// <reference path="../definitions/definitions.d.ts" />
+/// <reference path="../typings/tsd.d.ts" />
 
 import chai = require("chai");
-import ViewModel = require("../src/ViewModel");
-import View = require("../src/View");
+import ViewModel = require("../ViewModel");
+import View = require("../View");
 
 var assert = chai.assert;
 

tsd.json

@@ -0,0 +1,15 @@
+{
+  "version": "v4",
+  "repo": "borisyankov/DefinitelyTyped",
+  "ref": "master",
+  "path": "typings",
+  "bundle": "typings/tsd.d.ts",
+  "installed": {
+    "chai/chai.d.ts": {
+      "commit": "2544abac24320d3f0edb67d256dcee8faf0e6f14"
+    },
+    "mocha/mocha.d.ts": {
+      "commit": "2544abac24320d3f0edb67d256dcee8faf0e6f14"
+    }
+  }
+}

definitions/chai.d.ts → typings/chai/chai.d.ts

@@ -94,6 +94,7 @@ declare module chai {
         that: Expect;
         and: Expect;
         have: Expect;
+        has: Expect;
         with: Expect;
         at: Expect;
         of: Expect;

typings/tsd.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="chai/chai.d.ts" />
+/// <reference path="mocha/mocha.d.ts" />
+/// <reference path="rewire.d.ts" />