added --proxy path@url command line argument

.gitignore

@@ -3,4 +3,7 @@ node_modules
 *.log
 .DS_Store
 bundle.js
-bundle-expected.js
+bundle-expected.js
+.tmp
+*.swp
+*.swo

.npmignore

@@ -9,4 +9,5 @@ demo/
 docs/
 example/
 .npmignore
+.tmp
 LICENSE.md

.travis.yml

@@ -0,0 +1,10 @@
+language: node_js
+node_js:
+  - "0.8"
+  - "0.10"
+  - "0.12"
+  - "4.0"
+  - "4.1"
+  - "5.0"
+before_install:
+  - npm install -g npm@~2.14.5

CHANGELOG.md

@@ -0,0 +1,160 @@
+# 8.2.0
+
+Add support for SSL (HTTPS) with `--ssl`, `--cert` and `--key` options.
+
+# 8.1.0
+
+Add `--cors` flag to enable `Access-Control-Allow-Origin: *`
+
+# 8.0.4
+
+Bump required deps.
+
+# 8.0.3
+
+Fix `opts.live` as a string, allowing an array of options to be passed to filter file names.
+
+# 8.0.2
+
+Fix flow so that bundling events start after server connects, also updated upstream in watchify-middleware.
+
+# 8.0.1
+
+Fix parsing issue with LiveReload resp modifier.
+
+# 8.0.0
+
+The server code has been refactored to use connect/express-style middleware stacking. Fixes [#80](https://github.com/mattdesl/budo/issues/80), [#79](https://github.com/mattdesl/budo/issues/79), [#124](https://github.com/mattdesl/budo/issues/124), [#128](https://github.com/mattdesl/budo/issues/128).
+
+##### Major Changes
+
+Functions for `opts.middleware` now assumes the following signature, and will not behave differently based on the number of arguments you specify:
+
+  - `middleware(req, res, next)`
+
+##### Minor Changes
+
+The `middleware` options can now be an array of functions, or a single function.
+
+# 7.1.0
+
+Added `--watch-glob` option which allows you to override the default watch glob without having to go through the `live()` / `watch()` API
+
+# 7.0.4
+
+Small patch [#117](https://github.com/mattdesl/budo/pull/117) to fix a failing test in 7.0.3.
+
+# 7.0.3
+
+- Bole no longer double-logs on shut-down and re-start.
+- Fixed issue with request sizes being logged incorrectly in terminal
+
+# 7.0.1 .. 7.0.2
+
+Small patches for [#110](https://github.com/mattdesl/budo/pull/110) and [#111](https://github.com/mattdesl/budo/pull/111).
+
+# 7.0.0
+
+Fixes previous patch and also updates to garnish redesign, leading to new log styles. 
+
+Since various ndjson flags have changed, this is a potentially breaking change.
+
+Also added a `--verbose` / `-v` option like watchify, which adds some additional debug messages.
+
+# 6.1.1
+
+Fixes live reload for directory routes like `localhost:9966/mydir`.
+
+# 6.1.0
+
+Search for `index.html` across all static `--dir` folders, finding the first one.
+
+# 6.0.0
+
+##### Major Changes
+
+- `garnish` is now included by default in CLI and API
+  - you can use `--ndjson` and `ndjson: true` to have raw output (for custom pretty-printers)
+
+##### Minor Changes
+
+- added `--title` option for the default HTML title
+- added `--css` option for a default style sheet
+
+# 5.0.0
+
+##### Major Changes
+
+- you can just type `budo . | garnish` for the entry point (or `index.js`)
+- added `--onupdate` for things like linting, see [the docs](docs/command-line-usage.md#--onupdate)
+- if no `--host` is specified, resolves to internal IP
+  - you can still hit `localhost:9966` and it will work
+- the `<script>` src defaults to the *filename* of the first entry
+  - eg: `budo src/index.js` leads to `<script src="index.js">`
+- browserify options must come after a full stop `--`
+  - except `--no-debug` which is passed as a budo option
+  - eg: `budo index.js --no-debug -- -t babelify`
+- `--dir` can be passed multiple times to use multiple static folders
+  - `budo index.js --dir public --dir tmp`
+- removed `--live-plugin` option to reduce code complexity
+  - might be added back into CLI later
+  - API still supports `budo.live({ plugin: true })`
+- portfinding is enabled by default in API and CLI
+  - user can disbale with `--no-portfind` or `portfind: false`
+- removed `--verbose`, `-v`, timing is logged by default now
+- entry files are now optional (i.e. if you just need a static HTML with LiveReload)
+- added `--open`, `-o` to launch browser on connect
+- syntax errors in code are shown in the DOM body now
+  - can disable with `--no-error-handler` 
+  - in API can use `errorHandler: Boolean|Function`
+- added `--version` to CLI
+- `--live` can optionally be a string to only LiveReload on those globs, eg:
+  - `budo index.js --live=*.{css,html}`
+- removed `--ignore-watch` and `--interval`
+  - use `budo.watch(glob, chokidarOpts)` instead
+- shorthand for most CLI options now exists
+- arg parsing has improved and uses camel-case in API
+- most args are now supported before entries, eg:
+  - `budo --live src/index.js`
+- cleaner error messaging in terminal
+
+##### API Changes
+
+- `dir` can be a string or array of static paths
+- the `'connect'` event now passes `livePort`
+- the `'connect'` event `ev.host` now uses internal IP by default
+- exposed a CLI feature
+  - `require('budo').cli(process.argv.slice(2), { overrides... })`
+- `errorHandler` can be used for custom bundle error handling
+- `middleware` can be a `fn(req, res, next)` function for custom routes
+- `'update'` event now passes `(contents, updates)`
+
+##### Browserify Args
+
+Users creating CLI tools on top of budo can use `opt.browserifyArgs` to handle subarg correctly. Example with minimist:
+
+```js
+var args = process.argv.slice(2)
+var opts = require('minimist')(args, { '--': true })
+budo.cli(args, {
+  browserifyArgs: opts['--']
+})
+```
+
+If no `browserifyArgs` is specified, then `opt.browserify` can be used to send the actual JS object to the browserify constructor.
+
+```js
+budo.cli(args, {
+  browserify: {
+    transform: require('babelify')
+  }
+})
+```
+
+# 4.2.0
+
+- Added `--pushstate` option [#53](https://github.com/mattdesl/budo/pull/53)
+
+# 4.1.0
+
+- Fixed a bug with `budo ./foo.js`

README.md

@@ -1,76 +1,161 @@
 # budō
 
-[![unstable](http://badges.github.io/stability-badges/dist/unstable.svg)](http://github.com/badges/stability-badges)
+[![build status][travis-image]][travis-url]
+[![stability][stability-image]][stability-url]
+[![NPM version][npm-image]][npm-url]
+[![Downloads][downloads-image]][downloads-url]
+[![js-standard-style][standard-image]][standard-url]
 
-This is a browserify development server inspired by [beefy](https://github.com/chrisdickinson/beefy) and [wzrd](https://github.com/maxogden/wzrd), but with a stronger focus on incremental bundling, LiveReload (including CSS injection), and other [experimental features](#script-injection) down the road.
+This is a browserify development server inspired by [beefy](https://github.com/chrisdickinson/beefy) and [wzrd](https://github.com/maxogden/wzrd), but specifically focused on incremental reloading, LiveReload integration (including CSS injection), and other high-level features.
 
-Note that budo needs a copy of `watchify` installed. It can be either local (preferred) or global.
+To install:
 
 ```sh
-npm install budo watchify -g
+npm install budo -g
 ```
 
-The simplest use cases will start up a server with a default `index.html` and incrementally bundle your source on filesave. Examples:
+Running budo will start a server with a default `index.html` and incrementally bundle your source on filesave. The requests are delayed until the bundle has finished, so you won't be served stale or empty bundles if you refresh the page mid-update. Examples:
 
 ```sh
-#run watchify on port 9966
-budo index.js
+# serve file on port 9966 and open browser
+budo index.js --open
 
-#run watchify with explicit output file 
-budo index.js --outfile bundle.js --verbose
+# enable LiveReload on HTML/CSS/JS file changes
+budo index.js --live
 
-#run watchify with some options and trigger LiveReload on change
-budo index.js --live --transform brfs
+# default html will use src="static/bundle.js"
+budo src/index.js:static/bundle.js
+
+# pass some options to browserify
+budo index.js --live -- -t babelify
+
+# use HTTPS and enable CORS headers
+budo index.js --ssl --cors --cert=cert.pem --key=key.pem
 ```
 
-You can open `localhost:9966` to see the content in action.
+Then open [http://localhost:9966/](http://localhost:9966/) to see the content in action.
 
-To pretty-print in terminal, [garnish](https://github.com/mattdesl/garnish), [bistre](https://github.com/hughsk/bistre) or another [ndjson](ndjson.org)-based stream can be used.
+By default, budo pretty-prints to terminal with [garnish](https://github.com/mattdesl/garnish).
 
-```sh
-budo index.js -o bundle.js | garnish
-```
 
-See [docs](#docs) for more features.
+<center><img src="http://i.imgur.com/Pvus8vy.png" width="75%" /></center>
+
+See [docs](#docs) for more details and integrations, such as [React Hot Module Replacement](./docs/command-line-usage.md#hot-module-replacement). PRs/suggestions/comments welcome.
+
+## features
+
+At a glance:
+
+- stubs a default `index.html`
+- fast incremental bundling, suspending the response until the new source is ready
+- watches HTML and CSS files for changes; CSS is injected without reloading the page
+- can emit [ndjson](http://ndjson.org) logs to use another pretty-printer, like [bistre](https://github.com/hughsk/bistre).
+- provides clear error messaging during development in DOM and console
+
+Below is an example of how syntax errors look during development, using the [babelify](https://github.com/babel/babelify) transform.
 
-PRs/suggestions/comments welcome. Props to [@caspervonb](https://twitter.com/caspervonb) for the early groundwork.
+![babelify](http://i.imgur.com/ZlfJL1i.png)
 
-## about
+## docs
 
-- [basic usage](docs/basics.md)
-- [comparisons](docs/comparisons.md)
+- [command line usage](docs/command-line-usage.md)
+- [API usage](docs/api-usage.md)
 - [running tests and examples](docs/tests-and-examples.md)
-- [script injection with budo-chrome](https://github.com/mattdesl/budo-chrome)
+- [rapid prototyping with budō](http://mattdesl.svbtle.com/rapid-prototyping)
+- [experimental script injection with budo-chrome](https://github.com/mattdesl/budo-chrome)
 
 ## usage
 
 [![NPM](https://nodei.co/npm/budo.png)](https://www.npmjs.com/package/budo)
 
-Details for `budo` command-line interface. Other options like `--verbose` and `--transform` are sent to browserify/watchify. 
+### CLI
 
-```sh
+Details for `budo` command-line interface.
+
+```txt
 Usage:
-    budo [entries] [opts]
+  budo index.js [opts] -- [browserify opts]
 
 Options:
-    --outfile, -o   path to output bundle
-    --port          the port to run, default 9966
-    --host          the host, default "localhost"
-    --dir           the directory to serve, and the base for --outfile
-    --live          enable LiveReload integration
-    --live-plugin   enable LiveReload but do not inject script tag
-    --live-port     the LiveReload port, default 35729
+  --help, -h       show help message
+  --version        show version
+  --port, -p       the port to run, default 9966
+  --host, -H       the host, default internal IP (localhost)
+  --dir, -d        a path, or array of paths for base static content
+  --serve, -s      override the bundle path being served
+  --live, -l       enable default LiveReload integration
+  --live-port, -L  the LiveReload port, default 35729
+  --open, -o       launch the browser once connected
+  --pushstate, -P  always render the index page instead of a 404 page
+  --onupdate       a shell command to trigger on bundle update
+  --poll=N         use polling for file watch, with optional interval N
+  --title          optional title for default index.html
+  --css            optional stylesheet href for default index.html
+  --ssl, -S        create an HTTPS server instead of HTTP
+  --cert, -C       the cert for SSL (default cert.pem)
+  --key, -K        the key for SSL (default key.pem)
+  --cors           set header to use CORS (Access-Control-Allow-Origin: *)
+  --ndjson         print ndjson instead of pretty-printed logs
+  --verbose, -v    also include debug messages
+  --no-stream      do not print messages to stdout
+  --no-debug       do not use inline source maps
+  --no-portfind    will not attempt auto-portfinding
+  --no-error-handler    disable default DOM error handling
+  --watch-glob, --wg    glob(s) to watch for reloads, default '**/*.{html,css}'
+  --proxy path@url      proxy requests on given path to url (eg: --proxy /api@http://localhost:3000/api)
+```
+
+By default, messages will be printed to `process.stdout`, and `--debug` will be sent to browserify (for source maps). You can turn these off with `--no-stream` and `--no-debug`, respectively.
+
+Everything after `--` is passed directly to browserify. Example:
+
+```js
+budo index.js --live -- -t [ babelify --extensions .es6 ]
 ```
 
-## Script Injection
+### API
+
+The API mirrors the CLI except it does not write to `process.stdout` by default.
+
+```js
+var budo = require('budo')
+var babelify = require('babelify')
+
+budo('./src/index.js', {
+  live: true,             // setup live reload
+  port: 8000,             // use this port
+  browserify: {
+    transform: babelify   // ES6
+  }
+}).on('connect', function (ev) {
+  console.log('Server running on %s', ev.uri)
+  console.log('LiveReload running on port %s', ev.livePort)
+}).on('update', function (buffer) {
+  console.log('bundle - %d bytes', buffer.length)
+})
+```
 
-[![screenshot](http://i.imgur.com/LJP7d9I.png)](https://www.youtube.com/watch?v=cfgeN3G_Gl0)
+See [API usage](docs/api-usage.md) for details.
 
-The original motivation for making budō was to build a simple tool around Chrome Script Injection. This has since split off into its own repository: [budo-chrome](https://github.com/mattdesl/budo-chrome) to maintain a small scope for budō.
+## See Also
 
-<sup>[(click for demo)](https://www.youtube.com/watch?v=cfgeN3G_Gl0)</sup>
+budō combines several smaller and less opinionated modules.
 
+- [watchify-middleware](https://www.npmjs.com/package/watchify-middleware) - the underlying request handler for serving incremental reloads
+- [watchify-server](https://www.npmjs.com/package/watchify-server) - a less opinionated alternative to budo, built on the same underlying modules
+- [simple-html-index](https://www.npmjs.com/package/simple-html-index) - a stream for a default `index.html` file
 
 ## License
 
 MIT, see [LICENSE.md](http://github.com/mattdesl/budo/blob/master/LICENSE.md) for details.
+
+[stability-image]: https://img.shields.io/badge/stability-stable-brightgreen.svg?style=flat-square
+[stability-url]: https://nodejs.org/api/documentation.html#documentation_stability_index
+[npm-image]: https://img.shields.io/npm/v/budo.svg?style=flat-square
+[npm-url]: https://npmjs.org/package/budo
+[travis-image]: https://img.shields.io/travis/mattdesl/budo/master.svg?style=flat-square
+[travis-url]: http://travis-ci.org/mattdesl/budo
+[downloads-image]: http://img.shields.io/npm/dm/budo.svg?style=flat-square
+[downloads-url]: https://npmjs.org/package/budo
+[standard-image]: https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square
+[standard-url]: https://github.com/feross/standard