HTML minification + Improve configuration management

.gitignore

@@ -3,3 +3,6 @@ node_modules
 
 #grunt-rev
 rev-manifest.json
+
+#Configuration
+config.toml

config.dev.toml

@@ -0,0 +1,4 @@
+baseurl = "http://0.0.0.0:6789"
+languageCode = "en"
+title = "César Suárez, Software Engineer"
+googleAnalytics = "UA-38378447-1"

config.toml → config.prod.toml

@@ -1,4 +1,3 @@
-# For development: baseurl="http://0.0.0.0:6789"
 baseurl = "http://csuarez.me"
 languageCode = "en"
 title = "César Suárez, Software Engineer"

deploy.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
-echo -e "\033[0;32mDeploying updates to GitHub...\033[0m"
+echo "\033[0;32mDeploying updates to GitHub...\033[0m"
 
 # Build the project.
 npm install
+gulp config-prod
 gulp build
 
 # Go To Public folder

gulpfile.js

@@ -14,6 +14,8 @@ var imagemin = require('gulp-imagemin');
 var rev = require('gulp-rev');
 var buffer = require('gulp-buffer');
 var revCollector = require('gulp-rev-collector');
+var htmlmin = require('gulp-htmlmin');
+var rename = require('gulp-rename');
 
 var sassInput = './stylesheets/**/*.scss';
 var sassOutput = './public/css';
@@ -38,12 +40,14 @@ var hugoInput = [
 ];
 
 var imageInput = './static/img/**/*';
+var imageOutput = './public/img';
 
-var imageOutput = './public/img'
+var configDevFile = './config.dev.toml';
+var configProdFile = './config.prod.toml';
 
 gulp.task('default', ['serve']);
 
-gulp.task('build', ['hugo', 'sass', 'js', 'img', 'replace']);
+gulp.task('build', ['hugo', 'sass', 'js', 'img', 'html']);
 
 gulp.task('hugo', function() {
   return buildHugo();
@@ -61,16 +65,25 @@ gulp.task('img', function() {
   return buildImages();
 });
 
-gulp.task('replace', function() {
-  return gulp
-    .src(['./rev-manifest.json', './public/**/*.html'])
-    .pipe(revCollector({
-      replaceReved: true
-    }))
-    .pipe(gulp.dest('public'));
+gulp.task('html', function() {
+  return buildHtml();
+});
+
+gulp.task('config-dev', function() {
+  return changeConfigFile(configDevFile);
+});
+
+gulp.task('config-prod', function() {
+  return changeConfigFile(configProdFile);
 });
 
 gulp.task('watch', function() {
+
+  changeConfigFile(configDevFile);
+  buildHugo();
+  buildSass();
+  buildJs();
+
   watch(sassInput, function (vinyl) {
     gutil.log(gutil.colors.green(vinyl.relative), 'fired', gutil.colors.green(vinyl.event));
     return buildSass().pipe(connect.reload());
@@ -154,6 +167,16 @@ function buildImages() {
     .pipe(gulp.dest(imageOutput));
 }
 
+function buildHtml() {
+  return gulp
+    .src(['./rev-manifest.json', './public/**/*.html'])
+    .pipe(revCollector({
+      replaceReved: true
+    }))
+    .pipe(htmlmin({collapseWhitespace: true}))
+    .pipe(gulp.dest('public'));
+}
+
 function handleError(error) {
   gutil.beep();
   var message = null;
@@ -165,3 +188,9 @@ function handleError(error) {
   gutil.log(gutil.colors.red(message));
   this.emit('end');
 }
+
+function changeConfigFile(newConfigFile) {
+  return gulp.src(newConfigFile)
+    .pipe(rename('config.toml'))
+    .pipe(gulp.dest('./'));
+}

package.json

@@ -10,8 +10,10 @@
     "gulp-concat": "^2.6.0",
     "gulp-connect": "^2.3.1",
     "gulp-cssnano": "^2.1.0",
+    "gulp-htmlmin": "^1.3.0",
     "gulp-imagemin": "^2.4.0",
     "gulp-plumber": "^1.0.1",
+    "gulp-rename": "^1.2.2",
     "gulp-rev": "^7.0.0",
     "gulp-rev-collector": "^1.0.2",
     "gulp-sass": "^2.1.1",