put image viewer in functional state

Author: etpinard

devtools/image_viewer/server.js

@@ -4,6 +4,7 @@ var path = require('path');
 var exec = require('child_process').exec;
 
 var browserify = require('browserify');
+var brfs = require('brfs');
 var ecstatic = require('ecstatic');
 var _open = require('open');
 
@@ -15,23 +16,31 @@ var PORT = '9090';
 
 console.log('Listening on :' + PORT + '\n');
 
-var listName = 'list-of-incorrect-images.txt';
+var listPath = constants.pathToTestImagesDiffList;
+var listCMD = [
+    'ls',
+    constants.pathToTestImagesDiff,
+    '>',
+    listPath
+].join(' ');
 
 // build image viewer bundle
 fs.unlink(constants.pathToImageViewerBundle, function() {
-    exec('ls ../test-images-diffs/ > ' + listName, function() {
-        var b = browserify(path.join(__dirname, './viewer.js'), { debug: true });
+    exec(listCMD, function() {
+        var b = browserify(path.join(__dirname, './viewer.js'), {
+            debug: true,
+            transform: [brfs]
+        });
 
-        b.transform('brfs');
         b.bundle(function(err) {
             if(err) throw err;
 
             _open('http://localhost:' + PORT + '/devtools/image_viewer');
         })
         .pipe(fs.createWriteStream(constants.pathToImageViewerBundle));
 
-        fs.readFile(listName, 'utf8', function(err, data) {
-            console.log('In ' + listName + ':\n' + data);
+        fs.readFile(listPath, 'utf8', function(err, data) {
+            console.log('In ' + listPath + ':\n' + data);
         });
     });
 });

devtools/image_viewer/viewer.js

@@ -1,17 +1,23 @@
 var fs = require('fs');
+
 var d3 = require('d3');
 
+var constants = require('../../tasks/util/constants');
+
+
 var $plotlist = document.getElementById('plot-list'),
     $images = document.getElementById('plot-images'),
     $mock = document.getElementById('plot-mock');
 
-var dirBaseline = '../test-images-baseline/',
-    dirTest = '../test-images/',
-    dirDiff = '../test-images-diffs/',
-    dirMocks = '../mocks/';
+var dirBaseline = constants.pathToTestImageBaselines,
+    dirTest = constants.pathToTestImages,
+    dirDiff = constants.pathToTestImagesDiff,
+    dirMocks = constants.pathToTestImageMocks;
 
+// N.B. brfs only understand hard-coded paths
 var imageNames = fs.readFileSync(
-        __dirname + '/list-of-incorrect-images.txt', 'utf8'
+       __dirname + '/../../build/list_of_incorrect_images.txt',
+        'utf8'
     )
     .split('\n')
     .filter(function(x) { return x; })

tasks/util/constants.js

@@ -32,6 +32,7 @@ module.exports = {
     pathToTestImageBaselines: path.join(pathToImageTest, 'baselines/'),
     pathToTestImages: path.join(pathToBuild, 'test_images/'),
     pathToTestImagesDiff: path.join(pathToBuild, 'test_images_diff/'),
+    pathToTestImagesDiffList: path.join(pathToBuild, 'list_of_incorrect_images.txt'),
 
     uglifyOptions: {
         fromString: true,