Merge pull request #1734 from getnikola/new-auto

New auto
getnikola · Jun 9, 2015 · 88c4cad · 88c4cad
2 parents 8dc5c08 + 3d73022
commit 88c4cad
Show file tree

Hide file tree

Showing 13 changed files with 1,871 additions and 121 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,7 @@ New in master
 Features
 --------
 
+* New implementation of the ``nikola auto`` command.
 * ``requests`` is now required for all Nikola sites
 * New ``nikola version --check`` option (Issue #1767)
 

diff --git a/bower.json b/bower.json
@@ -12,6 +12,7 @@
     "bootstrap": "~3.3.4",
     "jquery": "<2.0.0",
     "jquery-colorbox": "~1.6.0",
-    "moment": "~2.10.3"
+    "moment": "~2.10.3",
+    "livereload-js": "~2.2.1"
   }
 }
diff --git a/bower_components/livereload-js/.bower.json b/bower_components/livereload-js/.bower.json
@@ -0,0 +1,40 @@
+{
+  "name": "livereload-js",
+  "version": "2.2.1",
+  "main": "dist/livereload.js",
+  "homepage": "http://livereload.com",
+  "authors": [
+    "Andrey Tarantsov <andrey@tarantsov.com>",
+    "David Kelso <david@kelso.id.au>"
+  ],
+  "description": "LiveReload JS client - auto reload browser on changes",
+  "keywords": [
+    "javascript",
+    "livereload"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "Rakefile",
+    "lib",
+    "lib-cov",
+    "src",
+    "test",
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "tests"
+  ],
+  "moduleType": [
+    "globals"
+  ],
+  "_release": "2.2.1",
+  "_resolution": {
+    "type": "version",
+    "tag": "v2.2.1",
+    "commit": "91fdfa00a3e7fac0482397a315e18947c54bbfd3"
+  },
+  "_source": "git://github.com/livereload/livereload-js.git",
+  "_target": "~2.2.1",
+  "_originalSource": "livereload-js",
+  "_direct": true
+}
diff --git a/bower_components/livereload-js/Gruntfile.js b/bower_components/livereload-js/Gruntfile.js
@@ -0,0 +1,42 @@
+module.exports = function(grunt) {
+
+  grunt.initConfig({
+    coffee: {
+      src: {
+        expand: true,
+        cwd: 'src',
+        src: '*.coffee',
+        dest: 'lib',
+        ext: '.js'
+      }
+    },
+
+    browserify: {
+      dist: {
+        options: {
+
+        },
+        src: ['lib/startup.js'],
+        dest: 'dist/livereload.js'
+      }
+    },
+
+    mochaTest: {
+      test: {
+        options: {
+          reporter: 'spec'
+        },
+        src: ['test/*.js']
+      }
+    }
+  });
+
+  grunt.loadNpmTasks('grunt-contrib-coffee');
+  grunt.loadNpmTasks('grunt-browserify');
+  grunt.loadNpmTasks('grunt-mocha-test');
+
+  grunt.registerTask('build', ['coffee', 'browserify']);
+  grunt.registerTask('test', ['mochaTest']);
+  grunt.registerTask('default', ['build', 'test']);
+
+};
diff --git a/bower_components/livereload-js/LICENSE b/bower_components/livereload-js/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2010-2012 Andrey Tarantsov
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/bower_components/livereload-js/README.md b/bower_components/livereload-js/README.md
@@ -0,0 +1,220 @@
+LiveReload.js
+=============
+
+What is LiveReload?
+-------------------
+
+LiveReload is a tool for web developers and designers. See [livereload.com](http://livereload.com) for more info.
+
+To use LiveReload, you need a client (this script) in your browser and a server running on your development machine.
+
+This repository (livereload.js) implements the client side of the protocol. The client connects to a LiveReload server via web sockets and listens for incoming change notifications. When a CSS or an image file is modified, it is live-refreshed without reloading the page. When any other file is modified, the page is reloaded.
+
+The server notifies the client whenever a change is made. Available servers are:
+
+* [LiveReload app for Mac](http://livereload.com/)
+* [rack-livereload](https://github.com/johnbintz/rack-livereload)
+* [guard-livereload](https://github.com/guard/guard-livereload)
+* [grunt-contrib-watch](https://github.com/gruntjs/grunt-contrib-watch)
+* more available on Google :-)
+* you can even write your own; refer to the [LiveReload protocol](http://help.livereload.com/kb/ecosystem/livereload-protocol)
+
+If you are a web developer looking to _use_ LiveReload, you should refer to your LiveReload server/app/tool's documentation, rather that this repository. **You should use the copy of livereload.js script bundled with your server**, because it's guaranteed to be compatible, and may be customized for that server.
+
+Most LiveReload server vendors will serve livereload.js on the LiveReload port. When your server is running, you can typically access the script at `http://0.0.0.0:35729/livereload.js`.
+
+Please read on *only* if you are:
+
+* using a server that doesn't document the usage of livereload.js
+* interested in hacking on livereload.js or want to understand it better
+* developing a LiveReload server
+
+
+What is livereload.js?
+----------------------
+
+This repository contains a JavaScript file implementing the client side of the LiveReload protocol. It gets change notifications from a LiveReload server and applies them to the browser.
+
+If you are **developing** a LiveReload server, see [dist/livereload.js](https://github.com/livereload/livereload-js/raw/master/dist/livereload.js) for the latest version built using the sources in this repository. We require LiveReload server vendors to distribute livereload.js as part of their apps or tools.
+
+An old version of this script is also bundled with the LiveReload browser extensions, but it's not getting updated and only serves for compatibility with very old clients. 
+
+Features:
+
+* Live CSS reloading
+* Full page reloading
+* Protocol, WebSocket communication
+* CSS `@import` support
+* Live image reloading (`<img src="..." />`, `background-image` and `border-image` properties, both inline and in stylesheets)
+* Live, in-browser LESS.js reloading
+
+Would love, but doesn't seem possible:
+
+* live JS reloading
+
+
+Installing using Bower and npm
+------------------------------
+
+This script is published on Bower and npm. (But, to reiterate: the preferred method is to avoid installing it altogether, and instead use the one bundled with your LiveReload server/app/tool.)
+
+Using Bower:
+
+    bower install livereload-js --save-dev
+
+This gives you a component containing a single script file, `dist/livereload.js`.
+
+If you're using Browserify, you can require LiveReload via npm:
+
+    npm install livereload-js --save
+
+Note that the package uses `window` and `document` globals, so won't run under Node.js environment.
+
+
+Using livereload.js
+-------------------
+
+This script is meant to be included into the web pages you want to monitor, like this:
+
+    <script src="http://localhost:35729/livereload.js"></script>
+
+LiveReload 2 server listens on port `35729` and serves livereload.js over HTTP (besides speaking the web socket protocol on the same port).
+
+A slightly smarter way is to use the host name of the current page, assuming that it is being served from the same computer. This approach enables LiveReload when viewing the web page from other devices on the network:
+
+```html
+<script>document.write('<script src="http://'
+    + location.host.split(':')[0]
+    + ':35729/livereload.js"></'
+    + 'script>')</script>
+```
+
+
+However, since `location.host` is empty for `file:` URLs, we need to account for that:
+
+```html
+<script>document.write('<script src="http://'
+    + (location.host || 'localhost').split(':')[0]
+    + ':35729/livereload.js"></'
+    + 'script>')</script>
+```
+
+
+LiveReload.js finds a `script` tag that includes `…/livereload.js` and uses it to determine the hostname/port to connect to. It also understands some options from the query string: `host`, `port`, `snipver`, `mindelay` and `maxdelay`.
+
+`snipver` specifies a version of the snippet, so that we can warn when the snippet needs to be updated. The currently recommended `snipver` is version 1:
+
+```html
+<script>document.write('<script src="http://'
+    + (location.host || 'localhost').split(':')[0]
+    + ':35729/livereload.js?snipver=1"></'
+    + 'script>')</script>
+```
+
+
+Additionally, you might want to specify `mindelay` and `maxdelay`, which is minimum and maximum reconnection delay in milliseconds (defaulting to `1000` and `60000`).
+
+Alternatively, instead of loading livereload.js from the LiveReload server, you might want to include it from a different URL. In this case, add a `host` parameter to override the host name. For example:
+
+```html
+<script src="https://github.com/livereload/livereload-js/raw/master/dist/livereload.js?host=localhost"></script>
+```
+
+
+Issues & Limitations
+--------------------
+
+**Live reloading of imported stylesheets has a 200ms lag.** Modifying a CSS `@import` rule to reference a not-yet-cached file causes WebKit to lose all document styles, so we have to apply a workaround that causes a lag.
+
+Our workaround is to add a temporary `<link />` element for the imported stylesheet we're trying to reload, wait 200ms to make sure WebKit loads the new file, then remove `<link />` and recreate the `@import` rule. This prevents a flash of unstyled content. (We also wait 200 more milliseconds and recreate the `@import` rule again, in case those initial 200ms were not enough.)
+
+**Live image reloading is limited to `<img src="..." />`, `background-image` and `border-image` styles.** Any other places where images can be mentioned?
+
+**Live image reloading is limited to `jpg`, `jpeg`, `gif`, and `png` extensions.** Maybe need to add `svg` there? Anything else?
+
+
+Communicating with livereload.js
+--------------------------------
+
+It is possible to communicate with a running LiveReload script using DOM events:
+
+* fire `LiveReloadShutDown` event on `document` to make LiveReload disconnect and go away
+* listen for `LiveReloadConnect` event on `document` to learn when the connection is established
+* listen for `LiveReloadDisconnect` event on `document` to learn when the connection is interrupted (or fails to be established)
+
+The `LiveReload` object is also exposed as `window.LiveReload`, with `LiveReload.disconnect()`, `LiveReload.connect()`, and `LiveReload.shutDown()` available. However, I'm not yet sure if I want to keep this API, so consider it non-contractual. (And please tell me if you have a use for it!)
+
+
+Having trouble?
+---------------
+
+To enable debugging output to console, append `?LR-verbose` to your URL.
+
+
+Hacking on LiveReload.js
+------------------------
+
+Requirements:
+
+* Node.js with npm
+* Grunt (`npm install grunt-cli`)
+
+To install additional prerequisites:
+
+    npm install
+
+To build:
+
+    grunt build
+
+To run tests:
+
+    grunt
+
+
+Releasing a new version
+-----------------------
+
+1. Update the version number in `package.json`.
+
+1. Run `rake version` to update the version numbers in all other files, using the one from `package.json`.
+
+1. Run `grunt`.
+
+1. Do some manual testing.
+
+1. Tag the version in Git: `rake tag` then `git push --tags`.
+
+1. `npm publish`
+
+
+License
+-------
+
+livereload-js is available under the MIT license. See the LICENSE file for details.
+
+
+Version history
+---------------
+
+2.2.1 (Jan 17, 2015)
+
+* npm fix: actually include `/lib` in the package
+
+2.2.0 (Jan 16, 2015)
+
+* the first version stitched with Browserify; everything seems to work, but 2.1.0 is available just in case
+* switched the build system to Grunt
+
+2.1.0 (Jan 16, 2015)
+
+* use case-insensitive matching for `rel` attribute in `<link rel="stylesheet">` tags, to accomodate legacy Rails versions
+* avoid usage of `console` when it's not definited
+* some README changes
+
+2.0.8 (May 22, 2012)
+
+* Fix live CSS refresh to work with prefixfree
+* Correctly trigger removal of old `<link>` tags
+
+(older history not recorded)
diff --git a/bower_components/livereload-js/bower.json b/bower_components/livereload-js/bower.json
@@ -0,0 +1,30 @@
+{
+  "name": "livereload-js",
+  "version": "2.2.1",
+  "main": "dist/livereload.js",
+  "homepage": "http://livereload.com",
+  "authors": [
+    "Andrey Tarantsov <andrey@tarantsov.com>",
+    "David Kelso <david@kelso.id.au>"
+  ],
+  "description": "LiveReload JS client - auto reload browser on changes",
+  "keywords": [
+    "javascript",
+    "livereload"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "Rakefile",
+    "lib",
+    "lib-cov",
+    "src",
+    "test",
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "tests"
+  ],
+  "moduleType": [
+    "globals"
+  ]
+}