Merge branch 'master' into fixToughCookieDep

Author: analog-nico

.travis.yml

@@ -13,6 +13,10 @@ matrix:
     env: V_REQUEST=latest
   - node_js: "6"
     env: V_REQUEST=latest
+  - node_js: "8"
+    env: V_REQUEST=latest
+  - node_js: "10"
+    env: V_REQUEST=latest
 
 before_install:
   - npm install tough-cookie

README.md

@@ -277,6 +277,7 @@ Consider Request-Promise being:
 - Plus some methods on a request call object:
 	- `rp(...).then(...)` or e.g. `rp.post(...).then(...)` which turn `rp(...)` and `rp.post(...)` into promises
 	- `rp(...).catch(...)` or e.g. `rp.del(...).catch(...)` which is the same method as provided by Bluebird promises
+	    - Errors that the `request` library would pass to the callback are wrapped by `request-promise` and then passed to the catch handler. See [code example](https://github.com/request/request-promise#thenonfulfilled-onrejected) below. 
 	- `rp(...).finally(...)` or e.g. `rp.put(...).finally(...)` which is the same method as provided by Bluebird promises
 	- `rp(...).cancel()` or e.g. `rp.get(...).cancel()` which cancels the request
 	- `rp(...).promise()` or e.g. `rp.head(...).promise()` which returns the underlying promise so you can access the full [Bluebird API](https://github.com/petkaantonov/bluebird/blob/master/API.md)

lib/rp.js

@@ -18,7 +18,7 @@ try {
     /* istanbul ignore next */
     var EOL = require('os').EOL;
     /* istanbul ignore next */
-    console.error(EOL + '###' + EOL + '### The "request" library is not installed automatically anymore.' + EOL + '### But required by "request-promise".' + EOL + '###' + EOL + '### npm install request --save' + EOL + '###' + EOL);
+    console.error(EOL + '###' + EOL + '### The "request" library is not installed automatically anymore.' + EOL + '### But is a dependency of "request-promise".' + EOL + '### Please install it with:' + EOL + '### npm install request --save' + EOL + '###' + EOL);
     /* istanbul ignore next */
     throw err;
 }

package.json

@@ -35,8 +35,8 @@
   "dependencies": {
     "request-promise-core": "1.1.1",
     "bluebird": "^3.5.0",
-    "stealthy-require": "^1.1.0",
-    "tough-cookie": "^2.5.0"
+    "stealthy-require": "^1.1.1",
+    "tough-cookie": "~2.3.3"
   },
   "peerDependencies": {
     "request": "^2.34"