fsevents 1.0.5 → 1.0.6

package/node_modules/request/README.md

@@ -161,7 +161,7 @@ request.post({url:'http://service.com/upload', form: {key:'value'}}, function(er
 
 #### multipart/form-data (Multipart Form Uploads)
 
-For `multipart/form-data` we use the [form-data](https://github.com/felixge/node-form-data) library by [@felixge](https://github.com/felixge). For the most cases, you can pass your upload form data via the `formData` option.
+For `multipart/form-data` we use the [form-data](https://github.com/form-data/form-data) library by [@felixge](https://github.com/felixge). For the most cases, you can pass your upload form data via the `formData` option.
 
 
 ```js
@@ -179,7 +179,7 @@ var formData = {
   ],
   // Pass optional meta-data with an 'options' object with style: {value: DATA, options: OPTIONS}
   // Use case: for some types of streams, you'll need to provide "file"-related information manually.
-  // See the `form-data` README for more information about options: https://github.com/felixge/node-form-data
+  // See the `form-data` README for more information about options: https://github.com/form-data/form-data
   custom_file: {
     value:  fs.createReadStream('/dev/urandom'),
     options: {
@@ -206,7 +206,7 @@ form.append('my_field', 'my_value');
 form.append('my_buffer', new Buffer([1, 2, 3]));
 form.append('custom_file', fs.createReadStream(__dirname + '/unicycle.jpg'), {filename: 'unicycle.jpg'});
 ```
-See the [form-data README](https://github.com/felixge/node-form-data) for more information & examples.
+See the [form-data README](https://github.com/form-data/form-data) for more information & examples.
 
 
 #### multipart/related
@@ -472,7 +472,7 @@ HTTP/1.1 200 OK
 At this point, the connection is left open, and the client is
 communicating directly with the `endpoint-server.com` machine.
 
-See [the wikipedia page on HTTP Tunneling](http://en.wikipedia.org/wiki/HTTP_tunnel)
+See [the wikipedia page on HTTP Tunneling](https://en.wikipedia.org/wiki/HTTP_tunnel)
 for more information.
 
 By default, when proxying `http` traffic, request will simply make a
@@ -566,7 +566,7 @@ Here's some examples of valid `no_proxy` values:
 
 ## UNIX Domain Sockets
 
-`request` supports making requests to [UNIX Domain Sockets](http://en.wikipedia.org/wiki/Unix_domain_socket). To make one, use the following URL scheme:
+`request` supports making requests to [UNIX Domain Sockets](https://en.wikipedia.org/wiki/Unix_domain_socket). To make one, use the following URL scheme:
 
 ```js
 /* Pattern */ 'http://unix:SOCKET:PATH'
@@ -746,7 +746,7 @@ The first argument can be either a `url` or an `options` object. The only requir
     In non-chunked requests, data items with body streams are not allowed.
 - `preambleCRLF` - append a newline/CRLF before the boundary of your `multipart/form-data` request.
 - `postambleCRLF` - append a newline/CRLF at the end of the boundary of your `multipart/form-data` request.
-- `json` - sets `body` but to JSON representation of value and adds `Content-type: application/json` header.  Additionally, parses the response body as JSON.
+- `json` - sets `body` to JSON representation of value and adds `Content-type: application/json` header.  Additionally, parses the response body as JSON.
 - `jsonReviver` - a [reviver function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse) that will be passed to `JSON.parse()` when parsing a JSON response body.
 
 ---
@@ -762,7 +762,7 @@ The first argument can be either a `url` or an `options` object. The only requir
 - `followRedirect` - follow HTTP 3xx responses as redirects (default: `true`). This property can also be implemented as function which gets `response` object as a single argument and should return `true` if redirects should continue or `false` otherwise.
 - `followAllRedirects` - follow non-GET HTTP 3xx responses as redirects (default: `false`)
 - `maxRedirects` - the maximum number of redirects to follow (default: `10`)
-- `removeRefererHeader` - removes the referer header when a redirect happens (default: `false`).
+- `removeRefererHeader` - removes the referer header when a redirect happens (default: `false`). **Note:** if true, referer header set in the initial request is preserved during redirect chain.
 
 ---
 
@@ -799,8 +799,7 @@ default in Linux can be anywhere from 20-120 seconds][linux-timeout]).
 - `tunnel` - controls the behavior of
   [HTTP `CONNECT` tunneling](https://en.wikipedia.org/wiki/HTTP_tunnel#HTTP_CONNECT_tunneling)
   as follows:
-   - `undefined` (default) - `true` if the destination is `https` or a previous
-     request in the redirect chain used a tunneling proxy, `false` otherwise
+   - `undefined` (default) - `true` if the destination is `https`, `false` otherwise
    - `true` - always tunnel to the destination by making a `CONNECT` request to
      the proxy
    - `false` - request the destination as a `GET` request.
@@ -845,7 +844,7 @@ For example:
 ```js
 //requests using baseRequest() will set the 'x-token' header
 var baseRequest = request.defaults({
-  headers: {x-token: 'my-token'}
+  headers: {'x-token': 'my-token'}
 })
 
 //requests using specialRequest() will include the 'x-token' header set in
@@ -933,7 +932,7 @@ There are at least three ways to debug the operation of `request`:
 2. Set `require('request').debug = true` at any time (this does the same thing
    as #1).
 
-3. Use the [request-debug module](https://github.com/nylen/request-debug) to
+3. Use the [request-debug module](https://github.com/request/request-debug) to
    view request and response headers and bodies.
 
 [back to top](#table-of-contents)
@@ -1076,9 +1075,9 @@ request('http://www.google.com', function() {
 ```
 
 The cookie store must be a
-[`tough-cookie`](https://github.com/goinstant/tough-cookie)
+[`tough-cookie`](https://github.com/SalesforceEng/tough-cookie)
 store and it must support synchronous operations; see the
-[`CookieStore` API docs](https://github.com/goinstant/tough-cookie/#cookiestore-api)
+[`CookieStore` API docs](https://github.com/SalesforceEng/tough-cookie#cookiestore-api)
 for details.
 
 To inspect your cookie jar after a request:

package/node_modules/request/lib/har.js

@@ -60,43 +60,53 @@ Har.prototype.prep = function (data) {
   }
 
   // prep body
-  switch (data.postData.mimeType) {
-    case 'multipart/mixed':
-    case 'multipart/related':
-    case 'multipart/form-data':
-    case 'multipart/alternative':
-      // reset values
-      data.postData.mimeType = 'multipart/form-data'
-      break
-
-    case 'application/x-www-form-urlencoded':
-      if (!data.postData.params) {
-        data.postData.text = ''
-      } else {
-        data.postData.paramsObj = data.postData.params.reduce(this.reducer, {})
-
-        // always overwrite
-        data.postData.text = qs.stringify(data.postData.paramsObj)
-      }
-      break
-
-    case 'text/json':
-    case 'text/x-json':
-    case 'application/json':
-    case 'application/x-json':
-      data.postData.mimeType = 'application/json'
-
-      if (data.postData.text) {
-        try {
-          data.postData.jsonObj = JSON.parse(data.postData.text)
-        } catch (e) {
-          this.request.debug(e)
-
-          // force back to text/plain
-          data.postData.mimeType = 'text/plain'
-        }
+  function some (arr) {
+    return arr.some(function (type) {
+      return data.postData.mimeType.indexOf(type) === 0
+    })
+  }
+
+  if (some([
+    'multipart/mixed',
+    'multipart/related',
+    'multipart/form-data',
+    'multipart/alternative'])) {
+
+    // reset values
+    data.postData.mimeType = 'multipart/form-data'
+  }
+
+  else if (some([
+    'application/x-www-form-urlencoded'])) {
+
+    if (!data.postData.params) {
+      data.postData.text = ''
+    } else {
+      data.postData.paramsObj = data.postData.params.reduce(this.reducer, {})
+
+      // always overwrite
+      data.postData.text = qs.stringify(data.postData.paramsObj)
+    }
+  }
+
+  else if (some([
+    'text/json',
+    'text/x-json',
+    'application/json',
+    'application/x-json'])) {
+
+    data.postData.mimeType = 'application/json'
+
+    if (data.postData.text) {
+      try {
+        data.postData.jsonObj = JSON.parse(data.postData.text)
+      } catch (e) {
+        this.request.debug(e)
+
+        // force back to text/plain
+        data.postData.mimeType = 'text/plain'
       }
-      break
+    }
   }
 
   return data
@@ -152,51 +162,50 @@ Har.prototype.options = function (options) {
     options.headers = req.headersObj
   }
 
-  switch (req.postData.mimeType) {
-    case 'application/x-www-form-urlencoded':
-      options.form = req.postData.paramsObj
-      break
-
-    case 'application/json':
-      if (req.postData.jsonObj) {
-        options.body = req.postData.jsonObj
-        options.json = true
-      }
-      break
-
-    case 'multipart/form-data':
-      options.formData = {}
+  function test (type) {
+    return req.postData.mimeType.indexOf(type) === 0
+  }
+  if (test('application/x-www-form-urlencoded')) {
+    options.form = req.postData.paramsObj
+  }
+  else if (test('application/json')) {
+    if (req.postData.jsonObj) {
+      options.body = req.postData.jsonObj
+      options.json = true
+    }
+  }
+  else if (test('multipart/form-data')) {
+    options.formData = {}
 
-      req.postData.params.forEach(function (param) {
-        var attachment = {}
+    req.postData.params.forEach(function (param) {
+      var attachment = {}
 
-        if (!param.fileName && !param.fileName && !param.contentType) {
-          options.formData[param.name] = param.value
-          return
-        }
+      if (!param.fileName && !param.fileName && !param.contentType) {
+        options.formData[param.name] = param.value
+        return
+      }
 
-        // attempt to read from disk!
-        if (param.fileName && !param.value) {
-          attachment.value = fs.createReadStream(param.fileName)
-        } else if (param.value) {
-          attachment.value = param.value
-        }
+      // attempt to read from disk!
+      if (param.fileName && !param.value) {
+        attachment.value = fs.createReadStream(param.fileName)
+      } else if (param.value) {
+        attachment.value = param.value
+      }
 
-        if (param.fileName) {
-          attachment.options = {
-            filename: param.fileName,
-            contentType: param.contentType ? param.contentType : null
-          }
+      if (param.fileName) {
+        attachment.options = {
+          filename: param.fileName,
+          contentType: param.contentType ? param.contentType : null
         }
-
-        options.formData[param.name] = attachment
-      })
-      break
-
-    default:
-      if (req.postData.text) {
-        options.body = req.postData.text
       }
+
+      options.formData[param.name] = attachment
+    })
+  }
+  else {
+    if (req.postData.text) {
+      options.body = req.postData.text
+    }
   }
 
   return options

package/node_modules/request/lib/redirect.js

@@ -105,7 +105,7 @@ Redirect.prototype.onResponse = function (response) {
 
   // handle the case where we change protocol from https to http or vice versa
   if (request.uri.protocol !== uriPrev.protocol) {
-    request._updateProtocol()
+    delete request.agent
   }
 
   self.redirects.push(
@@ -120,7 +120,6 @@ Redirect.prototype.onResponse = function (response) {
   // request.method = 'GET' // Force all redirects to use GET || commented out fixes #215
   delete request.src
   delete request.req
-  delete request.agent
   delete request._started
   if (response.statusCode !== 401 && response.statusCode !== 307) {
     // Remove parameters from the previous response, unless this is the second request
@@ -141,7 +140,7 @@ Redirect.prototype.onResponse = function (response) {
   }
 
   if (!self.removeRefererHeader) {
-    request.setHeader('referer', request.uri.href)
+    request.setHeader('referer', uriPrev.href)
   }
 
   request.emit('redirect')

package/node_modules/request/lib/tunnel.js

@@ -34,7 +34,7 @@ var defaultProxyHeaderExclusiveList = [
 ]
 
 function constructProxyHost(uriObject) {
-  var port = uriObject.portA
+  var port = uriObject.port
     , protocol = uriObject.protocol
     , proxyHost = uriObject.hostname + ':'
 
@@ -109,22 +109,19 @@ function Tunnel (request) {
   this.request = request
   this.proxyHeaderWhiteList = defaultProxyHeaderWhiteList
   this.proxyHeaderExclusiveList = []
-}
-
-Tunnel.prototype.isEnabled = function (options) {
-  var request = this.request
-  // Tunnel HTTPS by default, or if a previous request in the redirect chain
-  // was tunneled.  Allow the user to override this setting.
-
-  // If self.tunnel is already set (because this is a redirect), use the
-  // existing value.
   if (typeof request.tunnel !== 'undefined') {
-    return request.tunnel
+    this.tunnelOverride = request.tunnel
   }
+}
+
+Tunnel.prototype.isEnabled = function () {
+  var self = this
+    , request = self.request
+  // Tunnel HTTPS by default. Allow the user to override this setting.
 
-  // If options.tunnel is set (the user specified a value), use it.
-  if (typeof options.tunnel !== 'undefined') {
-    return options.tunnel
+  // If self.tunnelOverride is set (the user specified a value), use it.
+  if (typeof self.tunnelOverride !== 'undefined') {
+    return self.tunnelOverride
   }
 
   // If the destination is HTTPS, tunnel.
@@ -132,10 +129,8 @@ Tunnel.prototype.isEnabled = function (options) {
     return true
   }
 
-  // Otherwise, leave tunnel unset, because if a later request in the redirect
-  // chain is HTTPS then that request (and any subsequent ones) should be
-  // tunneled.
-  return undefined
+  // Otherwise, do not use tunnel.
+  return false
 }
 
 Tunnel.prototype.setup = function (options) {

package/node_modules/request/package.json

@@ -1,19 +1,19 @@
 {
   "_from": "request@2.x",
-  "_id": "request@2.65.0",
+  "_id": "request@2.67.0",
   "_location": "/request",
-  "_nodeVersion": "4.1.0",
+  "_nodeVersion": "5.0.0",
   "_npmUser": {
     "email": "simeonvelichkov@gmail.com",
     "name": "simov"
   },
-  "_npmVersion": "2.14.3",
+  "_npmVersion": "3.3.12",
   "_phantomChildren": {},
   "_requiredBy": [
     "/node-pre-gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz",
-  "_shasum": "cc1a3bc72b96254734fc34296da322f9486ddeba",
+  "_resolved": "https://registry.npmjs.org/request/-/request-2.67.0.tgz",
+  "_shasum": "8af74780e2bf11ea0ae9aa965c11f11afd272742",
   "author": {
     "email": "mikeal.rogers@gmail.com",
     "name": "Mikeal Rogers"
@@ -31,11 +31,12 @@
     "form-data": "~1.0.0-rc3",
     "har-validator": "~2.0.2",
     "hawk": "~3.1.0",
-    "http-signature": "~0.11.0",
+    "http-signature": "~1.1.0",
+    "is-typedarray": "~1.0.0",
     "isstream": "~0.1.2",
     "json-stringify-safe": "~5.0.1",
     "mime-types": "~2.1.7",
-    "node-uuid": "~1.4.3",
+    "node-uuid": "~1.4.7",
     "oauth-sign": "~0.8.0",
     "qs": "~5.2.0",
     "stringstream": "~0.0.4",
@@ -44,19 +45,19 @@
   },
   "description": "Simplified HTTP request client.",
   "devDependencies": {
-    "bluebird": "^2.10.1",
-    "browserify": "^11.2.0",
+    "bluebird": "^3.0.2",
+    "browserify": "^12.0.1",
     "browserify-istanbul": "^0.1.5",
     "buffer-equal": "^0.0.1",
     "codecov.io": "^0.1.6",
     "coveralls": "^2.11.4",
-    "eslint": "0.18.0",
+    "eslint": "1.9.0",
     "function-bind": "^1.0.2",
-    "istanbul": "^0.3.21",
+    "istanbul": "^0.4.0",
     "karma": "^0.13.10",
     "karma-browserify": "^4.4.0",
     "karma-cli": "^0.1.1",
-    "karma-coverage": "^0.2.6",
+    "karma-coverage": "^0.5.3",
     "karma-phantomjs-launcher": "^0.1.4",
     "karma-tap": "^1.0.3",
     "rimraf": "^2.2.8",
@@ -66,13 +67,13 @@
   },
   "directories": {},
   "dist": {
-    "shasum": "cc1a3bc72b96254734fc34296da322f9486ddeba",
-    "tarball": "http://registry.npmjs.org/request/-/request-2.65.0.tgz"
+    "shasum": "8af74780e2bf11ea0ae9aa965c11f11afd272742",
+    "tarball": "http://registry.npmjs.org/request/-/request-2.67.0.tgz"
   },
   "engines": {
     "node": ">=0.8.0"
   },
-  "gitHead": "8a7a37835c600f5006a6679aa23a0db504003ecd",
+  "gitHead": "76f0655befbe8b37fa246bdca1107cbf57798d9a",
   "homepage": "https://github.com/request/request#readme",
   "license": "Apache-2.0",
   "main": "index.js",
@@ -114,5 +115,5 @@
     "util",
     "utility"
   ],
-  "version": "2.65.0"
+  "version": "2.67.0"
 }

package/node_modules/request/request.js

@@ -15,6 +15,7 @@ var http = require('http')
   , caseless = require('caseless')
   , ForeverAgent = require('forever-agent')
   , FormData = require('form-data')
+  , isTypedArray = require('is-typedarray').strict
   , helpers = require('./lib/helpers')
   , cookies = require('./lib/cookies')
   , getProxyFromURI = require('./lib/getProxyFromURI')
@@ -122,7 +123,6 @@ function Request (options) {
   var reserved = Object.keys(Request.prototype)
   var nonReserved = filterForNonReserved(reserved, options)
 
-  stream.Stream.call(self)
   util._extend(self, nonReserved)
   options = filterOutReservedFunctions(reserved, options)
 
@@ -249,6 +249,11 @@ Request.prototype.init = function (options) {
     self.uri = url.parse(self.uri)
   }
 
+  // Some URL objects are not from a URL parsed string and need href added
+  if (!self.uri.href) {
+    self.uri.href = url.format(self.uri)
+  }
+
   // DEPRECATED: Warning for users of the old Unix Sockets URL Scheme
   if (self.uri.protocol === 'unix:') {
     return self.emit('error', new Error('`unix://` URL scheme is no longer supported. Please use the format `http://unix:SOCKET:PATH`'))
@@ -277,6 +282,7 @@ Request.prototype.init = function (options) {
       message += '. This can be caused by a crappy redirection.'
     }
     // This error was fatal
+    self.abort()
     return self.emit('error', new Error(message))
   }
 
@@ -284,7 +290,7 @@ Request.prototype.init = function (options) {
     self.proxy = getProxyFromURI(self.uri)
   }
 
-  self.tunnel = self._tunnel.isEnabled(options)
+  self.tunnel = self._tunnel.isEnabled()
   if (self.proxy) {
     self._tunnel.setup(options)
   }
@@ -422,6 +428,10 @@ Request.prototype.init = function (options) {
   }
 
   function setContentLength () {
+    if (isTypedArray(self.body)) {
+      self.body = new Buffer(self.body)
+    }
+
     if (!self.hasHeader('content-length')) {
       var length
       if (typeof self.body === 'string') {
@@ -583,63 +593,6 @@ Request.prototype.init = function (options) {
 
 }
 
-// Must call this when following a redirect from https to http or vice versa
-// Attempts to keep everything as identical as possible, but update the
-// httpModule, Tunneling agent, and/or Forever Agent in use.
-Request.prototype._updateProtocol = function () {
-  var self = this
-  var protocol = self.uri.protocol
-
-  if (protocol === 'https:' || self.tunnel) {
-    // previously was doing http, now doing https
-    // if it's https, then we might need to tunnel now.
-    if (self.proxy) {
-      if (self._tunnel.setup()) {
-        return
-      }
-    }
-
-    self.httpModule = https
-    switch (self.agentClass) {
-      case ForeverAgent:
-        self.agentClass = ForeverAgent.SSL
-        break
-      case http.Agent:
-        self.agentClass = https.Agent
-        break
-      default:
-        // nothing we can do.  Just hope for the best.
-        return
-    }
-
-    // if there's an agent, we need to get a new one.
-    if (self.agent) {
-      self.agent = self.getNewAgent()
-    }
-
-  } else {
-    // previously was doing https, now doing http
-    self.httpModule = http
-    switch (self.agentClass) {
-      case ForeverAgent.SSL:
-        self.agentClass = ForeverAgent
-        break
-      case https.Agent:
-        self.agentClass = http.Agent
-        break
-      default:
-        // nothing we can do.  just hope for the best
-        return
-    }
-
-    // if there's an agent, then get a new one.
-    if (self.agent) {
-      self.agent = null
-      self.agent = self.getNewAgent()
-    }
-  }
-}
-
 Request.prototype.getNewAgent = function () {
   var self = this
   var Agent = self.agentClass
@@ -1386,6 +1339,8 @@ Request.prototype.pipe = function (dest, opts) {
 }
 Request.prototype.write = function () {
   var self = this
+  if (self._aborted) {return}
+
   if (!self._started) {
     self.start()
   }
@@ -1393,6 +1348,8 @@ Request.prototype.write = function () {
 }
 Request.prototype.end = function (chunk) {
   var self = this
+  if (self._aborted) {return}
+
   if (chunk) {
     self.write(chunk)
   }

package/node_modules/rimraf/README.md

@@ -1,12 +1,17 @@
 [![Build Status](https://travis-ci.org/isaacs/rimraf.svg?branch=master)](https://travis-ci.org/isaacs/rimraf) [![Dependency Status](https://david-dm.org/isaacs/rimraf.svg)](https://david-dm.org/isaacs/rimraf) [![devDependency Status](https://david-dm.org/isaacs/rimraf/dev-status.svg)](https://david-dm.org/isaacs/rimraf#info=devDependencies)
 
-The [UNIX command](http://en.wikipedia.org/wiki/Rm_(Unix)) `rm -rf` for node.  
+The [UNIX command](http://en.wikipedia.org/wiki/Rm_(Unix)) `rm -rf` for node.
 
 Install with `npm install rimraf`, or just drop rimraf.js somewhere.
 
 ## API
 
-`rimraf(f, callback)`
+`rimraf(f, [opts], callback)`
+
+The first parameter will be interpreted as a globbing pattern for files. If you
+want to disable globbing you can do so with `opts.disableGlob` (defaults to
+`false`). This might be handy, for instance, if you have filenames that contain
+globbing wildcard characters.
 
 The callback will be called with an error if there is one.  Certain
 errors are handled for you:

package/node_modules/{wrappy → rimraf/node_modules/glob/node_modules/inflight/node_modules/wrappy}/package.json

@@ -1,15 +1,7 @@
 {
-  "_args": [
-    [
-      "wrappy@1",
-      "/Users/eshanker/Code/fsevents/node_modules/inflight"
-    ]
-  ],
-  "_from": "wrappy@>=1.0.0 <2.0.0",
+  "_from": "wrappy@1",
   "_id": "wrappy@1.0.1",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/wrappy",
+  "_location": "/rimraf/glob/inflight/wrappy",
   "_nodeVersion": "0.10.31",
   "_npmUser": {
     "email": "i@izs.me",
@@ -17,24 +9,11 @@
   },
   "_npmVersion": "2.0.0",
   "_phantomChildren": {},
-  "_requested": {
-    "name": "wrappy",
-    "raw": "wrappy@1",
-    "rawSpec": "1",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
   "_requiredBy": [
-    "/inflight",
-    "/inflight/once",
-    "/rimraf/once"
+    "/rimraf/glob/inflight"
   ],
   "_resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
   "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
-  "_shrinkwrap": null,
-  "_spec": "wrappy@1",
-  "_where": "/Users/eshanker/Code/fsevents/node_modules/inflight",
   "author": {
     "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
@@ -67,9 +46,10 @@
   ],
   "name": "wrappy",
   "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
-    "url": "https://github.com/npm/wrappy"
+    "url": "git+https://github.com/npm/wrappy.git"
   },
   "scripts": {
     "test": "tap test/*.js"