diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..44491d3 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "bower_components" +} diff --git a/.gitignore b/.gitignore index 218342e..3bb6374 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .DS_Store +bower_components/ build/ node_modules/ release/ diff --git a/Gruntfile.js b/Gruntfile.js index 4da1ff9..2dfc730 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,7 +18,7 @@ grunt.initConfig({ build : ['build/'], build_res: ['build/*-r.css'], release : ['release/<%= pkg.version %>/'], - base : ['src/base/css/', 'src/base/tests/', 'src/base/LICENSE.md'] + base : ['src/base/css/', 'src/base/LICENSE.md'] }, // -- Copy Config ---------------------------------------------------------- @@ -40,8 +40,8 @@ grunt.initConfig({ normalize: { expand : true, flatten: true, - cwd : '../normalize.css/', - src : '{LICENSE.md,normalize.css,test.html}', + cwd : 'bower_components/normalize-css/', + src : '{LICENSE.md,normalize.css}', dest : 'src/base/', rename: function (dest, file) { @@ -49,10 +49,6 @@ grunt.initConfig({ return path.join(dest, 'css', file); } - if (grunt.file.isMatch('*.html', file)) { - return path.join(dest, 'tests', 'manual', file); - } - return path.join(dest, file); }, @@ -236,6 +232,7 @@ grunt.registerTask('default', [ ]); grunt.registerTask('import', [ + 'bower-install', 'import-normalize' ]); @@ -253,6 +250,17 @@ grunt.registerTask('import-normalize', [ 'contextualize:normalize' ]); +// -- Bower Task --------------------------------------------------------------- + +grunt.registerTask('bower-install', 'Installs Bower dependencies.', function () { + var bower = require('bower'), + done = this.async(); + + bower.commands.install() + .on('data', function (data) { grunt.log.write(data); }) + .on('end', done); +}); + // -- License Task ------------------------------------------------------------- grunt.registerMultiTask('license', 'Stamps license banners on files.', function () { diff --git a/HISTORY.md b/HISTORY.md index bacefa9..d33c442 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,7 +4,10 @@ Pure Change History NEXT ---- -* Clean up manual test files, removing unnecessary CSS files and cruft. +* Integrated Bower into `grunt import` process. + +* Cleaned up manual test files, removing unnecessary CSS files and cruft. + 0.0.2 (2013-05-16) ------------------ diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..7bd25ea --- /dev/null +++ b/bower.json @@ -0,0 +1,7 @@ +{ + "name": "pure", + "version": "0.0.3pre", + "devDependencies": { + "normalize-css": "1.x" + } +} diff --git a/package.json b/package.json index ffae356..00004be 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "grunt-contrib-clean": "~0.4.1", "grunt-contrib-copy": "~0.4.1", "grunt-contrib-concat": "~0.3.0", - "grunt-contrib-compress": "~0.5.0" + "grunt-contrib-compress": "~0.5.0", + "bower": "~0.9.2" } }