Update errors to use options

Author: Ayplow

lib/binding.js

@@ -3,18 +3,19 @@
  */
 
 var errors = require('./errors'),
-  Constants = require('./constants');
+  Constants = require('./constants'),
+  DefaultOptions = Constants.DefaultOptions;
 /**
  * Require binding
  */
 module.exports = function(ext) {
-  if (!ext.hasBinary(ext.getBinaryPath(Constants.DefaultOptions))) {
-    if (!ext.isSupportedEnvironment()) {
-      throw new Error(errors.unsupportedEnvironment());
+  if (!ext.hasBinary(ext.getBinaryPath(DefaultOptions))) {
+    if (!ext.isSupportedEnvironment(process.platform, DefaultOptions.arch, DefaultOptions.modulesVersion)) {
+      throw new Error(errors.unsupportedEnvironment(DefaultOptions));
     } else {
-      throw new Error(errors.missingBinary());
+      throw new Error(errors.missingBinary(DefaultOptions));
     }
   }
 
-  return require(ext.getBinaryPath(Constants.DefaultOptions));
+  return require(ext.getBinaryPath(DefaultOptions));
 };

lib/errors.js

@@ -3,11 +3,10 @@
  */
 
 var sass = require('./extensions'),
-  Constants = require('./constants'),
   pkg = require('../package.json');
 
-function humanEnvironment() {
-  return sass.getHumanEnvironment(sass.getBinaryName(Constants.DefaultOptions));
+function humanEnvironment(options) {
+  return sass.getHumanEnvironment(sass.getBinaryName(options));
 }
 
 function foundBinaries() {
@@ -30,18 +29,18 @@ function missingBinaryFooter() {
   ].join('\n');
 }
 
-module.exports.unsupportedEnvironment = function() {
+module.exports.unsupportedEnvironment = function(options) {
   return [
-    'Node Sass does not yet support your current environment: ' + humanEnvironment(),
+    'Node Sass does not yet support your current environment: ' + humanEnvironment(options),
     'For more information on which environments are supported please see:',
     'https://github.com/sass/node-sass/releases/tag/v' + pkg.version
   ].join('\n');
 };
 
-module.exports.missingBinary = function() {
+module.exports.missingBinary = function(options) {
   return [
-    'Missing binding ' + sass.getBinaryPath(),
-    'Node Sass could not find a binding for your current environment: ' + humanEnvironment(),
+    'Missing binding ' + sass.getBinaryPath(options),
+    'Node Sass could not find a binding for your current environment: ' + humanEnvironment(options),
     '',
     foundBinaries(),
     '',