Merge branch 'master' into doc-updates

Author: etpinard

.gitignore

@@ -3,7 +3,4 @@ node_modules
 build/*
 !build/README.md
 
-dist/*
-!dist/README.md
-
 npm-debug.log

.jshintrc

@@ -0,0 +1,72 @@
+{
+  // environments
+  "browser": true,  // Define globals exposed by modern browsers.
+  "jquery": false,  // Define globals exposed by jQuery.
+  "node": true,     // Define globals exposed by Node.js.
+  "jasmine": true,  // Define globals exposed by jasmine
+
+  // enforcing (true means bug us about it)
+  "camelcase": false,  // Force all variable names to use either camelCase style or UPPER_CASE with underscores.
+  "curly": false,  // This option requires you to always put curly braces around blocks in loops and conditionals.
+  "eqeqeq": true,  // Prohibit use of == and != in favor of === and !==.
+  "es3": true,  // This option tells JSHint that your code needs to adhere to ECMAScript 3 spec (old browsers)
+  "forin": false,  // This option requires all for in loops to filter object's items.
+  "freeze": true,  // This options prohibits overwriting prototypes of native objects such as Array, Date and so on.
+  "immed": true,  // This option prohibits the use of immediate function invocations without wrapping them in parentheses.
+  "indent": 4,  // Enforce tab width of 4 spaces.
+  "latedef": "nofunc",  // Prohibit use of a variable before it is defined.
+  "maxcomplexity": false, // This option lets you control cyclomatic complexity throughout your code.
+  "maxdepth": 6,  // This option lets you control how nested do you want your blocks to be
+  "maxlen": 120,  // Enforce line length to 120 characters
+  "newcap": true,  // Require capitalized names for constructor functions.
+  "noarg": true,  // This option prohibits the use of arguments.caller and arguments.callee.
+  "noempty": true,  // This option warns when you have an empty block in your code.
+  "nonbsp": true,  // This option warns about "non-breaking whitespace" characters.
+  "nonew": true,  // This option prohibits the use of constructor functions for side-effects.
+  "plusplus": false,  // This option prohibits the use of unary increment and decrement operators.
+  "quotmark": "single",  // Enforce use of single quotation marks for strings.
+  "strict": true,  // Enforce placing 'use strict' at the top function scope
+  "trailing": true,  // Prohibit trailing whitespace.
+  "undef": true,  // Prohibit use of explicitly undeclared variables.
+  "unused": true,  // Warn when variables are defined but never used.
+
+  // relaxing (true means DON'T bug us about it)
+  "asi": false,  // This option suppresses warnings about missing semicolons.
+  "boss": false,  // This option suppresses warnings about the use of assignments in cases where comparisons are expected.
+  "debug": false,  // This option suppresses warnings about the debugger statements in your code.
+  "eqnull": true,  // Suppress warnings about == null comparisons.
+  "esnext": true,  // This option tells JSHint that your code uses ECMAScript 6 specific syntax.
+  "evil": false,  // This option suppresses warnings about the use of eval.
+  "expr": false,  // This option suppresses warnings about the use of expressions where normally you would expect to see assignments or function calls.
+  "funcscope": false,  // This option suppresses warnings about declaring variables inside of control structures while accessing them later from the outside.
+  "globalstrict": false,  // This option suppresses warnings about the use of global strict mode.
+  "iterator": false,  // This option suppresses warnings about the __iterator__ property.
+  "lastsemic": false,  // This option suppresses warnings about missing semicolons
+  "laxbreak": false,  // This option suppresses most of the warnings about possibly unsafe line breakings in your code.
+  "laxcomma": false,  // This option suppresses warnings about comma-first coding style
+  "loopfunc": false,  // This option suppresses warnings about functions inside of loops.
+  "maxerr": 500,  // This options allows you to set the maximum amount of warnings JSHint will produce before giving up.
+  "moz": false,  // This options tells JSHint that your code uses Mozilla JavaScript extensions.
+  "multistr": false,  // This option suppresses warnings about multi-line strings.
+  "notypeof": false,  // This option suppresses warnings about invalid typeof operator values.
+  "proto": false,  // This option suppresses warnings about the __proto__ property.
+  "scripturl": false,  // This option suppresses warnings about the use of script-targeted URLs—such as javascript:...
+  "shadow": false,  // This option suppresses warnings about variable shadowing
+  "sub": false,  // This option suppresses warnings about using [] notation when it can be expressed in dot notation
+  "supernew": false,  // This option suppresses warnings about "weird" constructions like new function () { ... } and new Object;
+  "validthis": false,  // This option suppresses warnings about possible strict violations when the code is running in strict mode
+  "noyield": false,  // This option suppresses warnings about generator functions with no yield statement in them.
+
+  // global pre defined variables
+  "predef": [
+    "JSON",
+    "Uint8Array",
+    "Uint16Array",
+    "Uint32Array",
+    "Int8Array",
+    "Int16Array",
+    "Int32Array",
+    "Float32Array",
+    "Float64Array"
+  ]
+}

circle.yml

@@ -0,0 +1,23 @@
+general:
+  artifacts:
+      - "build/test_images/" # relative to the build directory
+      - "build/test_images_diff/" # relative to the build directory
+
+machine:
+  node:
+    version: 4.2.1 
+  services:
+    - docker
+    
+
+dependencies:
+  pre: 
+    - docker pull plotly/imageserver:0.2.1
+  post:
+    - npm run cibuild
+    - docker run -d --name myimageserver -v $PWD:/var/www/streambed/image_server/plotly.js -p 9010:9010 plotly/imageserver:0.2.1; sleep 20
+
+test:
+  override:
+    - sudo lxc-attach -n "$(docker inspect --format '{{.Id}}' myimageserver)" -- bash -c "cd /var/www/streambed/image_server/plotly.js && node test/image/compare_pixels_test.js"
+    - npm run citest-jasmine

devtools/image_viewer/index.html

@@ -2,7 +2,7 @@
 <head>
 </head>
 <body>
-    <div id="plot-list"></div>
+    <div id="plot-list" style="overflow:auto; height:100px;"></div>
     <div id="plot-images"></div>
     <div id="plot-mock"></div>
 

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; })

devtools/test_dashboard/buttons.js

@@ -109,7 +109,7 @@ function plotButtons(plots, figDir) {
     plotlist.appendChild(pummelButton);
 
     var i = 0;
-    var mock = require('./testplots-3d/marker-color.json');
+    var mock = require('@mocks/gl3d_marker-color.json');
     var statusDiv = document.getElementById('status-info');
 
     pummelButton.addEventListener('click', function () {

devtools/test_dashboard/index.html

@@ -11,12 +11,15 @@
 
     <script type="text/javascript" src="../../dist/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
 
-    <script type="text/javascript" src="../../dist/plotly.js" charset="utf-8"></script>
-    <script>PLOTLYENV = { TOPOJSON_URL: '../../src/assets/topojson/' };</script>
+    <!-- use dev plotly.js build -->
+    <script type="text/javascript" src="../../build/plotly.js" charset="utf-8"></script>
+
+    <!-- use local topojson files -->
+    <script>Plotly.setPlotConfig({ topojsonURL: '../../dist/topojson/' });</script>
 
     <script type="text/javascript" src="../../build/test_dashboard-bundle.js"></script>
 
-    <!-- helper functions to manipulate graph div -->
+    <!-- helper functions to manipulate the graph div -->
     <script>
     var Tabs = {
         getGraph: function() {

devtools/test_dashboard/server.js

@@ -17,13 +17,13 @@ var PORT = '8080';
 var testFile;
 switch(process.argv[2]) {
     case 'geo':
-        testFile = './test-geo';
+        testFile = 'test_geo';
     break;
-    case '2d':
-        testFile = './test-2d';
+    case 'gl3d':
+        testFile = 'test_gl3d';
     break;
     default:
-        testFile = './test-3d';
+        testFile = 'test_gl2d';
 }
 
 console.log('Using ' + testFile);