tasks: use common utils

Author: etpinard

tasks/bundle.js

@@ -4,8 +4,10 @@ var path = require('path');
 var browserify = require('browserify');
 var UglifyJS = require('uglify-js');
 
-var compressAttributes = require('./util/compress_attributes');
 var constants = require('./util/constants');
+var common = require('./util/common');
+var compressAttributes = require('./util/compress_attributes');
+var doesFileExist = common.doesFileExist;
 
 /*
  * This script takes one argument
@@ -23,18 +25,13 @@ var DEV = (arg === 'dev') || (arg === '--dev');
 
 
 // Check if style and font build files are there
-try {
-    fs.statSync(constants.pathToCSSBuild).isFile();
-    fs.statSync(constants.pathToFontSVGBuild).isFile();
-}
-catch(e) {
+if(!doesFileExist(constants.pathToCSSBuild) || !doesFileExist(constants.pathToFontSVG)) {
     throw new Error([
         'build/ is missing one or more files',
         'Please run `npm run preprocess` first'
     ].join('\n'));
 }
 
-
 // Browserify plotly.js
 _bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDist, {
     standalone: 'Plotly',

tasks/cibundle.js

@@ -2,8 +2,9 @@ var fs = require('fs');
 
 var browserify = require('browserify');
 
-var compressAttributes = require('./util/compress_attributes');
 var constants = require('./util/constants');
+var common = require('./util/common');
+var compressAttributes = require('./util/compress_attributes');
 
 /*
  * Trimmed down version of ./bundle.js for CI testing
@@ -20,17 +21,13 @@ browserify(constants.pathToPlotlyIndex, {
     standalone: 'Plotly',
     transform: [compressAttributes]
 })
-.bundle(function(err) {
-    if(err) throw err;
-})
+.bundle(common.throwOnError)
 .pipe(fs.createWriteStream(constants.pathToPlotlyBuild));
 
 
 // Browserify the geo assets
 browserify(constants.pathToPlotlyGeoAssetsSrc, {
     standalone: 'PlotlyGeoAssets'
 })
-.bundle(function(err) {
-    if(err) throw err;
-})
+.bundle(common.throwOnError)
 .pipe(fs.createWriteStream(constants.pathToPlotlyGeoAssetsDist));

tasks/header.js

@@ -6,6 +6,7 @@ var falafel = require('falafel');
 var glob = require('glob');
 
 var constants = require('./util/constants');
+var common = require('./util/common');
 
 // main
 addHeadersInDistFiles();
@@ -14,9 +15,7 @@ updateHeadersInSrcFiles();
 // add headers to dist files
 function addHeadersInDistFiles() {
     function _prepend(path, header) {
-        prependFile(path, header + '\n', function(err) {
-            if(err) throw err;
-        });
+        prependFile(path, header + '\n', common.throwOnError);
     }
 
     // add header to main dist bundles
@@ -77,9 +76,7 @@ function updateHeadersInSrcFiles() {
 
                     var newCode = licenseSrc + '\n' + codeLines.join('\n');
 
-                    fs.writeFile(file, newCode, function(err) {
-                        if(err) throw err;
-                    });
+                    common.writeFile(file, newCode);
                 }
                 else {
                     // otherwise, throw an error

test/image/compare_pixels_test.js

@@ -1,5 +1,6 @@
 var fs = require('fs');
 
+var common = require('../../tasks/util/common');
 var getMockList = require('./assets/get_mock_list');
 var getRequestOpts = require('./assets/get_image_request_options');
 var getImagePaths = require('./assets/get_image_paths');
@@ -149,7 +150,7 @@ function comparePixels(mockName, cb) {
     function checkImage() {
 
         // baseline image must be generated first
-        if(!doesFileExist(imagePaths.baseline)) {
+        if(!common.doesFileExist(imagePaths.baseline)) {
             var err = new Error('baseline image not found');
             return onEqualityCheck(err, false);
         }
@@ -186,7 +187,7 @@ function comparePixels(mockName, cb) {
 
     function onEqualityCheck(err, isEqual) {
         if(err) {
-            touch(imagePaths.diff);
+            common.touch(imagePaths.diff);
             return console.error(err, mockName);
         }
         if(isEqual) {
@@ -200,18 +201,3 @@ function comparePixels(mockName, cb) {
         .pipe(saveImageStream)
         .on('close', checkImage);
 }
-
-function doesFileExist(filePath) {
-    try {
-        if(fs.statSync(filePath).isFile()) return true;
-    }
-    catch(e) {
-        return false;
-    }
-
-    return false;
-}
-
-function touch(filePath) {
-    fs.closeSync(fs.openSync(filePath, 'w'));
-}