removed errant npmload, added nonull:true and removed file filter for relative file list, fixes #18, 0.4.0

This commit is contained in:
Jarrod Overson 2013-03-08 18:04:51 -08:00
parent 8fc713fb13
commit da897d09f1
6 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,10 @@
v0.4.0:
date: 2013-03-08
changes:
- bumped grunt-lib-phantomjs to 0.2.0/1.8
- allowed spec/vendor/helper list to return non-matching files (e.g. for remote, http)
- merged #30
- merged #34
v0.3.3: v0.3.3:
date: 2013-02-24 date: 2013-02-24
changes: changes:

View File

@ -54,7 +54,6 @@ module.exports = function(grunt) {
grunt.loadTasks('tasks'); grunt.loadTasks('tasks');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-nodeunit'); grunt.loadNpmTasks('grunt-contrib-nodeunit');
grunt.loadNpmTasks('grunt-contrib-internal'); grunt.loadNpmTasks('grunt-contrib-internal');

View File

@ -213,6 +213,7 @@ for more information on the RequireJS template.
## Release History ## Release History
* 2013-03-07v0.4.0bumped grunt-lib-phantomjs to 0.2.0/1.8 allowed spec/vendor/helper list to return non-matching files (e.g. for remote, http) merged merged
* 2013-02-23v0.3.3Added better console output (via Gabor Kiss @Neverl) * 2013-02-23v0.3.3Added better console output (via Gabor Kiss @Neverl)
* 2013-02-16v0.3.2Ensure Gruntfile.js is included on npm. * 2013-02-16v0.3.2Ensure Gruntfile.js is included on npm.
* 2013-02-14v0.3.1First official release for Grunt 0.4.0. * 2013-02-14v0.3.1First official release for Grunt 0.4.0.
@ -228,4 +229,4 @@ for more information on the RequireJS template.
Task submitted by [Jarrod Overson](http://jarrodoverson.com) Task submitted by [Jarrod Overson](http://jarrodoverson.com)
*This file was generated on Fri Mar 08 2013 17:16:32.* *This file was generated on Sun Mar 10 2013 21:41:54.*

View File

@ -1,7 +1,7 @@
{ {
"name": "grunt-contrib-jasmine", "name": "grunt-contrib-jasmine",
"description": "Run jasmine specs headlessly through PhantomJS.", "description": "Run jasmine specs headlessly through PhantomJS.",
"version": "0.3.3", "version": "0.4.0",
"homepage": "https://github.com/gruntjs/grunt-contrib-jasmine", "homepage": "https://github.com/gruntjs/grunt-contrib-jasmine",
"author": { "author": {
"name": "Grunt Team", "name": "Grunt Team",

View File

@ -126,7 +126,7 @@ module.exports = function(grunt) {
phantomjs.on('write', grunt.log.write.bind(grunt.log)); phantomjs.on('write', grunt.log.write.bind(grunt.log));
phantomjs.on('writeln', grunt.log.writeln.bind(grunt.log)); phantomjs.on('writeln', grunt.log.writeln.bind(grunt.log));
phantomjs.on('error.onError',function(string, trace){ phantomjs.on('error.onError',function(string, trace){
if (trace) { if (trace && trace.length) {
grunt.log.error(string.red + ' at '); grunt.log.error(string.red + ' at ');
trace.forEach(function(line) { trace.forEach(function(line) {
var file = line.file.replace(/^file:/,''); var file = line.file.replace(/^file:/,'');

View File

@ -95,7 +95,7 @@ exports.init = function(grunt, phantomjs) {
var base = path.resolve(baseDir); var base = path.resolve(baseDir);
var files = []; var files = [];
list.forEach(function(listItem){ list.forEach(function(listItem){
if (listItem) files = files.concat(grunt.file.expand({filter: 'isFile'},listItem)); if (listItem) files = files.concat(grunt.file.expand({nonull: true},listItem));
}); });
files = grunt.util._(files).map(function(file){ files = grunt.util._(files).map(function(file){
return path.resolve(file).replace(base,'.').replace(/\\/g,'/'); return path.resolve(file).replace(base,'.').replace(/\\/g,'/');