Merge pull request ExactTarget#1103 from cormacmccarthy/GH1094---update-dist-and-qunit-process

fixes #1094 makes dist compile and test prior to release. Also prompts f...

Author: interactivellama

Gruntfile.js

@@ -6,8 +6,8 @@ module.exports = function(grunt) {
 // use --no-livereload to disable livereload. Helpful to 'serve' multiple projects
 var isLivereloadEnabled = (typeof grunt.option('livereload') !== 'undefined') ? grunt.option('livereload') : true;
 
-// release minor or patch version. Do major releases manually
-var versionReleaseType = (typeof grunt.option('minor') !== 'undefined') ? 'minor':'patch';
+var semver = require('semver');
+var currentVersion = require('./package.json').version;
 
 // Project configuration.
 grunt.initConfig({
@@ -47,14 +47,15 @@ module.exports = function(grunt) {
 if (ver === 'browserGlobals') {
 return 'http://localhost:<%= connect.testServer.options.port %>/test/fuelux-browser-globals.html';
 }
-return 'http://localhost:<%= connect.testServer.options.port %>/test/fuelux.html?jquery=' + ver;
+return 'http://localhost:<%= connect.testServer.options.port %>/test/fuelux.html?jquery=' + ver + '&testdist=true';
 }),
-testUrl: ['http://localhost:<%= connect.testServer.options.port %>/test/fuelux.html?jquery=' + '1.9.1'],
+testUrl: ['http://localhost:<%= connect.testServer.options.port %>/test/fuelux.html?jquery=' + '1.9.1&testdist=true'],
 
 //Tasks configuration
 clean: {
 dist: ['dist'],
-zipsrc: ['dist/fuelux'] // temp folder
+zipsrc: ['dist/fuelux'], // temp folder
+screenshots: ['page-at-timeout-*.jpg']
 },
 compress: {
 zip: {
@@ -207,6 +208,7 @@ module.exports = function(grunt) {
 }
 },
 qunit: {
+//run with `grunt releasetest` or `grunt travisci`. Requires connect server to be running.
 full: {
 options: {
 urls: '<%= allTestUrls %>',
@@ -219,7 +221,13 @@ module.exports = function(grunt) {
 }
 }
 },
-simple: ['test/*.html']
+//can be run with `grunt qunit:simple`
+simple: ['test/*.html'],
+dist: {
+options: {
+urls: ['http://localhost:<%= connect.server.options.port %>/test/fuelux.html?testdist=true']
+}
+}
 },
 less: {
 dist: {
@@ -247,6 +255,75 @@ module.exports = function(grunt) {
 },
 
 },
+prompt: {
+bump: {
+options: {
+questions: [
+{
+config: 'bump.increment',
+type: 'list',
+message: 'Bump version from ' + '<%= pkg.version %>' + ' to:',
+choices: [
+// {
+//	value: 'build',
+//	name: 'Build: '+ (currentVersion + '-?') + ' Unstable, betas, and release candidates.'
+// },
+{
+value: 'patch',
+name: 'Patch: ' + semver.inc(currentVersion, 'patch') + ' Backwards-compatible bug fixes.'
+},
+{
+value: 'minor',
+name: 'Minor: ' + semver.inc(currentVersion, 'minor') + ' Add functionality in a backwards-compatible manner.'
+},
+{
+value: 'major',
+name: 'Major: ' + semver.inc(currentVersion, 'major') + ' Incompatible API changes.'
+},
+{
+value: 'custom',
+name: 'Custom: ?.?.? Specify version...'
+}
+]
+},
+{
+config: 'bump.version',
+type: 'input',
+message: 'What specific version would you like',
+when: function (answers) {
+return answers['bump.increment'] === 'custom';
+},
+validate: function (value) {
+var valid = semver.valid(value);
+return valid || 'Must be a valid semver, such as 1.2.3-rc1. See http://semver.org/ for more details.';
+}
+}//,
+// {
+//	config: 'bump.files',
+//	type: 'checkbox',
+//	message: 'What should get the new version:',
+//	choices: [
+//	{
+//	value: 'package',
+//	name: 'package.json' + (!grunt.file.isFile('package.json') ? ' not found, will create one' : ''),
+//	checked: grunt.file.isFile('package.json')
+//	},
+//	{
+//	value: 'bower',
+//	name: 'bower.json' + (!grunt.file.isFile('bower.json') ? ' not found, will create one' : ''),
+//	checked: grunt.file.isFile('bower.json')
+//	},
+// {
+//	value: 'git',
+//	name: 'git tag',
+//	checked: grunt.file.isDir('.git')
+// }
+//	]
+// }
+]
+}
+}
+},
 replace: {
 readme: {
 src: ['DETAILS.md', 'README.md'],
@@ -378,7 +455,7 @@ module.exports = function(grunt) {
 BUILD
 ------------- */
 // JS distribution task
-grunt.registerTask('distjs', 'concat, uglify, and beautifying JS', ['concat', 'uglify', 'jsbeautifier']);
+grunt.registerTask('distjs', 'concat, uglify', ['concat', 'uglify', 'jsbeautifier']);
 
 // CSS distribution task
 grunt.registerTask('distcss', 'Compile LESS into CSS', ['less', 'usebanner', 'delete-temp-less-file']);
@@ -405,13 +482,16 @@ module.exports = function(grunt) {
 TESTS
 ------------- */
 // The default build task
-grunt.registerTask('default', 'Run simple tests. Does not build "dist."', ['test']);
+grunt.registerTask('default', 'Run simple tests.', ['test', 'clean:screenshots']);
 
-// minimal tests for developmeent
+// to be run prior to submitting a PR
 grunt.registerTask('test', 'run jshint, qunit:simple, and validate HTML', ['jshint', 'qunit:simple', 'validation']);
 
+//If qunit:simple is working but qunit:full is breaking, check to see if the dist broke the code. This would be especially useful if we start mangling our code, but, is 99.99% unlikely right now
+grunt.registerTask('validate-dist', 'run qunit:simple, dist, and then qunit:full', ['connect:testServer', 'qunit:simple', 'dist', 'qunit:full']);
+
 // multiple jquery versions, then run SauceLabs VMs
-grunt.registerTask('releasetest', 'run jshint, qunit:full, and saucelabs', ['connect:testServer', 'jshint', 'qunit:full', 'saucelabs']);
+grunt.registerTask('releasetest', 'run jshint, dist, qunit:full, validation, and qunit on saucelabs', ['connect:testServer', 'jshint', 'qunit:simple', 'dist', 'qunit:full', 'validation', 'saucelabs-qunit:defaultBrowsers']);
 
 // can be run locally instead of through TravisCI, but requires the Fuel UX Saucelabs API key file which is not public at this time.
 grunt.registerTask('saucelabs', 'run jshint, and qunit on saucelabs', ['connect:testServer', 'jshint', 'saucelabs-qunit:defaultBrowsers']);
@@ -420,18 +500,30 @@ module.exports = function(grunt) {
 grunt.registerTask('trickysauce', 'run tests, jshint, and qunit for "tricky browsers" (IE8-11)', ['connect:testServer', 'jshint', 'saucelabs-qunit:trickyBrowsers']);
 
 // Travis CI task. This task no longer uses SauceLabs. Please run 'grunt saucelabs' manually.
-grunt.registerTask('travisci', 'Tests to run when in Travis CI environment', ['connect:testServer', 'jshint', 'qunit:full']);
+grunt.registerTask('travisci', 'Tests to run when in Travis CI environment', ['connect:testServer', 'jshint', 'qunit:simple', 'dist', 'qunit:full']);
 
 
 /* -------------
 RELEASE
 ------------- */
 // Maintainers: Run prior to a release. Includes SauceLabs VM tests.
-// --minor will create a semver minor release, otherwise a patch release will be created
-grunt.registerTask('release', 'Release a new version, push it and publish it', function() {
-if (! grunt.option('no-tests') ) { grunt.task.run(['releasetest']); }
+grunt.registerTask('release', 'Release a new version, push it and publish it', ['prompt:bump', 'dorelease']);
+grunt.registerTask('dorelease', '', function() {
+if(typeof grunt.config('bump.increment') === 'undefined'){
+grunt.fail.fatal('you must choose a version to bump to');
+}
+grunt.log.writeln('');
+grunt.log.oklns('releasing: ', grunt.config('bump.increment'));
+
+if (! grunt.option('no-tests') ) {
+grunt.task.run(['releasetest']);
+//delete any screenshots that may have happened if it got this far. This isn't foolproof because it relies on the phantomjs server/page timeout, which can take longer than this grunt task depending on how long saucelabs takes to run...
+grunt.task.run('clean:screenshots');
+}
+
 grunt.config('banner', '<%= bannerRelease %>');
-grunt.task.run(['bump-only:' + versionReleaseType, 'dist', 'replace:readme']);
+//make sure we run dist again to grab the latest version numbers. Yeah, we're running it twice... ¯\_(ツ)_/¯
+grunt.task.run(['bump-only:' + grunt.config('bump.increment'), 'replace:readme', 'dist']);
 });
 
 
@@ -452,5 +544,4 @@ module.exports = function(grunt) {
 grunt.registerTask('serve', 'serve files without "dist" build', ['test', 'connect:server', 'watch:contrib']);
 grunt.registerTask('servedist', 'test, build "dist", serve files w/ watch', ['test', 'dist', 'connect:server', 'watch:full']);
 
-
 };

package.json

@@ -33,10 +33,12 @@
  "grunt-contrib-watch": "0.x",
  "grunt-html-validation": "0.x",
  "grunt-jsbeautifier": "0.x",
+ "grunt-prompt": "1.x",
  "grunt-saucelabs": "8.x",
  "grunt-text-replace": "0.x",
  "grunt-zip": "0.x",
  "load-grunt-tasks": "2.x",
+ "semver": "4.x",
  "serve-static": "1.x"
  },
  "engines": {
@@ -83,4 +85,4 @@
  "type": "directory",
  "url": "https://raw.github.com/ExactTarget/fuelux/{version}/dist/fuelux.zip"
  }
-}
+}

test/fuelux.html

@@ -43,7 +43,7 @@
 jQueryPath = 'bower_components/jquery-' + jqver + '/jquery';
 }
 
-require.config({
+var requireConfig = {
 baseUrl: '../',
 paths: {
 jquery: jQueryPath,
@@ -58,7 +58,40 @@
 exports: 'bootstrap'
 }
 }
-});
+};
+
+//default to non-dist for dev
+var testdistParam = location.search.match(/[?&]testdist=(true|false?)(?=&|$)/);
+var testdist = (testdistParam && testdistParam[1] === 'true') ? true : false;
+if(testdist){
+var fueluxLocation;
+
+//map all calls for individual fuelux modules to merged fuelux library
+requireConfig.map = {
+'*': {
+'fuelux/checkbox': 'dist/js/fuelux',
+'fuelux/combobox': 'dist/js/fuelux',
+'fuelux/datepicker': 'dist/js/fuelux',
+'fuelux/dropdown-autoflip': 'dist/js/fuelux',
+'fuelux/infinite-scroll': 'dist/js/fuelux',
+'fuelux/loader': 'dist/js/fuelux',
+'fuelux/pillbox': 'dist/js/fuelux',
+'fuelux/placard': 'dist/js/fuelux',
+'fuelux/radio': 'dist/js/fuelux',
+'fuelux/repeater-list': 'dist/js/fuelux',
+'fuelux/repeater-thumbnail': 'dist/js/fuelux',
+'fuelux/repeater': 'dist/js/fuelux',
+'fuelux/scheduler': 'dist/js/fuelux',
+'fuelux/search': 'dist/js/fuelux',
+'fuelux/selectlist': 'dist/js/fuelux',
+'fuelux/spinbox': 'dist/js/fuelux',
+'fuelux/tree': 'dist/js/fuelux',
+'fuelux/wizard': 'dist/js/fuelux'
+}
+}
+}
+
+require.config(requireConfig);
 
 require(['jquery', 'test/fuelux-test'], function() {});
 })();