Added build system

Author: trygve-lie

.gitignore

@@ -20,4 +20,6 @@ tmp/**/*
 .idea
 .idea/**/*
 *.iml
-*.log
+*.log
+
+public/build/

.npmignore

@@ -0,0 +1,3 @@
+node_modules
+npm-debug.log
+public/src/

bin/app.js

@@ -6,7 +6,12 @@ var config      = require('./config.js'),
     middleware  = require('./middleware.js'),
     log         = require('./log.js'),
     express     = require('express'),
-    app         = express();
+    app         = express(),
+    externals   = {
+        js      : (config.get('env') === 'development') ? config.get('jsFiles') : config.get('jsMinFile'),
+        css     : (config.get('env') === 'development') ? config.get('cssFiles') : config.get('cssMinFile')
+    };
+
 
 
 // Configure app
@@ -34,43 +39,43 @@ app.set('view engine', 'ejs');
 // Set http routes
 
 app.get('/', function(req, res){
-    res.render('index', { pageTitle: 'Web Rebels ☠ Oslo ☠ 2014' });
+    res.render('index', {externals: externals, pageTitle: 'Web Rebels ☠ Oslo ☠ 2014' });
 });
 app.get('/index', function(req, res){
-    res.render('index', { pageTitle: 'Web Rebels ☠ Oslo ☠ 2014' });
+    res.render('index', {externals: externals, pageTitle: 'Web Rebels ☠ Oslo ☠ 2014' });
 });
 app.get('/sponsors', function(req,res){
-    res.render('sponsors', {pageTitle: 'Our sponsors without whom none of this would be possible ☠ Web Rebels ☠ Oslo 2014'});
+    res.render('sponsors', {externals: externals, pageTitle: 'Our sponsors without whom none of this would be possible ☠ Web Rebels ☠ Oslo 2014'});
 });
 app.get('/sponsoroptions', function(req,res){
-    res.render('sponsoroptions', {pageTitle: 'Sponsoring options for the Web Rebels ☠ Oslo 2014'});
+    res.render('sponsoroptions', {externals: externals, pageTitle: 'Sponsoring options for the Web Rebels ☠ Oslo 2014'});
 });
 app.get('/about', function(req,res){
-    res.render('about', {pageTitle: '☠ About the Web Rebels ☠'});
+    res.render('about', {externals: externals, pageTitle: '☠ About the Web Rebels ☠'});
 });
 app.get('/tickets', function(req,res){
-    res.render('tickets', {pageTitle: 'Tickets for the Web Rebels ☠ Oslo 2014'});
+    res.render('tickets', {externals: externals, pageTitle: 'Tickets for the Web Rebels ☠ Oslo 2014'});
 });
 app.get('/ticketConfirmation', function(req,res){
-    res.render('ticketConfirmation', {pageTitle: 'Thank you for registering with the Web Rebels ☠ Oslo 2014'});
+    res.render('ticketConfirmation', {externals: externals, pageTitle: 'Thank you for registering with the Web Rebels ☠ Oslo 2014'});
 });
 app.get('/location', function(req,res){
-    res.render('location', {pageTitle: 'Location of the Web Rebels ☠ Oslo 2014'});
+    res.render('location', {externals: externals, pageTitle: 'Location of the Web Rebels ☠ Oslo 2014'});
 });
 app.get('/oslo', function(req,res){
-    res.render('oslo', {pageTitle: 'Oslo survival guide for Web Rebels ☠ Oslo 2014'});
+    res.render('oslo', {externals: externals, pageTitle: 'Oslo survival guide for Web Rebels ☠ Oslo 2014'});
 });
 app.get('/openmic', function(req,res){
-    res.render('openmic', {pageTitle: 'Open Mic Night - Web Rebels ☠ Oslo 2014'});
+    res.render('openmic', {externals: externals, pageTitle: 'Open Mic Night - Web Rebels ☠ Oslo 2014'});
 });
 app.get('/schedule', function(req,res){
-    res.render('schedule', {pageTitle: 'Schedule for Web Rebels ☠ Oslo 2014'});
+    res.render('schedule', {externals: externals, pageTitle: 'Schedule for Web Rebels ☠ Oslo 2014'});
 });
 app.get('/speakers', function(req,res){
-    res.render('speakers', {pageTitle: 'Speakers - Web Rebels ☠ Oslo 2014'});
+    res.render('speakers', {externals: externals, pageTitle: 'Speakers - Web Rebels ☠ Oslo 2014'});
 });
 app.get('/roadbook', function(req,res){
-    res.render('roadbook', {pageTitle: 'Speakers Roadbook - Web Rebels ☠ Oslo 2014'});
+    res.render('roadbook', {externals: externals, pageTitle: 'Speakers Roadbook - Web Rebels ☠ Oslo 2014'});
 });
 
 

