Skip to content

Commit bc97eec

Browse files
committed
Merge pull request #11 from jamesryanbell/dubizzle-add_node_server
Dubizzle add node server, with configuration options
2 parents 663cf1f + 7b52109 commit bc97eec

File tree

4 files changed

+30
-10
lines changed

4 files changed

+30
-10
lines changed

config/chrome.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,9 @@
1818
"/weather"
1919
],
2020
"outputDir": "shots/bbc",
21-
"maxConnections": 20
21+
"maxConnections": 20,
22+
"server": {
23+
"start": true,
24+
"port": 23423
25+
}
2226
}

lib/gallery.js

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
'use strict';
22

3-
var fs = require('fs');
4-
var path = require('path');
5-
var mustache = require('mustache');
6-
var helpers = require('./helpers');
7-
var log = require('./logger');
3+
var fs = require('fs');
4+
var path = require('path');
5+
var mustache = require('mustache');
6+
var helpers = require('./helpers');
7+
var log = require('./logger');
8+
var connect = require('connect');
9+
var serveStatic = require('serve-static');
10+
var open = require('open');
811

9-
module.exports.generate = function(dirs, compareList, outputDir, project, cb) {
12+
module.exports.generate = function(dirs, compareList, outputDir, project, server, cb) {
1013
compareList = compareList.sort(helpers.sortByProp('sort'));
1114
var template = path.join(__dirname, '/../gallery.html');
1215
var view = {
@@ -37,7 +40,14 @@ module.exports.generate = function(dirs, compareList, outputDir, project, cb) {
3740
} else {
3841
log.success('Gallery generated');
3942
cb();
43+
44+
if(server.start) {
45+
connect().use(serveStatic(outputDir)).listen(server.port, function(){
46+
open('http://localhost:' + server.port + '/gallery.html');
47+
log.success('Server started on port ' + server.port);
48+
});
49+
}
4050
}
4151
});
4252
});
43-
};
53+
};

lib/wraith.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ Wraith.prototype.config = function(config) {
5151
self.sizes = [];
5252
self.dirs = [];
5353
self.quiet = config.quiet || false;
54+
self.server = {};
55+
self.server.start = config.server.start || false;
56+
self.server.port = config.server.port || 9090;
5457

5558
if(typeof config.paths !== 'undefined' && config.paths.length > 0 ) {
5659
self.urls = config.paths;
@@ -298,5 +301,5 @@ Wraith.prototype.compareScreenshots = function() {
298301

299302
Wraith.prototype.generateGallery = function() {
300303
var self = this;
301-
gallery.generate(self.dirs, self.compareQueue, self.outputFolder, self.config.project, self.cb);
304+
gallery.generate(self.dirs, self.compareQueue, self.outputFolder, self.config.project, self.server, self.cb);
302305
};

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@
5858
"progress": "^1.1.8",
5959
"rimraf": "~2.2.6",
6060
"w3counter": "^1.0.3",
61-
"webshot": "^0.15.3"
61+
"webshot": "^0.15.3",
62+
"connect": "^3.3.5",
63+
"open": "^0.0.5",
64+
"serve-static": "^1.9.3"
6265
},
6366
"devDependencies": {
6467
"jshint": "^2.5.11",

0 commit comments

Comments
 (0)