From d1c29af5916b6cb629f0b4f442d796866f7a8b6c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 7 Jan 2014 22:15:48 -0800 Subject: [PATCH 1/2] extract raw-files.js generator out of Gruntfile into separate module --- Gruntfile.js | 20 ++------------------ docs/grunt/bs-raw-files-generator.js | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 docs/grunt/bs-raw-files-generator.js diff --git a/Gruntfile.js b/Gruntfile.js index bd67ce84d5..6eaff731d5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -11,7 +11,7 @@ module.exports = function (grunt) { } var fs = require('fs') - var btoa = require('btoa') + var generateRawFilesJs = require('./docs/grunt/bs-raw-files-generator.js') // Project configuration. grunt.initConfig({ @@ -360,21 +360,5 @@ module.exports = function (grunt) { }); // task for building customizer - grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', function () { - function getFiles(type) { - var files = {} - fs.readdirSync(type) - .filter(function (path) { - return type == 'fonts' ? true : new RegExp('\\.' + type + '$').test(path) - }) - .forEach(function (path) { - var fullPath = type + '/' + path - return files[path] = (type == 'fonts' ? btoa(fs.readFileSync(fullPath)) : fs.readFileSync(fullPath, 'utf8')) - }) - return 'var __' + type + ' = ' + JSON.stringify(files) + '\n' - } - - var files = getFiles('js') + getFiles('less') + getFiles('fonts') - fs.writeFileSync('docs/assets/js/raw-files.js', files) - }); + grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', generateRawFilesJs); }; diff --git a/docs/grunt/bs-raw-files-generator.js b/docs/grunt/bs-raw-files-generator.js new file mode 100644 index 0000000000..b38563a06b --- /dev/null +++ b/docs/grunt/bs-raw-files-generator.js @@ -0,0 +1,22 @@ +/* jshint node: true */ + +var btoa = require('btoa') +var fs = require('fs') + +function getFiles(type) { + var files = {} + fs.readdirSync(type) + .filter(function (path) { + return type == 'fonts' ? true : new RegExp('\\.' + type + '$').test(path) + }) + .forEach(function (path) { + var fullPath = type + '/' + path + return files[path] = (type == 'fonts' ? btoa(fs.readFileSync(fullPath)) : fs.readFileSync(fullPath, 'utf8')) + }) + return 'var __' + type + ' = ' + JSON.stringify(files) + '\n' +} + +module.exports = function generateRawFilesJs() { + var files = getFiles('js') + getFiles('less') + getFiles('fonts') + fs.writeFileSync('docs/assets/js/raw-files.js', files) +} From d7a128c63628cb886dfa233c2b4bc2648b831c53 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 7 Jan 2014 22:34:09 -0800 Subject: [PATCH 2/2] extract glyphicons.yml generator out of Gruntfile into separate module --- Gruntfile.js | 25 ++------------------ docs/grunt/bs-glyphicons-data-generator.js | 27 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 docs/grunt/bs-glyphicons-data-generator.js diff --git a/Gruntfile.js b/Gruntfile.js index 6eaff731d5..29f99000ec 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -11,6 +11,7 @@ module.exports = function (grunt) { } var fs = require('fs') + var generateGlyphiconsData = require('./docs/grunt/bs-glyphicons-data-generator.js') var generateRawFilesJs = require('./docs/grunt/bs-raw-files-generator.js') // Project configuration. @@ -335,29 +336,7 @@ module.exports = function (grunt) { // This can be overzealous, so its changes should always be manually reviewed! grunt.registerTask('change-version-number', ['sed']); - grunt.registerTask('build-glyphicons-data', function () { - // Pass encoding, utf8, so `readFileSync` will return a string instead of a - // buffer - var glyphiconsFile = fs.readFileSync('less/glyphicons.less', 'utf8') - var glpyhiconsLines = glyphiconsFile.split('\n') - - // Use any line that starts with ".glyphicon-" and capture the class name - var iconClassName = /^\.(glyphicon-[^\s]+)/ - var glyphiconsData = '# This file is generated via Grunt task. **Do not edit directly.** \n' + - '# See the \'build-glyphicons-data\' task in Gruntfile.js.\n\n'; - for (var i = 0, len = glpyhiconsLines.length; i < len; i++) { - var match = glpyhiconsLines[i].match(iconClassName) - - if (match != null) { - glyphiconsData += '- ' + match[1] + '\n' - } - } - - // Create the `_data` directory if it doesn't already exist - if (!fs.existsSync('docs/_data')) fs.mkdirSync('docs/_data') - - fs.writeFileSync('docs/_data/glyphicons.yml', glyphiconsData) - }); + grunt.registerTask('build-glyphicons-data', generateGlyphiconsData); // task for building customizer grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', generateRawFilesJs); diff --git a/docs/grunt/bs-glyphicons-data-generator.js b/docs/grunt/bs-glyphicons-data-generator.js new file mode 100644 index 0000000000..2ecd543930 --- /dev/null +++ b/docs/grunt/bs-glyphicons-data-generator.js @@ -0,0 +1,27 @@ +/* jshint node: true */ + +var fs = require('fs') + +module.exports = function generateGlyphiconsData() { + // Pass encoding, utf8, so `readFileSync` will return a string instead of a + // buffer + var glyphiconsFile = fs.readFileSync('less/glyphicons.less', 'utf8') + var glpyhiconsLines = glyphiconsFile.split('\n') + + // Use any line that starts with ".glyphicon-" and capture the class name + var iconClassName = /^\.(glyphicon-[^\s]+)/ + var glyphiconsData = '# This file is generated via Grunt task. **Do not edit directly.** \n' + + '# See the \'build-glyphicons-data\' task in Gruntfile.js.\n\n'; + for (var i = 0, len = glpyhiconsLines.length; i < len; i++) { + var match = glpyhiconsLines[i].match(iconClassName) + + if (match != null) { + glyphiconsData += '- ' + match[1] + '\n' + } + } + + // Create the `_data` directory if it doesn't already exist + if (!fs.existsSync('docs/_data')) fs.mkdirSync('docs/_data') + + fs.writeFileSync('docs/_data/glyphicons.yml', glyphiconsData) +}