bin/config.js

@@ -14,7 +14,8 @@ env: {
     doc: "Applicaton environments",
         format  : ["development", "production"],
         default : "development",
-        env     : "NODE_ENV"
+        env     : "NODE_ENV",
+        arg     : "env"
     },
 
     version: {
@@ -34,7 +35,7 @@ env: {
     docRoot: {
         doc     : "Document root for static files to be served by the http server",
         format  : "*",
-        default : "./public",
+        default : "./public/src",
         env     : "NODE_HTTP_DOC_ROOT"
     },
 
@@ -56,14 +57,65 @@ env: {
         doc     : "Which level the console transport log should log at",
         format  : "*",
         default : "info",
-        env     : "NODE_LOG_CONSOLE_LEVEL"
+        env     : "NODE_LOG_CONSOLE_LEVEL",
+        arg     : "log-console-level"
     },
 
     logConsoleSilent: {
         doc     : "If the console transport log should be silent or not",
         format  : "*",
         default : false,
-        env     : "NODE_LOG_CONSOLE_SILENT"
+        env     : "NODE_LOG_CONSOLE_SILENT",
+        arg     : "log-console-silent"
+    },
+
+    jsFiles: {
+        doc     : "Non minified JavaScript files - Use relative path to 'docRoot'",
+        format  : Array,
+        default : [
+            '/js/lib/leaflet-0.7.1/leaflet-src.js',
+            '/js/lib/derp-modules.js',
+            '/js/map.js'
+        ],
+        env     : "NODE_JS_FILES"
+    },
+
+    cssFiles: {
+        doc     : "Non minified CSS files - Use relative path to 'docRoot'",
+        format  : Array,
+        default : [
+            '/css/style.css',
+            '/js/lib/leaflet-0.7.1/leaflet.css'
+        ],
+        env     : "NODE_CSS_FILES"
+    },
+
+    gfxFiles: {
+        doc     : "Source graphic files - Use relative path to 'docRoot'",
+        format  : Array,
+        default : ['/img/**/*'],
+        env     : "NODE_GFX_FILES"
+    },
+
+    fontFiles: {
+        doc     : "Source font files - Use relative path to 'docRoot'",
+        format  : Array,
+        default : ['/webfonts/**/*'],
+        env     : "NODE_FONT_FILES"
+    },
+
+    jsMinFile: {
+        doc     : "Minified JavaScript file",
+        format  : Array,
+        default : ['/js/scripts.min.js'],
+        env     : "NODE_JS_MIN_FILE"
+    },
+
+    cssMinFile: {
+        doc     : "Minified CSS file",
+        format  : Array,
+        default : ['/css/styles.min.css'],
+        env     : "NODE_CSS_MIN_FILE"
     }
 
 });

config/production.json

@@ -1,3 +1,4 @@
 {
+    "docRoot" 			: "./public/build",
     "logConsoleLevel"   : "error"
 }

gulpfile.js

@@ -0,0 +1,62 @@
+/* jshint node: true, strict: true */
+
+"use strict";
+
+
+var gulp        = require('gulp'),
+    concat      = require('gulp-concat'),
+    uglify      = require('gulp-uglify'),
+    minifyCSS   = require('gulp-minify-css'),
+    config      = require('./bin/config.js');
+
+
+
+function prependDocRoot(path) {
+    return config.get('docRoot') + path;
+}
+
+
+
+// Minify JS
+
+gulp.task('js', function() {
+    return gulp.src(config.get('jsFiles').map(prependDocRoot))
+        .pipe(uglify({outSourceMap: false}))
+        .pipe(concat(config.get('jsMinFile')[0]))
+        .pipe(gulp.dest('public/build'));
+});
+
+
+
+// Minify CSS
+
+gulp.task('css', function() {
+    return gulp.src(config.get('cssFiles').map(prependDocRoot))
+        .pipe(minifyCSS({removeEmpty : true}))
+        .pipe(concat(config.get('cssMinFile')[0]))
+        .pipe(gulp.dest('public/build'));
+});
+
+
+
+// Copy gfx
+
+gulp.task('gfx', function() {
+    return gulp.src(config.get('gfxFiles').map(prependDocRoot))
+        .pipe(gulp.dest('public/build/img'));
+});
+
+
+
+// Copy fonts
+
+gulp.task('fonts', function() {
+    return gulp.src(config.get('fontFiles').map(prependDocRoot))
+        .pipe(gulp.dest('public/build/webfonts'));
+});
+
+
+
+// The default task
+
+gulp.task('default', ['js', 'css', 'gfx', 'fonts']);

