diff --git a/.gitignore b/.gitignore index 7395838..11cc577 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules .DS_Store .project -*.sublime-* \ No newline at end of file +*.sublime-* +*.log diff --git a/.gitignore b/.gitignore index 7395838..11cc577 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules .DS_Store .project -*.sublime-* \ No newline at end of file +*.sublime-* +*.log diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..63e4d7c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: node_js +node_js: + - 0.10 + +before_script: + - npm install -g grunt-cli + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start diff --git a/.gitignore b/.gitignore index 7395838..11cc577 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules .DS_Store .project -*.sublime-* \ No newline at end of file +*.sublime-* +*.log diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..63e4d7c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +language: node_js +node_js: + - 0.10 + +before_script: + - npm install -g grunt-cli + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start diff --git a/Gruntfile.js b/Gruntfile.js index ed53d0c..a300926 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,12 +1,13 @@ +'use strict'; + module.exports = function(grunt) { grunt.loadNpmTasks('grunt-concat-sourcemap'); grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-connect'); - grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-yuidoc'); - grunt.loadNpmTasks('grunt-contrib-watch'); + grunt.loadTasks('tasks'); var root = 'src/pixi/', debug = 'bin/pixi.dev.js', @@ -100,7 +101,7 @@ }, files: { srcBlob: '<%= dirs.src %>/**/*.js', - testBlob: '<%= dirs.test %>/unit/**/*.js', + testBlob: '<%= dirs.test %>/{functional,lib/pixi,unit}/**/*.js', build: '<%= dirs.build %>/pixi.dev.js', buildMin: '<%= dirs.build %>/pixi.js' }, @@ -124,24 +125,16 @@ } }, jshint: { - beforeconcat: { - src: srcFiles, - options: { - jshintrc: '.jshintrc', - ignores: ['<%= dirs.src %>/{Intro,Outro}.js'] - } - }, - afterconcat: { - src: '<%= files.build %>', - options: { - jshintrc: '.jshintrc', - } - }, + beforeconcat: srcFiles, test: { src: ['<%= files.testBlob %>'], options: { expr: true } + }, + options: { + asi: true, + smarttabs: true } }, uglify: { @@ -154,12 +147,6 @@ } }, connect: { - qunit: { - options: { - port: grunt.option('port-test') || 9002, - base: './' - } - }, test: { options: { port: grunt.option('port-test') || 9002, @@ -168,13 +155,6 @@ } } }, - qunit: { - all: { - options: { - urls: ['http://localhost:' + (grunt.option('port-test') || 9002) + '/test/index.html'] - } - } - }, yuidoc: { compile: { name: '<%= pkg.name %>', @@ -188,24 +168,22 @@ } } }, - watch: { - dev: { - files: ['Gruntfile.js', 'src/**/*.js', 'examples/**/*.html'], - tasks: ['build-debug'], - - // We would need to inject - - -
- - - - - - -