Merge pull request #243 from chaosmail/dev

 Proposed structure now executable typescript

.gitignore

@@ -1,3 +1,6 @@
+build/
+typings/
 node_modules/
 coverage/
 .tmp/
+*.log

.travis.yml

@@ -6,6 +6,7 @@ before_install:
 - export DISPLAY=:99.0
 - sh -e /etc/init.d/xvfb start
 - npm install
+- tsd reinstall -s
 script: gulp travis
 notifications:
   webhooks:

README.md

@@ -14,6 +14,11 @@ Install dev dependencies :
 $ npm install
 ```
 
+Install the type definitions :
+```sh
+$ tsd reinstall -s
+```
+
 Watch :
 ```sh
 $ gulp watch

gulpfile.js

@@ -14,12 +14,17 @@ var paths = {
   },
   source: {
     from: 'src/**/*.ts',
-    to: './build/'
+    to: 'build/'
   }
 };
 
-gulp.task('clean', function () {
-    return gulp.src(['.tmp/', 'coverage'], {read: false})
+gulp.task('clean:tmp', function () {
+    return gulp.src(['.tmp/', 'coverage/'], {read: false})
+      .pipe(clean());
+});
+
+gulp.task('clean:build', function () {
+    return gulp.src(['.tmp/', 'coverage/'], {read: false})
       .pipe(clean());
 });
 
@@ -49,12 +54,17 @@ gulp.task('compile:tests', function () {
     .pipe(gulp.dest(paths.tests.to));
 });
 
-
 gulp.task('test', ['compile:tests'], function() {
   return gulp.src([
-    'node_modules/angular/angular.js',
     'node_modules/expect.js/index.js',
-    paths.tests.to + '**/*.js'
+    'node_modules/angular/angular.js',
+    'node_modules/angular-mocks/angular-mocks.js',
+    'node_modules/d3/d3.js',
+    paths.tests.to + 'src/utils/*.js',
+    paths.tests.to + 'src/factories/*.js',
+    paths.tests.to + 'src/LineChart.js',
+    paths.tests.to + 'src/app.js',
+    paths.tests.to + 'test/unit/**/*.js'
   ]).pipe(karma({
     configFile: 'karma.conf.js',
     action: 'run',
@@ -77,18 +87,20 @@ gulp.task('coveralls', function() {
 gulp.task('default', ['build']);
 
 gulp.task('build', function(callback) {
-  return runSequence('clean',
+  return runSequence('clean:tmp',
+    'clean:build',
     ['tslint', 'compile:source'],
     'test',
-    'clean',
+    'clean:tmp',
   callback);
 });
 
 gulp.task('travis', function(callback) {
-  return runSequence('clean',
+  return runSequence('clean:tmp',
+    'clean:build',
     ['tslint', 'compile:source'],
     'test',
     'coveralls',
-    // 'clean',
+    //'clean:tmp',
   callback);
 });

karma.conf.js

@@ -2,6 +2,20 @@ module.exports = function(config) {
   var configuration = {
     basePath: '.',
     frameworks: ['mocha'],
+    files: [
+      'node_modules/expect.js/index.js',
+      'node_modules/angular/angular.js',
+      'node_modules/angular-mocks/angular-mocks.js',
+      'node_modules/d3/d3.js',
+      '.tmp/src/utils/*.js',
+      '.tmp/src/factories/*.js',
+      '.tmp/src/LineChart.js',
+      '.tmp/src/app.js',
+      '.tmp/test/unit/**/*.js',
+      {pattern: '.tmp/**/*.map', included: false},
+      {pattern: 'src/**/*.ts', included: false},
+      {pattern: 'test/**/*.ts', included: false}
+    ],
     reporters: ['progress', 'coverage'],
     coverageReporter: {
       type : 'lcovonly',
@@ -11,7 +25,7 @@ module.exports = function(config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: false,
-    singleRun: true,
+    singleRun: false,
     browsers: ['Chrome'],
     customLaunchers: {
       Chrome_travis_ci: {

package.json

@@ -13,7 +13,9 @@
   "bugs": "https://github.com/n3-charts/line-chart/issues",
   "devDependencies": {
     "angular": "^1.4.0",
+    "angular-mocks": "^1.4.0",
     "chai": "^2.3.0",
+    "d3": "^3.5.5",
     "expect.js": "^0.3.1",
     "gulp": "^3.8.11",
     "gulp-clean": "^0.3.1",