package.json

@@ -16,11 +16,13 @@
     "javascript",
     "web"
   ],
-  "homepage": "http://webreb2014.jit.su/",
+  "homepage": "https://www.webrebels.org/",
   "scripts": {
-    "pretest": "jshint ./bin/*.js ./test/*.js",
+    "pretest": "jshint ./bin/*.js ./gulpfile.js ./public/src/js/*.js",
     "test": "mocha ./test/*.js --reporter spec",
-    "start": "node ./bin/server.js"
+    "start": "node ./bin/server.js",
+    "minify": "gulp",
+    "prepublish": "gulp"
   },
   "contributors": [
     {
@@ -51,7 +53,11 @@
   "devDependencies": {
     "jshint": "latest",
     "mocha": "latest",
-    "chai": "latest"
+    "chai": "latest",
+    "gulp": "latest",
+    "gulp-concat": "latest",
+    "gulp-uglify": "latest",
+    "gulp-minify-css" : "latest"
   },
   "dependencies": {
     "winston": "0.7.x",

public/build/.placeholder

@@ -0,0 +1 @@
+Nothing here...

public/css/style.min.css

@@ -0,0 +1,78 @@
+// Source: https://gist.github.com/3861744
+// Added to project at: 2013.01.08
+//
+// Simple, tiny, dumb module definitions for Browser JavaScript.
+//
+// What it does:
+//
+// * Tiny enough to include anywhere. Intended as a shim for delivering
+//   browser builds of your library to folks who don't want to use script loaders.
+// * Exports modules to `__modules__`, a namespace on the global object.
+//   This is an improvement over typical browser code, which pollutes the
+//   global object.
+// * Prettier and more robust than the
+//   [IIFE module pattern](http://addyosmani.com/resources/essentialjsdesignpatterns/book/#revealingmodulepatternjavascript),
+//   and if you have multiple modules, it's really no bigger.
+// * It's a compatible sub-set of AMD, so if you switch to a script loader,
+//   it will "just work".
+// * Lets you know if your dependencies are awry.
+// * Passes you a syncronous require, making this an option for wrapping
+//   Node libraries that don't require server features
+//   (e.g. wrap it with a Makefile or somesuch).
+// * Helpful for development. Syncronous `require` means you can easily test
+//   code live in REPLs like the Console or Scratchpad:
+//
+//       >> require('foo').bar()
+//       >> 3
+//
+// What it doesn't:
+//
+// * Does not handle script loading. You order your script tags yourself.
+//   BUT, it does throw helpful exceptions, letting you know if you've
+//   loaded your scripts out of order.
+// * Does not do path mapping. Module IDs are absolute.
+// * No AMD plugin/loader support, but could support inlined loader plugin
+//   resources like 'text!...' ones. A reasonable tradeoff for size.
+// * Does not support the second AMD form `define(['a', 'b'], function (a, b) {})`.
+//   YAGNI.
+//
+// Motivation: make `define`/`require`/`exports` wrappers a practical module
+// format for distributing libraries to folks, whether or not they use an
+// AMD script loader.
+
+// Create a hash to store our modules.
+var modules = window.__modules__ = {};
+
+// Require a module at an id. Returns the module's `exports` object.
+// `require` looks for modules on `window` and throws an exception when it
+// doesn't find them.
+function require(id) {
+  // Get the module's exports.
+  var exports = modules[id];
+  // If there is no module yet, throw an exception, letting us know we've
+  // loaded our scripts out of order.
+  if(!exports) throw new Error(id + ' module not yet defined');
+  return exports;
+}
+
+// Create an AMD-style define function, for defining new modules.
+// This function takes an ID and a callback that exports your module.
+// `exports` are added under `path` to `window`.
+//
+// * The path can be any valid key. Usually the name of your module. The key
+//   will be assigned to the global object, so be sure it's unique.
+// * Callback is where you construct your module and export values.
+//   It gets a "require" function and an "exports" object.
+//
+// This is basically a subset of AMD's define. Modules using this pattern
+// should be compatible with AMD loaders, and  Modules authored for AMD
+// should work if they have a path key.
+function define(id, callback) {
+  // Throw an exception if the module already exists.
+  if(modules[id]) throw new Error(id + ' module or property already exists');
+  var exports = {};
+  // Assign module to to namespace. If `callback` returns a value, use that
+  // as the module value. Otherwise, use `exports`. Allowing return values
+  // makes define compatible with a greater subset of AMD code.
+  return modules[id] = callback(require, exports) || exports;
+}