Merge branch 'master' into send_version

nodesecurity · Mar 29, 2016 · f755d21 · f755d21
2 parents 131216f + b011f2f
commit f755d21
Show file tree

Hide file tree

Showing 6 changed files with 1,656 additions and 570 deletions.
diff --git a/bin/nsp b/bin/nsp
@@ -18,7 +18,7 @@
 
 'use strict';
 
-var subcommand = require('subcommand');
+var Subcommand = require('subcommand');
 var usage = require('../lib/utils/usage.js')('root.txt');
 
 var config = {
@@ -34,5 +34,5 @@ var config = {
   }
 };
 
-var route = subcommand(config);
+var route = Subcommand(config);
 route(process.argv.slice(2));
diff --git a/lib/check.js b/lib/check.js
@@ -7,7 +7,7 @@ var ProxyAgent = require('https-proxy-agent');
 var Semver = require('semver');
 var Path = require('path');
 var Wreck = require('wreck');
-var pathIsAbsolute = require('path-is-absolute');
+var PathIsAbsolute = require('path-is-absolute');
 
 var Conf = require('rc')('nsp', {
   api: {
@@ -68,6 +68,7 @@ module.exports = function (options, callback) {
   }
 
   options.proxy = options.proxy || Conf.proxy;
+  options.proxy = options.proxy || process.env.https_proxy || process.env.HTTPS_PROXY;
   if (options.proxy) {
     Conf.api.agent = new ProxyAgent(options.proxy);
     delete options.proxy;
@@ -123,7 +124,7 @@ module.exports = function (options, callback) {
     }
     try {
       if (advisoriesPath) {
-        if (!pathIsAbsolute(advisoriesPath)) {
+        if (!PathIsAbsolute(advisoriesPath)) {
           advisoriesPath = Path.resolve(process.cwd(), advisoriesPath);
         }
 

diff --git a/lib/utils/usage.js b/lib/utils/usage.js
@@ -1,11 +1,11 @@
 'use strict';
 
-var fs = require('fs');
-var path = require('path');
+var Fs = require('fs');
+var Path = require('path');
 
 var usage = function (location) {
 
-  console.error(fs.readFileSync(path.join(__dirname, '../../', 'usage', location)).toString());
+  console.error(Fs.readFileSync(Path.join(__dirname, '../../', 'usage', location)).toString());
 };
 
 module.exports = function (location) {