From 72c8b3d7fe2437807137c25daf524a33429f1f3d Mon Sep 17 00:00:00 2001
From: Matthias Kretschmann <m@kretschmann.io>
Date: Sun, 7 Jun 2015 03:11:46 +0200
Subject: [PATCH] more refinements

---
 gulpfile.js  | 53 +++++++++++++++++++++++++++++++++++++++++++---------
 package.json |  8 +++++++-
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index eb387517..b5ebbf8c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -18,14 +18,17 @@ var runSequence = require('run-sequence');
 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 var src = '_src',
-    dist = '_site';
+    dist = '_site',
+    cdn = 'https://d2jlreog722xe2.cloudfront.net';
 
 var banner = [
     '/**',
-    ' ** <%= pkg.name %> - <%= pkg.description %>',
+    ' ** <%= pkg.name %> v<%= pkg.version %>',
+    ' ** <%= pkg.description %>',
+    ' ** <%= pkg.homepage %>\n' +
+    ' **\n' +
     ' ** <%= pkg.repository.url %>',
-    ' ** @author <%= pkg.author %>',
-    ' ** @version v<%= pkg.version %>',
+    ' ** <%= pkg.author.name %> <<%= pkg.author.email %>>',
     ' **/',
     ''
 ].join('\n');
@@ -50,7 +53,16 @@ gulp.task('clean', function(cb) {
 //
 gulp.task('jekyll', function (cb){
     var spawn = require('child_process').spawn;
-    var jekyll = spawn('jekyll', ['build'], {stdio: 'inherit'});
+    var jekyll = spawn('jekyll', ['build', '--drafts', '--future'], {stdio: 'inherit'});
+
+    jekyll.on('exit', function(code) {
+        cb(code === 0 ? null : 'ERROR: Jekyll process exited with code: '+code);
+    });
+});
+
+gulp.task('jekyll:production', function (cb){
+    var spawn = require('child_process').spawn;
+    var jekyll = spawn('jekyll', ['build', '--lsi'], {stdio: 'inherit'});
 
     jekyll.on('exit', function(code) {
         cb(code === 0 ? null : 'ERROR: Jekyll process exited with code: '+code);
@@ -92,6 +104,7 @@ gulp.task('js-libraries', function() {
         CustomElements = gulp.src('node_modules/webcomponents.js/CustomElements.js')
 
     return merge(jquery, picturefill, CustomElements)
+        .pipe($.uglify())
         .pipe($.rename({suffix: '.min'}))
         .pipe(gulp.dest(dist + '/assets/js/'))
 });
@@ -151,13 +164,13 @@ gulp.task('media', function() {
 //
 gulp.task('imagemin', function () {
     return gulp.src(dist + '/**/*.{png,jpg,jpeg,gif,svg}')
-        .pipe($.imagemin({
-            optimizationLevel: 5, // png
+        .pipe($.cache($.imagemin({
+            optimizationLevel: 4, // png
             progressive: true,    // jpg
             interlaced: true,     // gif
             multipass: true,      // svg
             svgoPlugins: [{removeViewBox: false}]
-        }))
+        })))
         .pipe(gulp.dest(dist));
 });
 
@@ -187,6 +200,26 @@ gulp.task('revision-replace', function() {
         .pipe(gulp.dest(dist));
 });
 
+
+//
+// CDN url injection
+//
+gulp.task('cdn',function(){
+    // html
+    return gulp.src([dist + '/**/*.html'])
+        .pipe($.replace('/assets/js/', cdn + '/assets/js/'))
+        .pipe($.replace('/assets/img/', cdn + '/assets/img/'))
+        .pipe($.replace('/media/', cdn + '/media/'))
+        .pipe($.replace('https://kremalicious.com' + cdn + '/media/', 'https://kremalicious.com/media/'))
+        .pipe(gulp.dest(dist));
+
+    // css
+    return gulp.src([dist + '/assets/css/*.css'])
+        .pipe($.replace('../', cdn + '/assets/'))
+        .pipe(gulp.dest(dist));
+});
+
+
 //
 // Dev Server
 //
@@ -226,16 +259,18 @@ gulp.task('server', function(cb) {
     );
 });
 
+
 //
 // Production build
 //
 gulp.task('build', function(cb) {
     runSequence(
         'clean',
-        'jekyll',
+        'jekyll:production',
         ['css', 'js', 'images', 'fonts', 'media'],
         'revision',
         'revision-replace',
+        'cdn',
         'imagemin',
         cb
     );
diff --git a/package.json b/package.json
index a0ae2690..c79aecdd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,11 @@
 {
   "name": "kremalicious",
-  "author": "Matthias Kretschmann <m@kretschmann.io>",
+  "author": {
+      "name": "Matthias Kretschmann",
+      "email": "m@kretschmann.io"
+  },
   "description": "Blog of Matthias Kretschmann",
+  "homepage": "https://kremalicious.com",
   "version": "3.0.0",
   "license": "MIT",
   "main": "gulpfile.js",
@@ -21,6 +25,7 @@
     "del": ">=1.2.0",
     "gulp": ">=3.8.0",
     "gulp-autoprefixer": ">=2.3.0",
+    "gulp-cache": ">=0.2.10",
     "gulp-combine-mq": ">=0.4.0",
     "gulp-concat": ">=2.5.2",
     "gulp-connect": ">=2.0.5",
@@ -29,6 +34,7 @@
     "gulp-imagemin": ">=2.2.1",
     "gulp-load-plugins": ">=0.10.0",
     "gulp-rename": ">=1.2.2",
+    "gulp-replace": ">=0.5.3",
     "gulp-rev": ">=4.0.0",
     "gulp-rev-replace": ">=0.4.1",
     "gulp-stylus": ">=2.0.3",