From 8265fa08376343d04c7c8c4796ebd4dcc7e3d2e0 Mon Sep 17 00:00:00 2001 From: Rick Waldron Date: Tue, 5 Jun 2012 13:10:01 -0400 Subject: [PATCH] Allow users to store custom dist destinations in dist/.destination.json Signed-off-by: Rick Waldron --- .gitignore | 1 + README.md | 14 +++++++++++ grunt.js | 68 +++++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 65 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 0973197c1..9868a5369 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ dist *.patch /*.html .DS_Store +dist/.destination.json dist/.sizecache.json build/.sizecache.json node_modules diff --git a/README.md b/README.md index 5eaf86774..0d84e1072 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,20 @@ With this example, the output files would be: ``` +If you want to add a permanent copy destination, create a file in `dist/` called ".destination.json". Inside the file, paste and customize the following: + +```json + +{ + "/Absolute/path/to/other/destination": true +} + +``` + + +Additionally, both methods can be combined. + + Updating Submodules ------------------- diff --git a/grunt.js b/grunt.js index f29bbded1..5bba8fe92 100644 --- a/grunt.js +++ b/grunt.js @@ -1,9 +1,25 @@ -// Resources -// https://gist.github.com/2489540 +/** + * Resources + * + * https://gist.github.com/2489540 + * + */ /*global config:true, task:true*/ module.exports = function( grunt ) { + // readOptionalJSON + // by Ben Alman + // https://gist.github.com/2876125 + function readOptionalJSON( filepath ) { + var data = {}; + try { + data = grunt.file.readJSON(filepath); + grunt.log.write( "Reading data from " + filepath + "..." ).ok(); + } catch(e) {} + return data; + } + var task = grunt.task; var file = grunt.file; var utils = grunt.utils; @@ -20,6 +36,7 @@ module.exports = function( grunt ) { grunt.initConfig({ pkg: "", + dst: readOptionalJSON("dist/.destination.json"), meta: { banner: "/*! jQuery v@<%= pkg.version %> jquery.com | jquery.org/license */" }, @@ -234,32 +251,47 @@ module.exports = function( grunt ) { // Allow custom dist file locations grunt.registerTask( "dist", function() { - var keys, dir; + var flags, paths, stored; - keys = Object.keys( this.flags ); + // Check for stored destination paths + // ( set in dist/.destination.json ) + stored = Object.keys( config("dst") ); - if ( keys.length ) { + // Allow command line input as well + flags = Object.keys( this.flags ); - // If a custom dist dir wasn't specified - // there is nothing to do. - if ( keys[0] === "*" ) { - return; - } + // Combine all output target paths + paths = [].concat( stored, flags ).filter(function( path ) { + return path !== "*"; + }); - dir = keys[0]; - if ( !/\/$/.test( dir ) ) { - dir += "/"; - } + // Proceed only if there are actual + // paths to write to + if ( paths.length ) { // 'distpaths' is declared at the top of the - // module.exports function scope. + // module.exports function scope. It is an array + // of default files that jQuery creates distpaths.forEach(function( filename ) { - var created = dir + filename.replace( "dist/", "" ); + paths.forEach(function( path ) { + var created; + + if ( !/\/$/.test( path ) ) { + path += "/"; + } + + created = path + filename.replace( "dist/", "" ); + + if ( !/^\//.test( path ) ) { + log.error( "File '" + created + "' was NOT created." ); + return; + } - file.write( created, file.read( filename ) ); + file.write( created, file.read(filename) ); - log.writeln( "File '" + created + "' created." ); + log.writeln( "File '" + created + "' created." ); + }); }); } }); -- 2.39.5