Merge branch 'WebPageTest:master' into runTestAndWait

Author: Siddhantshukla814

lib/mapping.js

@@ -1184,6 +1184,10 @@ var options = {
       valid:
         /^(?:dot|spec|tap|xunit|list|progress|min|nyan|landing|json|doc|markdown|teamcity)$/,
     },
+    proxy: {
+      name: "proxy",
+      info: "set the proxy used to fetch results",
+    },
   },
   waterfall: {
     type: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpagetest",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "WebPageTest API wrapper for NodeJS",
   "author": "WebPageTest <[email protected]> (http://github.com/WebPageTest)",
   "homepage": "http://github.com/WebPageTest/webpagetest-api",
@@ -20,7 +20,9 @@
     "url": "http://github.com/WebPageTest/webpagetest-api/issues"
   },
   "main": "lib/webpagetest.js",
-  "bin": "bin/webpagetest",
+  "bin": {
+    "webpagetest": "bin/webpagetest"
+  },
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha -R spec test/*-test.js"
   },

test/fixtures/command-line/help-results.txt

@@ -18,6 +18,7 @@ Options:
   -S, --specs <json_or_file>  set the specs for performance test suite
   -r, --reporter <name>       set performance test suite reporter output:
                               [dot]|spec|tap|xunit|list|progress|min|nyan|landing|json|doc|markdown|teamcity
+      --proxy                 set the proxy used to fetch results
   -e, --request <id>          echo request ID, useful to track asynchronous
                               requests
   -h, --help                  display help for command

test/fixtures/command-line/help-test.txt

@@ -173,4 +173,5 @@ Options:
       --reporter <name>               set performance test suite reporter
                                       output:
                                       [dot]|spec|tap|xunit|list|progress|min|nyan|landing|json|doc|markdown|teamcity
+      --proxy                 set the proxy used to fetch results
   -h, --help                          display help for command