Merge pull request #315 from sedge/issue312-bundleTests

Fix #312 - Bundle filer-test.js with gh-pages branch only
This commit is contained in:
Alan K 2014-11-11 16:39:35 -05:00
commit f8ca6e8208
3 changed files with 36 additions and 16659 deletions

16656
dist/filer-test.js vendored

File diff suppressed because it is too large Load Diff

View File

@ -97,7 +97,7 @@ module.exports = function(grunt) {
files: ['package.json', 'bower.json'], files: ['package.json', 'bower.json'],
commit: true, commit: true,
commitMessage: 'v%VERSION%', commitMessage: 'v%VERSION%',
commitFiles: ['package.json', 'bower.json', './dist/filer.js', './dist/filer.min.js', './dist/filer-test.js'], commitFiles: ['package.json', 'bower.json', './dist/filer.js', './dist/filer.min.js'],
createTag: true, createTag: true,
tagName: 'v%VERSION%', tagName: 'v%VERSION%',
tagMessage: 'v%VERSION%', tagMessage: 'v%VERSION%',
@ -162,6 +162,35 @@ module.exports = function(grunt) {
}, },
} }
}, },
gitpull: {
publish: {
options: {
remote: GIT_REMOTE,
branch: 'develop',
force: true
},
}
},
gitcommit: {
publish: {
options: {
message: 'Tests for Filer v' +
JSON.parse(fs.readFileSync('./package.json', 'utf8')).version,
noStatus: true
}
}
},
gitadd: {
publish: {
files: {
src: ['./dist/filer-test.js']
}
}
},
connect: { connect: {
serverForNode: { serverForNode: {
options: { options: {
@ -191,7 +220,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-browserify'); grunt.loadNpmTasks('grunt-browserify');
grunt.registerTask('develop', ['clean', 'browserify']); grunt.registerTask('develop', ['clean', 'browserify:filerDist', 'browserify:filerIssue225']);
grunt.registerTask('build-tests', ['clean', 'browserify:filerTest']); grunt.registerTask('build-tests', ['clean', 'browserify:filerTest']);
grunt.registerTask('release', ['test', 'develop', 'uglify']); grunt.registerTask('release', ['test', 'develop', 'uglify']);
@ -218,6 +247,10 @@ module.exports = function(grunt) {
'release', 'release',
'bump:' + patchLevel, 'bump:' + patchLevel,
'gitcheckout:publish', 'gitcheckout:publish',
'gitpull:publish',
'build-tests',
'gitadd:publish',
'gitcommit:publish',
'gitpush:publish', 'gitpush:publish',
'gitcheckout:revert', 'gitcheckout:revert',
'npm-publish' 'npm-publish'

View File

@ -39,7 +39,7 @@
"grunt-contrib-jshint": "~0.7.1", "grunt-contrib-jshint": "~0.7.1",
"grunt-contrib-uglify": "~0.1.2", "grunt-contrib-uglify": "~0.1.2",
"grunt-contrib-watch": "~0.3.1", "grunt-contrib-watch": "~0.3.1",
"grunt-git": "0.2.10", "grunt-git": "0.3.1",
"grunt-npm": "git://github.com/sedge/grunt-npm.git#branchcheck", "grunt-npm": "git://github.com/sedge/grunt-npm.git#branchcheck",
"grunt-prompt": "^1.1.0", "grunt-prompt": "^1.1.0",
"grunt-shell": "~0.7.0", "grunt-shell": "~0.7.0",