Build: Centralises binary naming conventions (build changes part 2)

bin/node-sass

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 var Emitter = require('events').EventEmitter,
     Gaze = require('gaze'),
     grapher = require('sass-graph'),
@@ -13,7 +14,7 @@ var Emitter = require('events').EventEmitter,
 
 var cli = meow({
   pkg: '../package.json',
-  version: process.sassInfo,
+  version: process.sass.versionInfo,
   help: [
     'Usage',
     '  node-sass [options] <input.scss> [output.css]',

lib/extensions.js

@@ -1,6 +1,12 @@
+/*!
+ * node-sass: lib/extensions.js
+ */
+
 var eol = require('os').EOL,
+    flags = require('meow')({ pkg: '../package.json' }).flags,
     fs = require('fs'),
-    package = require('../package.json');
+    package = require('../package.json'),
+    path = require('path');
 
 /**
  * Get Runtime Info
@@ -24,26 +30,103 @@ function getRuntimeInfo() {
 }
 
 /**
- * Get unique name of binary for current platform
+ * Get binary name.
+ * If environment variable SASS_BINARY_NAME or
+ * process aurgument --binary-name is provide,
+ * return it as is, otherwise make default binary
+ * name: {platform}-{arch}-{v8 version}.node
  *
  * @api private
  */
 
-function getBinaryIdentifiableName() {
-  var v8SemVersion = process.versions.v8.split('.').slice(0, 3).join('.');
+function getBinaryName() {
+  var binaryName;
 
-  return [process.platform, '-',
-          process.arch, '-',
-          v8SemVersion].join('');
+  if (flags.binaryName) {
+    binaryName = flags.binaryName;
+  } else if (package.nodeSassConfig && package.nodeSassConfig.binaryName) {
+    binaryName = package.nodeSassConfig.binaryName;
+  } else if (process.env.SASS_BINARY_NAME) {
+    binaryName = process.env.SASS_BINARY_NAME;
+  } else {
+    binaryName = [process.platform, '-',
+                  process.arch, '-',
+                  process.versions.modules].join('');
+  }
+
+  return [binaryName, 'binding.node'].join('_');
 }
 
-function getSassInfo() {
+/**
+ * Retrieve the URL to fetch binary.
+ * If environment variable SASS_BINARY_URL
+ * is set, return that path. Otherwise make
+ * path using current release version and
+ * binary name.
+ *
+ * @api private
+ */
+
+function getBinaryUrl() {
+  return flags.binaryUrl ||
+         package.nodeSassConfig ? package.nodeSassConfig.binaryUrl : null ||
+         process.env.SASS_BINARY_URL ||
+         ['https://github.com/sass/node-sass/releases/download//v',
+          package.version, '/', sass.binaryName].join('');
+}
+
+/**
+ * Get Sass version information
+ *
+ * @api private
+ */
+
+function getVersionInfo() {
   return [
            ['node-sass', package.version, '(Wrapper)', '[JavaScript]'].join('\t'),
            ['libsass  ', package.libsass, '(Sass Compiler)', '[C/C++]'].join('\t'),
   ].join(eol);
 }
 
-process.runtime = getRuntimeInfo();
-process.sassInfo = getSassInfo();
-process.sassBinaryName = getBinaryIdentifiableName();
+var sass = process.sass = {};
+
+sass.binaryName = getBinaryName();
+sass.binaryUrl = getBinaryUrl();
+sass.runtime = getRuntimeInfo();
+sass.versionInfo = getVersionInfo();
+
+/**
+ * Get binary path.
+ * If environment variable SASS_BINARY_PATH or
+ * process aurgument --binary-path is provide,
+ * select it by appending binary name, otherwise
+ * make default binary path using binary name.
+ * Once the primary selection is made, check if
+ * callers wants to throw if file not exists before
+ * returning.
+ *
+ * @param {Boolean} throwIfNotExists
+ * @api private
+ */
+
+sass.getBinaryPath = function(throwIfNotExists) {
+  var binaryPath;
+
+  if (flags.binaryPath) {
+    binaryPath = flags.binaryPath;
+  } else if (package.nodeSassConfig && package.nodeSassConfig.binaryPath) {
+    binaryPath = package.nodeSassConfig.binaryPath;
+  } else if (process.env.SASS_BINARY_PATH) {
+    binaryPath = process.env.SASS_BINARY_PATH;
+  } else {
+    binaryPath = path.join(__dirname, '..', 'vendor', sass.binaryName.replace(/_/, '/'));
+  }
+
+  if (!fs.existsSync(binaryPath) && throwIfNotExists) {
+    throw new Error('`libsass` bindings not found. Try reinstalling `node-sass`?');
+  }
+
+  return binaryPath;
+};
+
+sass.binaryPath = sass.getBinaryPath();

lib/index.js

@@ -1,30 +1,17 @@
-var fs = require('fs'),
-    path = require('path'),
+/*!
+ * node-sass: lib/index.js
+ */
+
+var path = require('path'),
     util = require('util');
 
 require('./extensions');
 
 /**
- * Get binding
- *
- * @api private
+ * Require binding
  */
 
-function getBinding() {
-  var candidates = [
-    path.join(__dirname, '..', 'build', 'Debug', 'binding.node'),
-    path.join(__dirname, '..', 'build', 'Release', 'binding.node'),
-    path.join(__dirname, '..', 'vendor', process.sassBinaryName, 'binding.node')
-  ];
-
-  var candidate = candidates.filter(fs.existsSync).shift();
-
-  if (!candidate) {
-    throw new Error('`libsass` bindings not found. Try reinstalling `node-sass`?');
-  }
-
-  return candidate;
-}
+var binding = require(process.sass.getBinaryPath(true));
 
 /**
  * Get input file
@@ -149,12 +136,6 @@ function getOptions(options, cb) {
   return options;
 }
 
-/**
- * Require binding
- */
-
-var binding = require(getBinding());
-
 /**
  * Render
  *
@@ -246,4 +227,4 @@ module.exports.renderSync = function(options) {
  * @api public
  */
 
-module.exports.info = process.sassInfo;
+module.exports.info = process.sass.versionInfo;

lib/render.js

@@ -1,8 +1,12 @@
-var fs = require('fs'),
-    chalk = require('chalk'),
-    sass = require('./'),
+/*!
+ * node-sass: lib/render.js
+ */
+
+var chalk = require('chalk'),
+    fs = require('fs'),
+    mkdirp = require('mkdirp'),
     path = require('path'),
-    mkdirp = require('mkdirp');
+    sass = require('./');
 
 /**
  * Render

package.json

@@ -50,7 +50,7 @@
     "get-stdin": "^4.0.1",
     "meow": "^3.1.0",
     "mkdirp": "^0.5.0",
-    "nan": "^1.6.2",
+    "nan": "^1.7.0",
     "npmconf": "^2.1.1",
     "pangyp": "^2.1.0",
     "request": "^2.53.0",

scripts/build.js

@@ -1,3 +1,7 @@
+/*!
+ * node-sass: scripts/build.js
+ */
+
 var eol = require('os').EOL,
     fs = require('fs'),
     mkdir = require('mkdirp'),
@@ -14,11 +18,10 @@ require('../lib/extensions');
  */
 
 function afterBuild(options) {
-  var folder = options.debug ? 'Debug' : 'Release';
-  var target = path.join(__dirname, '..', 'build', folder, 'binding.node');
-  var install = path.join(__dirname, '..', 'vendor', process.sassBinaryName, 'binding.node');
+  var install = process.sass.binaryPath;
+  var target = path.join(__dirname, '..', 'build', options.debug ? 'Debug' : 'Release', 'binding.node');
 
-  mkdir(path.join(__dirname, '..', 'vendor', process.sassBinaryName), function(err) {
+  mkdir(path.dirname(install), function(err) {
     if (err && err.code !== 'EEXIST') {
       console.error(err.message);
       return;
@@ -36,7 +39,7 @@ function afterBuild(options) {
           return;
         }
 
-        console.log('Installed in `' + install + '`');
+        console.log('Installed in `', install, '`');
       });
     });
   });
@@ -52,9 +55,9 @@ function afterBuild(options) {
 function build(options) {
   var arguments = [path.join('node_modules', 'pangyp', 'bin', 'node-gyp'), 'rebuild'].concat(options.args);
 
-  console.log(['Building:', process.runtime.execPath].concat(arguments).join(' '));
+  console.log(['Building:', process.sass.runtime.execPath].concat(arguments).join(' '));
 
-  var proc = spawn(process.runtime.execPath, arguments, {
+  var proc = spawn(process.sass.runtime.execPath, arguments, {
     stdio: [0, 1, 2]
   });
 
@@ -110,25 +113,25 @@ function testBinary(options) {
     return build(options);
   }
 
-  fs.stat(path.join(__dirname, '..', 'vendor', process.sassBinaryName, 'binding.node'), function(err) {
-    if (err) {
-      return build(options);
-    }
+  try {
+    process.sass.getBinaryPath(true);
+  } catch (e) {
+    return build(options);
+  }
 
-    console.log('`' + process.sassBinaryName + '` exists; testing.');
+  console.log('`', process.sass.binaryPath, '` exists.', eol, 'testing binary.');
 
-    try {
-      require('../').renderSync({
-        data: 's: { a: ss }'
-      });
+  try {
+    require('../').renderSync({
+      data: 's: { a: ss }'
+    });
 
-      console.log('Binary is fine; exiting.');
-    } catch (e) {
-      console.log(['Problem with the binary.', 'Manual build incoming.'].join(eol));
+    console.log('Binary is fine; exiting.');
+  } catch (e) {
+    console.log(['Problem with the binary.', 'Manual build incoming.'].join(eol));
 
-      return build(options);
-    }
-  });
+    return build(options);
+  }
 }
 
 /**

scripts/coverage.js

@@ -1,6 +1,11 @@
-var path = require('path'),
-    spawn = require('child_process').spawn,
-    bin = path.join.bind(null, __dirname, '..', 'node_modules', '.bin');
+/*!
+ * node-sass: scripts/coverage.js
+ */
+
+require('../lib/extensions');
+
+var bin = require('path').join.bind(null, __dirname, '..', 'node_modules', '.bin'),
+    spawn = require('child_process').spawn;
 
 /**
  * Run test suite
@@ -14,7 +19,7 @@ function suite() {
   var coveralls = spawn(bin('coveralls'));
 
   var args = [bin('_mocha')].concat(['--reporter', 'mocha-lcov-reporter']);
-  var mocha = spawn(process.execPath, args, {
+  var mocha = spawn(process.sass.runtime.execPath, args, {
     env: process.env
   });