Merge pull request request#1173 from seanstrom/support/rm-optional-de…

…pendencies

remove optional dependencies

.travis.yml

@@ -2,11 +2,3 @@ language: node_js
 node_js:
   - "0.8"
   - "0.10"
-
-env:
-  - OPTIONALS=Y
-  - OPTIONALS=N
-
-install:
-  - if [[ "$OPTIONALS" == "Y" ]]; then npm install; fi
-  - if [[ "$OPTIONALS" == "N" ]]; then npm install --no-optional; fi

lib/cookies.js

@@ -1,7 +1,6 @@
 'use strict'
 
-var optional = require('./optional')
-  , tough = optional('tough-cookie')
+var tough = require('tough-cookie')
   , Cookie = tough && tough.Cookie
   , CookieJar = tough && tough.CookieJar
 

package.json

@@ -30,9 +30,7 @@
     "mime-types": "~1.0.1",
     "node-uuid": "~1.4.0",
     "qs": "~1.2.0",
-    "tunnel-agent": "~0.4.0"
-  },
-  "optionalDependencies": {
+    "tunnel-agent": "~0.4.0",
     "tough-cookie": ">=0.12.0",
     "http-signature": "~0.10.0",
     "oauth-sign": "~0.4.0",

request.js

@@ -1,8 +1,7 @@
 'use strict'
 
-var optional = require('./lib/optional')
-  , http = require('http')
-  , https = optional('https')
+var http = require('http')
+  , https = require('https')
   , url = require('url')
   , util = require('util')
   , stream = require('stream')
@@ -16,18 +15,18 @@ var optional = require('./lib/optional')
   , toBase64 = helpers.toBase64
   , defer = helpers.defer
   , bl = require('bl')
-  , oauth = optional('oauth-sign')
-  , hawk = optional('hawk')
-  , aws = optional('aws-sign2')
-  , httpSignature = optional('http-signature')
+  , oauth = require('oauth-sign')
+  , hawk = require('hawk')
+  , aws = require('aws-sign2')
+  , httpSignature = require('http-signature')
   , uuid = require('node-uuid')
   , mime = require('mime-types')
   , tunnel = require('tunnel-agent')
-  , stringstream = optional('stringstream')
+  , stringstream = require('stringstream')
   , caseless = require('caseless')
 
   , ForeverAgent = require('forever-agent')
-  , FormData = optional('form-data')
+  , FormData = require('form-data')
 
   , cookies = require('./lib/cookies')
   , globalCookieJar = cookies.jar()

tests/test-cookies.js

@@ -1,11 +1,3 @@
-try {
-  require('tough-cookie')
-} catch (e) {
-  console.error('tough-cookie must be installed to run this test.')
-  console.error('skipping this test. please install tough-cookie and run again if you need to test this feature.')
-  process.exit(0)
-}
-
 var http = require('http')
   , request = require('../index')
   , tape = require('tape')

tests/test-follow-all.js

@@ -1,11 +1,3 @@
-try {
-  require('tough-cookie')
-} catch (e) {
-  console.error('tough-cookie must be installed to run this test.')
-  console.error('skipping this test. please install tough-cookie and run again if you need to test this feature.')
-  process.exit(0)
-}
-
 var http = require('http')
   , request = require('../index')
   , tape = require('tape')

tests/test-gzip.js

@@ -3,16 +3,6 @@ var request = require('../index')
   , zlib = require('zlib')
   , tape = require('tape')
 
-if (!zlib.Gunzip.prototype.setEncoding) {
-  try {
-    require('stringstream')
-  } catch (e) {
-    console.error('stringstream must be installed to run this test.')
-    console.error('skipping this test. please install stringstream and run again if you need to test this feature.')
-    process.exit(0)
-  }
-}
-
 var testContent = 'Compressible response content.\n'
   , testContentGzip
 

tests/test-hawk.js

@@ -1,11 +1,3 @@
-try {
-  require('hawk')
-} catch (e) {
-  console.error('hawk must be installed to run this test.')
-  console.error('skipping this test. please install hawk and run again if you need to test this feature.')
-  process.exit(0)
-}
-
 var http = require('http')
   , request = require('../index')
   , hawk = require('hawk')

tests/test-headers.js

@@ -1,11 +1,3 @@
-try {
-  require('tough-cookie')
-} catch (e) {
-  console.error('tough-cookie must be installed to run this test.')
-  console.error('skipping this test. please install tough-cookie and run again if you need to test this feature.')
-  process.exit(0)
-}
-
 var server = require('./server')
   , request = require('../index')
   , tape = require('tape')

tests/test-http-signature.js

@@ -1,11 +1,3 @@
-try {
-  require('http-signature')
-} catch (e) {
-  console.error('http-signature must be installed to run this test.')
-  console.error('skipping this test. please install http-signature and run again if you need to test this feature.')
-  process.exit(0)
-}
-
 var http = require('http')
   , request = require('../index')
   , httpSignature = require('http-signature')

tests/test-oauth.js

@@ -1,11 +1,3 @@
-try {
-  require('oauth-sign')
-} catch (e) {
-  console.error('oauth-sign must be installed to run this test.')
-  console.error('skipping this test. please install oauth-sign and run again if you need to test this feature.')
-  process.exit(0)
-}
-
 var hmacsign = require('oauth-sign').hmacsign
   , qs = require('querystring')
   , request = require('../index')

tests/test-redirect.js

@@ -1,11 +1,3 @@
-try {
-  require('tough-cookie')
-} catch (e) {
-  console.error('tough-cookie must be installed to run this test.')
-  console.error('skipping this test. please install tough-cookie and run again if you need to test this feature.')
-  process.exit(0)
-}
-
 var server = require('./server')
   , assert = require('assert')
   , request = require('../index')