Merge branch 'kspramod-master'

adds proxy option, will bump version to 5.1.0

README.md

@@ -175,6 +175,17 @@ var opts = {
     /* strings or binaries */
   ],
   passphrase: 'yourpassphrase',
+  proxy: false /* OR proxy config as defined in axios.
+  If not set axios detects proxy from env vars http_proxy and https_proxy
+  https://github.com/axios/axios#config-defaults
+  {
+    host: '127.0.0.1',
+    port: 9000,
+    auth: {
+      username: 'mikeymike',
+      password: 'rapunz3l'
+    }
+  } */,
   auth: {
     user: 'theuser', // or username
     pass: 'thepassword', // or password

lib/wait-on.js

@@ -43,6 +43,7 @@ const WAIT_ON_SCHEMA = Joi.object({
   cert: [Joi.string(), Joi.binary()],
   key: [Joi.string(), Joi.binary(), Joi.object()],
   passphrase: Joi.string(),
+  proxy: [Joi.boolean(), Joi.object()],
   auth: Joi.object({
     username: Joi.string(),
     password: Joi.string(),
@@ -264,6 +265,7 @@ function createHTTP$({ validatedOpts, output }, resource) {
     followRedirect,
     httpTimeout: timeout,
     interval,
+    proxy,
     reverse,
     simultaneous,
     strictSSL: rejectUnauthorized,
@@ -282,6 +284,7 @@ function createHTTP$({ validatedOpts, output }, resource) {
       ...pick(['ca', 'cert', 'key', 'passphrase'], validatedOpts),
     }),
     ...(followRedirect ? {} : { maxRedirects: 0 }), // defaults to 5 (enabled)
+    proxy, // can be undefined, false, or object
     ...(timeout && { timeout }),
     ...urlSocketOptions,
     method,

package.json

@@ -1,7 +1,7 @@
 {
   "name": "wait-on",
   "description": "wait-on is a cross platform command line utility and Node.js API which will wait for files, ports, sockets, and http(s) resources to become available",
-  "version": "5.0.3",
+  "version": "5.1.0-rc.1",
   "main": "lib/wait-on",
   "bin": {
     "wait-on": "bin/wait-on"