Fix build scripts to actually use passed arguments

Author: Ayplow

lib/constants.js

@@ -0,0 +1,39 @@
+var Runtimes = exports.Runtimes = {
+  NODE: 0,
+  NODEJS: 1,
+  IOJS: 2,
+  ELECTRON: 3
+};
+exports.RuntimeNames = [
+  'Node',
+  'Node.js',
+  'io.js',
+  'Electron'
+];
+exports.ModuleVersions = {
+  11: [Runtimes.NODE, '0.10.x'],
+  14: [Runtimes.NODE, '0.12.x'],
+  42: [Runtimes.IOJS, '1.x'],
+  43: [Runtimes.IOJS, '1.1.x'],
+  44: [Runtimes.IOJS, '2.x'],
+  45: [Runtimes.IOJS, '3.x'],
+  49: [Runtimes.ELECTRON, '1.3.x'],
+  50: [Runtimes.ELECTRON, '1.4.x'],
+  53: [Runtimes.ELECTRON, '1.6.x'],
+  46: [Runtimes.NODEJS, '4.x'],
+  47: [Runtimes.NODEJS, '5.x'],
+  48: [Runtimes.NODEJS, '6.x'],
+  51: [Runtimes.NODEJS, '7.x'],
+  57: [Runtimes.NODEJS, '8.x'],
+  59: [Runtimes.NODEJS, '9.x'],
+  64: [Runtimes.NODEJS, '10.x'],
+  67: [Runtimes.NODEJS, '11.x']
+};
+exports.DefaultOptions = {
+  jobs: 1,
+  target: process.version,
+  force: process.env.SASS_FORCE_BUILD || false,
+  arch: process.arch,
+  debug: process.config.target_defaults ? process.config.target_defaults.default_configuration === 'Debug' : false,
+  modulesVersion: process.versions.modules
+};

lib/extensions.js

@@ -8,6 +8,7 @@ var eol = require('os').EOL,
   mkdir = require('mkdirp'),
   path = require('path'),
   defaultBinaryDir = path.join(__dirname, '..', 'vendor'),
+  Constants = require('./constants'),
   trueCasePathSync = require('true-case-path');
 
 /**
@@ -59,26 +60,8 @@ function getHumanArchitecture(arch) {
  * @api public
  */
 function getHumanNodeVersion(abi) {
-  switch (parseInt(abi || process.versions.modules, 10)) {
-    case 11: return 'Node 0.10.x';
-    case 14: return 'Node 0.12.x';
-    case 42: return 'io.js 1.x';
-    case 43: return 'io.js 1.1.x';
-    case 44: return 'io.js 2.x';
-    case 45: return 'io.js 3.x';
-    case 46: return 'Node.js 4.x';
-    case 47: return 'Node.js 5.x';
-    case 48: return 'Node.js 6.x';
-    case 49: return 'Electron 1.3.x';
-    case 50: return 'Electron 1.4.x';
-    case 51: return 'Node.js 7.x';
-    case 53: return 'Electron 1.6.x';
-    case 57: return 'Node.js 8.x';
-    case 59: return 'Node.js 9.x';
-    case 64: return 'Node.js 10.x';
-    case 67: return 'Node.js 11.x';
-    default: return false;
-  }
+  var Version = Constants.ModuleVersions[parseInt(abi)];
+  return Version ? Constants.RuntimeNames[Version[0]] + ' ' + Version[1] : false;
 }
 
 /**
@@ -179,7 +162,7 @@ function getArgument(name, args) {
  * @api public
  */
 
-function getBinaryName() {
+function getBinaryName(options) {
   var binaryName,
     variant,
     platform = process.platform;
@@ -198,14 +181,11 @@ function getBinaryName() {
       platform += '_' + variant;
     }
 
-    binaryName = [
-      platform, '-',
-      process.arch, '-',
-      process.versions.modules
-    ].join('');
+    binaryName = platform + '-' + options.arch + '-' + options.modulesVersion;
+  
   }
 
-  return [binaryName, 'binding.node'].join('_');
+  return binaryName + '_binding.node';
 }
 
 /**
@@ -236,14 +216,14 @@ function getBinaryName() {
  * @api public
  */
 
-function getBinaryUrl() {
+function getBinaryUrl(options) {
   var site = getArgument('--sass-binary-site') ||
              process.env.SASS_BINARY_SITE  ||
              process.env.npm_config_sass_binary_site ||
              (pkg.nodeSassConfig && pkg.nodeSassConfig.binarySite) ||
              'https://github.com/sass/node-sass/releases/download';
 
-  return [site, 'v' + pkg.version, getBinaryName()].join('/');
+  return [site, 'v' + pkg.version, getBinaryName(options)].join('/');
 }
 
 /**
@@ -292,7 +272,7 @@ function getBinaryDir() {
  * @api public
  */
 
-function getBinaryPath() {
+function getBinaryPath(options) {
   var binaryPath;
 
   if (getArgument('--sass-binary-path')) {
@@ -304,10 +284,10 @@ function getBinaryPath() {
   } else if (pkg.nodeSassConfig && pkg.nodeSassConfig.binaryPath) {
     binaryPath = pkg.nodeSassConfig.binaryPath;
   } else {
-    binaryPath = path.join(getBinaryDir(), getBinaryName().replace(/_(?=binding\.node)/, '/'));
+    binaryPath = path.join(getBinaryDir(), getBinaryName(options).replace(/_(?=binding\.node)/, '/'));
   }
 
-  if (process.versions.modules < 46) {
+  if (options.modulesVersion < 46) {
     return binaryPath;
   }
 
@@ -321,7 +301,7 @@ function getBinaryPath() {
 /**
  * An array of paths suitable for use as a local disk cache of the binding.
  *
- * @return {[]String} an array of paths
+ * @return {String[]} an array of paths
  * @api public
  */
 function getCachePathCandidates() {
@@ -372,12 +352,12 @@ function getBinaryCachePath() {
  * @return {String} path to cached binary
  * @api public
  */
-function getCachedBinary() {
+function getCachedBinary(options) {
   var i,
     cachePath,
     cacheBinary,
     cachePathCandidates = getCachePathCandidates(),
-    binaryName = getBinaryName();
+    binaryName = getBinaryName(options);
 
   for (i = 0; i < cachePathCandidates.length; i++) {
     cachePath = path.join(cachePathCandidates[i], pkg.name, pkg.version);

package.json

@@ -82,6 +82,7 @@
     "read-yaml": "^1.0.0",
     "rimraf": "^2.5.2",
     "sass-spec": "https://github.com/sass/sass-spec.git#dc2d573",
-    "unique-temp-dir": "^1.0.0"
+    "unique-temp-dir": "^1.0.0",
+    "yargs": "^13.2.2"
   }
 }